← Back to branch summary

~mixxxdevelopers/mixxx/trunk

« back to all changes in this revision

Viewing changes to mixxx/src/mixxx.cpp

  • Committer: RJ Ryan
  • Date: 2012-03-12 05:23:47 UTC
  • mfrom: (2840.2.23 mixxx-setlog)
  • Revision ID: rryan@mit.edu-20120312052347-ej5ryah1p3nag2dq
Merging Daniel Schürmann's session history branch into lp:mixxx. Thanks Daniel!

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/mixxx.cpp
263
263
        QDir().mkpath(QDir::homePath().append("/").append(SETTINGS_PATH));
264
264
    }
265
265
 
266
 
 
267
 
 
268
266
    m_pLibrary = new Library(this, m_pConfig,
269
267
                             bFirstRun || bUpgraded,
270
268
                             m_pRecordingManager);
432
430
 
433
431
    m_pWidgetParent = NULL;
434
432
    // Loads the skin as a child of m_pView
435
 
    // assignment itentional in next line
436
 
    if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(m_pView,
437
 
                                        m_pKeyboard,
438
 
                                        m_pPlayerManager,
439
 
                                        m_pLibrary,
440
 
                                        m_pVCManager))) {
 
433
    // assignment intentional in next line
 
434
    if (!(m_pWidgetParent = m_pSkinLoader->loadDefaultSkin(
 
435
        m_pView, m_pKeyboard, m_pPlayerManager, m_pLibrary, m_pVCManager))) {
441
436
        qDebug() << "Could not load default skin.";
442
437
    }
443
438