← Back to branch summary

~mixxxdevelopers/mixxx/engine-control-refactor

« back to all changes in this revision

Viewing changes to mixxx/src/library/libraryscanner.cpp

  • Committer: RJ Ryan
  • Date: 2013-06-04 00:41:29 UTC
  • mfrom: (2890.22.101 mixxx)
  • Revision ID: rryan@mixxx.org-20130604004129-8jjxkicsb3givu4a
Merging from lp:mixxx.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/library/libraryscanner.cpp
33
33
    m_cueDao(m_database),
34
34
    m_playlistDao(m_database),
35
35
    m_crateDao(m_database),
36
 
    m_analysisDao(m_database),
37
 
    m_trackDao(m_database, m_cueDao, m_playlistDao, m_crateDao, m_analysisDao),
 
36
    m_analysisDao(m_database, collection->getConfig()),
 
37
    m_trackDao(m_database, m_cueDao, m_playlistDao, m_crateDao,
 
38
               m_analysisDao, collection->getConfig()),
38
39
    // Don't initialize m_database here, we need to do it in run() so the DB
39
40
    // conn is in the right thread.
40
41
    m_nameFilters(SoundSourceProxy::supportedFileExtensionsString().split(" ")),
288
289
    emit(scanFinished());
289
290
}
290
291
 
291
 
void LibraryScanner::scan(QString libraryPath)
 
292
void LibraryScanner::scan(QString libraryPath, QWidget *parent)
292
293
{
293
294
    m_qLibraryPath = libraryPath;
294
 
    m_pProgress = new LibraryScannerDlg();
 
295
    m_pProgress = new LibraryScannerDlg(parent);
295
296
    m_pProgress->setAttribute(Qt::WA_DeleteOnClose);
296
297
 
297
298
    // The important part here is that we need to use