Mercurial > hg > svapp

changeset 367:1e4fa2007e61 warnfix_no_size_t

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix signal/slot name
author Chris Cannam
date Tue, 17 Jun 2014 17:00:26 +0100
parents 0876ea394902
children f1cab64363d7
files audioio/AudioCallbackPlaySource.cpp audioio/AudioCallbackPlaySource.h
diffstat 2 files changed, 14 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/AudioCallbackPlaySource.cpp	Tue Jun 17 16:23:06 2014 +0100
+++ b/audioio/AudioCallbackPlaySource.cpp	Tue Jun 17 17:00:26 2014 +0100
@@ -255,8 +255,8 @@
 	emit modelReplaced();
     }
 
-    connect(model, SIGNAL(modelChanged(int, int)),
-            this, SLOT(modelChanged(int, int)));
+    connect(model, SIGNAL(modelChangedWithin(int, int)),
+            this, SLOT(modelChangedWithin(int, int)));
 
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
     cout << "AudioCallbackPlaySource::addModel: awakening thread" << endl;
@@ -266,10 +266,14 @@
 }
 
 void
-AudioCallbackPlaySource::modelChanged(int , int endFrame)
+AudioCallbackPlaySource::modelChangedWithin(int 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+                                            startFrame
+#endif
+                                            , int endFrame)
 {
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
-    SVDEBUG << "AudioCallbackPlaySource::modelChanged(" << startFrame << "," << endFrame << ")" << endl;
+    SVDEBUG << "AudioCallbackPlaySource::modelChangedWithin(" << startFrame << "," << endFrame << ")" << endl;
 #endif
     if (endFrame > m_lastModelEndFrame) {
         m_lastModelEndFrame = endFrame;
@@ -286,8 +290,8 @@
     cout << "AudioCallbackPlaySource::removeModel(" << model << ")" << endl;
 #endif
 
-    disconnect(model, SIGNAL(modelChanged(int, int)),
-               this, SLOT(modelChanged(int, int)));
+    disconnect(model, SIGNAL(modelChangedWithin(int, int)),
+               this, SLOT(modelChangedWithin(int, int)));
 
     m_models.erase(model);
 
@@ -307,7 +311,9 @@
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
 	cout << "AudioCallbackPlaySource::removeModel(" << model << "): checking end frame on model " << *i << endl;
 #endif
-	if ((*i)->getEndFrame() > lastEnd) lastEnd = (*i)->getEndFrame();
+	if ((*i)->getEndFrame() > lastEnd) {
+            lastEnd = (*i)->getEndFrame();
+        }
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
 	cout << "(done, lastEnd now " << lastEnd << ")" << endl;
 #endif
--- a/audioio/AudioCallbackPlaySource.h	Tue Jun 17 16:23:06 2014 +0100
+++ b/audioio/AudioCallbackPlaySource.h	Tue Jun 17 17:00:26 2014 +0100
@@ -260,7 +260,7 @@
     void playSelectionModeChanged();
     void playParametersChanged(PlayParameters *);
     void preferenceChanged(PropertyContainer::PropertyName);
-    void modelChanged(int startFrame, int endFrame);
+    void modelChangedWithin(int startFrame, int endFrame);
 
 protected:
     ViewManagerBase                  *m_viewManager;