Mercurial > hg > sonic-visualiser

changeset 1476:e76f72565112 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Wire up record monitoring
author Chris Cannam
date Wed, 04 Jan 2017 16:03:12 +0000
parents 3ffe4109f255
children 36fa9b9e11af
files .hgsubstate main/MainWindow.cpp main/MainWindow.h
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Jan 04 14:22:39 2017 +0000
+++ b/.hgsubstate	Wed Jan 04 16:03:12 2017 +0000
@@ -7,7 +7,7 @@
 3d2cde3b1ab3d39c7f9e542250c288a9da0f6850 icons/scalable
 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
 af97cad61ff0a443cdf4a33a4ac867431dadaaae sv-dependency-builds
-9fb190c6521b5d464e88309cc6b2f282a9e4b91b svapp
-3dcd83595bc83d5b641597c6292bbb83f05d7d10 svcore
-f7bb22999d2e848e29d358156d8b4c6c2dd338fd svgui
+b3c35447ef31561c4a77fd0c7ae6106570f593a4 svapp
+8541563f1fd3d7584e73e3a0a084f5b012580ca8 svcore
+efc7586de49944669927148e9b61a7548dc6b334 svgui
 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
--- a/main/MainWindow.cpp	Wed Jan 04 14:22:39 2017 +0000
+++ b/main/MainWindow.cpp	Wed Jan 04 16:03:12 2017 +0000
@@ -59,7 +59,7 @@
 #include "widgets/ActivityLog.h"
 #include "widgets/UnitConverter.h"
 #include "audio/AudioCallbackPlaySource.h"
-#include "audio/AudioRecordTarget.h"
+#include "audio/AudioCallbackRecordTarget.h"
 #include "audio/PlaySpeedRangeMapper.h"
 #include "data/fileio/DataFileReaderFactory.h"
 #include "data/fileio/PlaylistFileReader.h"
@@ -4226,7 +4226,7 @@
 }
 
 void
-MainWindow::outputLevelsChanged(float left, float right)
+MainWindow::monitoringLevelsChanged(float left, float right)
 {
     m_mainLevelPan->setMonitoringLevels(left, right);
 }
--- a/main/MainWindow.h	Wed Jan 04 14:22:39 2017 +0000
+++ b/main/MainWindow.h	Wed Jan 04 16:03:12 2017 +0000
@@ -133,7 +133,7 @@
     virtual void slowDownPlayback();
     virtual void restoreNormalPlayback();
 
-    virtual void outputLevelsChanged(float, float);
+    virtual void monitoringLevelsChanged(float, float);
 
     virtual void layerRemoved(Layer *);
     virtual void layerInAView(Layer *, bool);