summaryrefslogtreecommitdiffstats
path: root/src/library/library.cpp
diff options
context:
space:
mode:
authorUwe Klotz <uwe_klotz@web.de>2017-06-15 13:08:16 +0200
committerUwe Klotz <uwe_klotz@web.de>2017-06-15 13:08:16 +0200
commit79ecbf92205e55435c46dafb42d3f22a180fc986 (patch)
treed6e5b923c737a1db570787e1c6c6f128a6daebc8 /src/library/library.cpp
parentb426969db1ec0465cf021b666f842fb8b79e99ff (diff)
Introduce DbConnectionPooled for thread-local, pooled connections
Diffstat (limited to 'src/library/library.cpp')
-rw-r--r--src/library/library.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/library.cpp b/src/library/library.cpp
index 49b4d4283a..4498da0b48 100644
--- a/src/library/library.cpp
+++ b/src/library/library.cpp
@@ -63,14 +63,14 @@ Library::Library(QObject* parent, UserSettingsPointer pConfig,
RecordingManager* pRecordingManager) :
m_pConfig(pConfig),
m_mixxxDb(pConfig),
- m_dbConnectionScope(m_mixxxDb.connectionPool()),
+ m_dbConnection(m_mixxxDb.connectionPool()),
m_pSidebarModel(new SidebarModel(parent)),
m_pTrackCollection(new TrackCollection(pConfig)),
m_pLibraryControl(new LibraryControl(this)),
m_pRecordingManager(pRecordingManager),
m_scanner(m_mixxxDb.connectionPool(), m_pTrackCollection, pConfig) {
kLogger.info() << "Opening datbase connection";
- if (!m_dbConnectionScope) {
+ if (!m_dbConnection) {
QMessageBox::critical(0, tr("Cannot open database"),
tr("Unable to establish a database connection.\n"
"Mixxx requires QT with SQLite support. Please read "
@@ -80,7 +80,7 @@ Library::Library(QObject* parent, UserSettingsPointer pConfig,
// TODO(XXX) something a little more elegant
exit(-1);
}
- QSqlDatabase dbConnection(m_dbConnectionScope);
+ QSqlDatabase dbConnection(m_dbConnection);
DEBUG_ASSERT(dbConnection.isOpen());
kLogger.info() << "Initializing or upgrading database schema";