comparison framework/MainWindowBase.cpp @ 113:0c1ea5ff6518

* Speed up spectrogram painting by releasing mutex in FFTDataServer
while calculating data prior to writing it, and by adding whole-column
value query methods to FFT objects
* Add paint cache to Thumbwheel -- repaints of this widget were slowing
down the whole spectrogram repaint
* More uses of MutexLocker (named and with debug) and more profile
points
* Make startup much quicker some of the time, with OSC server in place

     m_viewManager(0),
     m_timeRulerLayer(0),
     m_audioOutput(withAudioOutput),
     m_playSource(0),
     m_playTarget(0),
-    m_oscQueue(withOSCSupport ? new OSCQueue() : 0),
+    m_oscQueue(0),
+    m_oscQueueStarter(0),
     m_recentFiles("RecentFiles", 20),
     m_recentTransforms("RecentTransforms", 20),
     m_documentModified(false),
     m_openingAudioFile(false),
     m_abandoning(false),
     m_labeller(0)
 {
+    Profiler profiler("MainWindowBase::MainWindowBase");
+
     connect(CommandHistory::getInstance(), SIGNAL(commandExecuted()),
 	    this, SLOT(documentModified()));
     connect(CommandHistory::getInstance(), SIGNAL(documentRestored()),
 	    this, SLOT(documentRestored()));
     

     connect(Preferences::getInstance(),
             SIGNAL(propertyChanged(PropertyContainer::PropertyName)),
             this,
             SLOT(preferenceChanged(PropertyContainer::PropertyName)));
 
-    if (m_oscQueue && m_oscQueue->isOK()) {
-        connect(m_oscQueue, SIGNAL(messagesAvailable()), this, SLOT(pollOSC()));
-        QTimer *oscTimer = new QTimer(this);
-        connect(oscTimer, SIGNAL(timeout()), this, SLOT(pollOSC()));
-        oscTimer->start(1000);
-    }
-
     Labeller::ValueType labellerType = Labeller::ValueFromTwoLevelCounter;
     settings.beginGroup("MainWindow");
     labellerType = (Labeller::ValueType)
         settings.value("labellertype", (int)labellerType).toInt();
     int cycle = settings.value("labellercycle", 4).toInt();
     settings.endGroup();
 
     m_labeller = new Labeller(labellerType);
     m_labeller->setCounterCycleSize(cycle);
+
+    if (withOSCSupport) {
+        m_oscQueueStarter = new OSCQueueStarter(this);
+        connect(m_oscQueueStarter, SIGNAL(finished()), this, SLOT(oscReady()));
+        m_oscQueueStarter->start();
+    }
 }
 
 MainWindowBase::~MainWindowBase()
 {
     if (m_playTarget) m_playTarget->shutdown();
 //    delete m_playTarget;
     delete m_playSource;
     delete m_viewManager;
     delete m_oscQueue;
     Profiles::getInstance()->dump();
+}
+
+void
+MainWindowBase::oscReady()
+{
+    if (m_oscQueue && m_oscQueue->isOK()) {
+        connect(m_oscQueue, SIGNAL(messagesAvailable()), this, SLOT(pollOSC()));
+        QTimer *oscTimer = new QTimer(this);
+        connect(oscTimer, SIGNAL(timeout()), this, SLOT(pollOSC()));
+        oscTimer->start(1000);
+        std::cerr << "Finished setting up OSC interface" << std::endl;
+    }
 }
 
 QString
 MainWindowBase::getOpenFileName(FileFinder::FileType type)
 {