[Sv1-commits] SF.net SVN: sv1:[1712] sonic-visualiser/trunk/framework/MainWindowBase.cpp

[<ca...@us...>]

Revision: 1712
          http://sv1.svn.sourceforge.net/sv1/?rev=1712&view=rev
Author:   cannam
Date:     2010-06-15 10:39:06 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------

* Ensure solo works correctly when switching to a waveform that was
  generated via an effects transform from another waveform that's in a
  different pane (previously, switching to the generated version would
  leave both playing)

Modified Paths:
--------------
    sonic-visualiser/trunk/framework/MainWindowBase.cpp

Modified: sonic-visualiser/trunk/framework/MainWindowBase.cpp
===================================================================
--- sonic-visualiser/trunk/framework/MainWindowBase.cpp	2010-06-08 12:30:28 UTC (rev 1711)
+++ sonic-visualiser/trunk/framework/MainWindowBase.cpp	2010-06-15 10:39:06 UTC (rev 1712)
@@ -531,7 +531,13 @@
     View::ModelSet sources;
     for (View::ModelSet::iterator mi = soloModels.begin();
          mi != soloModels.end(); ++mi) {
-        if (*mi && (*mi)->getSourceModel()) {
+        // If a model in this pane is derived from something else,
+        // then we want to play that model as well -- if the model
+        // that's derived from it is not something that is itself
+        // individually playable (e.g. a waveform)
+        if (*mi &&
+            !dynamic_cast<RangeSummarisableTimeValueModel *>(*mi) &&
+            (*mi)->getSourceModel()) {
             sources.insert((*mi)->getSourceModel());
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.