comparison framework/MainWindowBase.cpp @ 501:c82cae9a9e74 3.0-integration

Merge from branch "tony-2.0-integration"

     if (m_recordTarget->isRecording() || m_playSource->isPlaying()) {
         stop();
         QAction *action = qobject_cast<QAction *>(sender());
         if (action) action->setChecked(false);
     } else {
+        if (m_audioIO) m_audioIO->resume();
         playbackFrameChanged(m_viewManager->getPlaybackFrame());
 	m_playSource->play(m_viewManager->getPlaybackFrame());
     }
 }
 

     }
     
     if (m_recordTarget->isRecording()) {
         stop();
         return;
+    }
+
+    QAction *action = qobject_cast<QAction *>(sender());
+    
+    if (m_audioRecordMode == RecordReplaceSession) {
+        if (!checkSaveModified()) {
+            if (action) action->setChecked(false);
+            return;
+        }
     }
 
     QAction *action = qobject_cast<QAction *>(sender());
     
     if (m_audioRecordMode == RecordReplaceSession) {

     }
 
     updateMenuStates();
     m_recentFiles.addFile(model->getLocation());
     currentPaneChanged(m_paneStack->getCurrentPane());
+
+    emit audioFileLoaded();
 }
 
 void
 MainWindowBase::ffwd()
 {

 void
 MainWindowBase::stop()
 {
     if (m_recordTarget->isRecording()) {
         m_recordTarget->stopRecording();
-        emit audioFileLoaded();
     }
         
     m_playSource->stop();
 
+    if (m_audioIO) m_audioIO->suspend();
+    
     if (m_paneStack && m_paneStack->getCurrentPane()) {
         updateVisibleRangeDisplay(m_paneStack->getCurrentPane());
     } else {
         m_myStatusMessage = "";
         getStatusLabel()->setText("");