# HG changeset patch
# User Chris Cannam
# Date 1563457421 -3600
# Node ID 335fd9b439a0f716f9a6f3ebff08a935ed3f1771
# Parent  3c884bad3d440f1ae6c36d896c43af49be1d2a2a
Fix failure to use the FlexiNoteLayer for the note layer

diff -r 3c884bad3d44 -r 335fd9b439a0 repoint-lock.json
--- 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"
diff -r 3c884bad3d44 -r 335fd9b439a0 src/Analyser.cpp
--- 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()),
diff -r 3c884bad3d44 -r 335fd9b439a0 src/Analyser.h
--- 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();
 
diff -r 3c884bad3d44 -r 335fd9b439a0 src/MainWindow.cpp
--- 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"