Mercurial > hg > tony
changeset 578:9f831e3e5103
Update Qt version
| author | Chris Cannam |
|---|---|
| date | Fri, 19 Jul 2019 09:04:06 +0100 |
| parents | 335fd9b439a0 (diff) 8dcbad6e0b81 (current diff) |
| children | 47f96711069f |
| files | |
| diffstat | 5 files changed, 12 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/repoint-lock.json Fri Jul 19 09:03:51 2019 +0100 +++ b/repoint-lock.json Fri Jul 19 09:04:06 2019 +0100 @@ -4,13 +4,13 @@ "pin": "62987b6d6a3b" }, "svcore": { - "pin": "9945ad04c174" + "pin": "9a8327e7b2dc" }, "svgui": { - "pin": "e540aa5d89cd" + "pin": "c3cc36c014b8" }, "svapp": { - "pin": "e56cc6fe7da2" + "pin": "a27a6113fdd7" }, "checker": { "pin": "c8c17e51aab0"
--- a/repoint-project.json Fri Jul 19 09:03:51 2019 +0100 +++ b/repoint-project.json Fri Jul 19 09:04:06 2019 +0100 @@ -16,18 +16,15 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "svgui": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "svapp": { "vcs": "hg", - "service": "soundsoftware", - "branch": "by-id" + "service": "soundsoftware" }, "checker": { "vcs": "hg",
--- a/src/Analyser.cpp Fri Jul 19 09:03:51 2019 +0100 +++ b/src/Analyser.cpp Fri Jul 19 09:04:06 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 Fri Jul 19 09:03:51 2019 +0100 +++ b/src/Analyser.h Fri Jul 19 09:04:06 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 Fri Jul 19 09:03:51 2019 +0100 +++ b/src/MainWindow.cpp Fri Jul 19 09:04:06 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"