changeset 310:8e750332dc77

* Activity log updates * Update range lists in play source when a new model is added * Fill cache with empty background in colour 3d plot
author Chris Cannam
date Fri, 27 Feb 2009 13:33:16 +0000
parents 6a276fea550d
children 0e7d0cdb6ac7
files main/MainWindow.cpp
diffstat 1 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/main/MainWindow.cpp	Thu Feb 26 17:33:46 2009 +0000
+++ b/main/MainWindow.cpp	Fri Feb 27 13:33:16 2009 +0000
@@ -279,6 +279,8 @@
             m_activityLog, SLOT(activityHappened(QString)));
     connect(CommandHistory::getInstance(), SIGNAL(activity(QString)),
             m_activityLog, SLOT(activityHappened(QString)));
+    connect(this, SIGNAL(activity(QString)),
+            m_activityLog, SLOT(activityHappened(QString)));
     connect(this, SIGNAL(replacedDocument()), this, SLOT(documentReplaced()));
     m_activityLog->hide();
 
@@ -2182,7 +2184,10 @@
     }
 
     if (ok) {
-        if (!multiple) {
+        if (multiple) {
+            emit activity(tr("Export multiple audio files"));
+        } else {
+            emit activity(tr("Export audio to \"%1\"").arg(path));
             m_recentFiles.addFile(path);
         }
     } else {
@@ -2312,6 +2317,7 @@
         QMessageBox::critical(this, tr("Failed to write file"), error);
     } else {
         m_recentFiles.addFile(path);
+        emit activity(tr("Export layer to \"%1\"").arg(path));
     }
 }
 
@@ -2744,6 +2750,7 @@
         QString fpath = QDir(svDir).filePath(fname);
         if (saveSessionFile(fpath)) {
             m_recentFiles.addFile(fpath);
+            emit activity(tr("Export image to \"%1\"").arg(fpath));
             return true;
         } else {
             return false;
@@ -2858,6 +2865,7 @@
 	CommandHistory::getInstance()->documentSaved();
 	documentRestored();
         m_recentFiles.addFile(path);
+        emit activity(tr("Save session as \"%1\"").arg(path));
     }
 }
 
@@ -3461,6 +3469,8 @@
 
         if (currentNoteLayer) {
 
+            if (!m_playSource || !m_playSource->isPlaying()) continue;
+
             if (noteOn) {
 
                 currentNoteLayer->addNoteOn(frame,
@@ -3480,6 +3490,9 @@
         if (currentTimeValueLayer) {
 
             if (!noteOn) continue;
+
+            if (!m_playSource || !m_playSource->isPlaying()) continue;
+
             Model *model = static_cast<Layer *>(currentTimeValueLayer)->getModel();
             SparseTimeValueModel *tvm =
                 dynamic_cast<SparseTimeValueModel *>(model);