Mercurial > hg > tony

changeset 576:335fd9b439a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix failure to use the FlexiNoteLayer for the note layer
author Chris Cannam
date Thu, 18 Jul 2019 14:43:41 +0100
parents 3c884bad3d44
children 9f831e3e5103
files repoint-lock.json src/Analyser.cpp src/Analyser.h src/MainWindow.cpp
diffstat 4 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/repoint-lock.json	Thu Jul 18 13:38:24 2019 +0100
+++ b/repoint-lock.json	Thu Jul 18 14:43:41 2019 +0100
@@ -4,13 +4,13 @@
       "pin": "62987b6d6a3b"
     },
     "svcore": {
-      "pin": "4fec4527e50e"
+      "pin": "9a8327e7b2dc"
     },
     "svgui": {
       "pin": "c3cc36c014b8"
     },
     "svapp": {
-      "pin": "155008f1bf10"
+      "pin": "a27a6113fdd7"
     },
     "checker": {
       "pin": "c8c17e51aab0"
--- a/src/Analyser.cpp	Thu Jul 18 13:38:24 2019 +0100
+++ b/src/Analyser.cpp	Thu Jul 18 14:43:41 2019 +0100
@@ -195,7 +195,7 @@
 }
 
 void
-Analyser::layerCompletionChanged()
+Analyser::layerCompletionChanged(ModelId)
 {
     if (getInitialAnalysisCompletion() < 100) {
         return;
@@ -472,8 +472,8 @@
             params->setPlayPan(1);
             params->setPlayGain(0.5);
         }
-        connect(pitchLayer, SIGNAL(modelCompletionChanged()),
-                this, SLOT(layerCompletionChanged()));
+        connect(pitchLayer, SIGNAL(modelCompletionChanged(ModelId)),
+                this, SLOT(layerCompletionChanged(ModelId)));
     }
     
     FlexiNoteLayer *flexiNoteLayer = 
@@ -485,8 +485,8 @@
             params->setPlayPan(1);
             params->setPlayGain(0.5);
         }
-        connect(flexiNoteLayer, SIGNAL(modelCompletionChanged()),
-                this, SLOT(layerCompletionChanged()));
+        connect(flexiNoteLayer, SIGNAL(modelCompletionChanged(ModelId)),
+                this, SLOT(layerCompletionChanged(ModelId)));
         connect(flexiNoteLayer, SIGNAL(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)),
                 this, SLOT(reAnalyseRegion(sv_frame_t, sv_frame_t, float, float)));
         connect(flexiNoteLayer, SIGNAL(materialiseReAnalysis()),
--- a/src/Analyser.h	Thu Jul 18 13:38:24 2019 +0100
+++ b/src/Analyser.h	Thu Jul 18 14:43:41 2019 +0100
@@ -224,7 +224,7 @@
 
 protected slots:
     void layerAboutToBeDeleted(Layer *);
-    void layerCompletionChanged();
+    void layerCompletionChanged(ModelId);
     void reAnalyseRegion(sv_frame_t, sv_frame_t, float, float);
     void materialiseReAnalysis();
 
--- a/src/MainWindow.cpp	Thu Jul 18 13:38:24 2019 +0100
+++ b/src/MainWindow.cpp	Thu Jul 18 14:43:41 2019 +0100
@@ -27,7 +27,6 @@
 #include "data/model/WaveFileModel.h"
 #include "data/model/NoteModel.h"
 #include "layer/FlexiNoteLayer.h"
-#include "data/model/NoteModel.h"
 #include "view/ViewManager.h"
 #include "base/Preferences.h"
 #include "base/RecordDirectory.h"