Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

Factor ProjectFileIO::GetConnection (returning reference not pointer)

Browse Source
This commit is contained in:
Paul Licameli 2020-09-02 14:36:16 -04:00
parent 4742f4ce1c
commit c9dec8f5a9
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ProjectFileIO.cpp
View File

@ -256,7 +256,7 @@ ProjectFileIO::~ProjectFileIO()
{ {
} }
sqlite3 *ProjectFileIO::DB() DBConnection &ProjectFileIO::GetConnection()
{ {
auto &curConn = CurrConn(); auto &curConn = CurrConn();
if (!curConn) if (!curConn)
@ -270,9 +270,18 @@ sqlite3 *ProjectFileIO::DB()
} }
} }
return curConn->DB(); return *curConn;
} }
sqlite3 *ProjectFileIO::DB()
{
return GetConnection().DB();
}
/*!
@pre *CurConn() does not exist
@post *CurConn() exists or return value is false
*/
bool ProjectFileIO::OpenConnection(FilePath fileName /* = {} */) bool ProjectFileIO::OpenConnection(FilePath fileName /* = {} */)
{ {
auto &curConn = CurrConn(); auto &curConn = CurrConn();

2
src/ProjectFileIO.h
View File

@ -142,6 +142,8 @@ public:
// 0 for success or non-zero to stop the query // 0 for success or non-zero to stop the query
using ExecCB = std::function<int(int cols, char **vals, char **names)>; using ExecCB = std::function<int(int cols, char **vals, char **names)>;
DBConnection &GetConnection();
private: private:
void WriteXMLHeader(XMLWriter &xmlFile) const; void WriteXMLHeader(XMLWriter &xmlFile) const;
void WriteXML(XMLWriter &xmlFile, bool recording = false, const std::shared_ptr<TrackList> &tracks = nullptr) /* not override */; void WriteXML(XMLWriter &xmlFile, bool recording = false, const std::shared_ptr<TrackList> &tracks = nullptr) /* not override */;