[Sv1-commits] SF.net SVN: sv1: [749] sonic-visualiser/branches/match-alignment

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

Revision: 749
          http://sv1.svn.sourceforge.net/sv1/?rev=749&view=rev
Author:   cannam
Date:     2007-09-28 05:49:01 -0700 (Fri, 28 Sep 2007)

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

* bit of tidying

Modified Paths:
--------------
    sonic-visualiser/branches/match-alignment/sv/main/MainWindow.cpp
    sonic-visualiser/branches/match-alignment/view/View.cpp
    sonic-visualiser/branches/match-alignment/view/ViewManager.cpp
    sonic-visualiser/branches/match-alignment/view/ViewManager.h

Modified: sonic-visualiser/branches/match-alignment/sv/main/MainWindow.cpp
===================================================================
--- sonic-visualiser/branches/match-alignment/sv/main/MainWindow.cpp	2007-09-28 12:38:58 UTC (rev 748)
+++ sonic-visualiser/branches/match-alignment/sv/main/MainWindow.cpp	2007-09-28 12:49:01 UTC (rev 749)
@@ -2023,8 +2023,11 @@
 	m_viewManager->setPlaySoloMode(!m_viewManager->getPlaySoloMode());
     }
 
-    if (!m_viewManager->getPlaySoloMode() && m_playSource) {
-        m_playSource->setSoloModelSet(std::set<Model *>());
+    if (!m_viewManager->getPlaySoloMode()) {
+        m_viewManager->setPlaybackModel(0);
+        if (m_playSource) {
+            m_playSource->setSoloModelSet(std::set<Model *>());
+        }
     }
 }
 
@@ -2039,6 +2042,7 @@
     if (!(m_viewManager &&
           m_playSource &&
           m_viewManager->getPlaySoloMode())) {
+        if (m_viewManager) m_viewManager->setPlaybackModel(0);
         return;
     }
 

Modified: sonic-visualiser/branches/match-alignment/view/View.cpp
===================================================================
--- sonic-visualiser/branches/match-alignment/view/View.cpp	2007-09-28 12:38:58 UTC (rev 748)
+++ sonic-visualiser/branches/match-alignment/view/View.cpp	2007-09-28 12:49:01 UTC (rev 749)
@@ -20,12 +20,10 @@
 #include "base/Profiler.h"
 #include "base/Pitch.h"
 
-#include "layer/TimeRulerLayer.h" //!!! damn, shouldn't be including that here
+#include "layer/TimeRulerLayer.h"
 #include "layer/SingleColourLayer.h"
-#include "data/model/PowerOfSqrtTwoZoomConstraint.h" //!!! likewise
+#include "data/model/PowerOfSqrtTwoZoomConstraint.h"
 
-#include "layer/WaveformLayer.h" //!!! alignment hack
-
 #include <QPainter>
 #include <QPaintEvent>
 #include <QRect>
@@ -1058,11 +1056,11 @@
     return 0;
 }
 
-//!!!
 int
 View::getAlignedPlaybackFrame() const
 {
     if (!m_manager) return 0;
+    if (!m_manager->getPlaybackModel()) return 0;
 
     RangeSummarisableTimeValueModel *waveformModel = 0;
     for (LayerList::const_iterator i = m_layers.begin(); i != m_layers.end(); ++i) {

Modified: sonic-visualiser/branches/match-alignment/view/ViewManager.cpp
===================================================================
--- sonic-visualiser/branches/match-alignment/view/ViewManager.cpp	2007-09-28 12:38:58 UTC (rev 748)
+++ sonic-visualiser/branches/match-alignment/view/ViewManager.cpp	2007-09-28 12:49:01 UTC (rev 749)
@@ -31,6 +31,7 @@
     m_globalCentreFrame(0),
     m_globalZoom(1024),
     m_playbackFrame(0),
+    m_playbackModel(0),
     m_mainModelSampleRate(0),
     m_lastLeft(0), 
     m_lastRight(0),
@@ -157,8 +158,6 @@
     }
 }
 
-//!!!
-
 Model *
 ViewManager::getPlaybackModel() const
 {

Modified: sonic-visualiser/branches/match-alignment/view/ViewManager.h
===================================================================
--- sonic-visualiser/branches/match-alignment/view/ViewManager.h	2007-09-28 12:38:58 UTC (rev 748)
+++ sonic-visualiser/branches/match-alignment/view/ViewManager.h	2007-09-28 12:49:01 UTC (rev 749)
@@ -65,7 +65,7 @@
     unsigned long getPlaybackFrame() const;
     void setPlaybackFrame(unsigned long frame);
 
-    //!!!
+    // Only meaningful in solo mode, and used for optional alignment feature
     Model *getPlaybackModel() const;
     void setPlaybackModel(Model *);
 


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