Mercurial > hg > svapp

changeset 342:4eccff14b4d8 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Much fiddling toward getting sessions and individual audio files to load cleanly when they need quite different handling after load
author Chris Cannam
date Wed, 02 Apr 2014 21:25:56 +0100
parents 93cf23bfa1cb
children a93802543a5a
files framework/MainWindowBase.cpp framework/MainWindowBase.h framework/SVFileReader.cpp
diffstat 3 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Wed Apr 02 18:22:41 2014 +0100
+++ b/framework/MainWindowBase.cpp	Wed Apr 02 21:25:56 2014 +0100
@@ -1392,6 +1392,8 @@
 
     currentPaneChanged(m_paneStack->getCurrentPane());
 
+    emit audioFileLoaded();
+
     return FileOpenSucceeded;
 }
 
@@ -1744,6 +1746,8 @@
                                        source.getLocalFilename());
         }
 
+        emit sessionLoaded();
+
     } else {
 	setWindowTitle(QApplication::applicationName());
     }
@@ -1826,6 +1830,8 @@
 	CommandHistory::getInstance()->documentSaved();
 	m_documentModified = false;
 	updateMenuStates();
+
+        emit sessionLoaded();
     }
 
     return ok ? FileOpenSucceeded : FileOpenFailed;
@@ -1857,6 +1863,8 @@
     CommandHistory::getInstance()->documentSaved();
     m_documentModified = false;
 
+    emit sessionLoaded();
+
     return status;
 }
 
@@ -2211,6 +2219,7 @@
 Pane *
 MainWindowBase::addPaneToStack()
 {
+    cerr << "MainWindowBase::addPaneToStack()" << endl;
     AddPaneCommand *command = new AddPaneCommand(this);
     CommandHistory::getInstance()->addCommand(command);
     Pane *pane = command->getPane();
--- a/framework/MainWindowBase.h	Wed Apr 02 18:22:41 2014 +0100
+++ b/framework/MainWindowBase.h	Wed Apr 02 21:25:56 2014 +0100
@@ -153,6 +153,8 @@
     void canSelectNextLayer(bool);
     void canSave(bool);
     void hideSplash();
+    void sessionLoaded();
+    void audioFileLoaded();
     void replacedDocument();
     void activity(QString);
 
--- a/framework/SVFileReader.cpp	Wed Apr 02 18:22:41 2014 +0100
+++ b/framework/SVFileReader.cpp	Wed Apr 02 21:25:56 2014 +0100
@@ -726,6 +726,8 @@
 
     m_currentPane = m_paneCallback.addPane();
 
+    cerr << "SVFileReader::addPane: pane is " << m_currentPane << endl;
+
     if (!m_currentPane) {
 	cerr << "WARNING: SV-XML: Internal error: Failed to add pane!"
 		  << endl;