[Traverso-commit] traverso/src/traverso/songcanvas AudioClipView....

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/30 06:31:57

Modified files:
        src/traverso/songcanvas: AudioClipView.cpp CurveView.cpp 
                                 CurveView.h 

Log message:
        stop following playhead on curve edits

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.cpp?cvsroot=traverso&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/CurveView.h?cvsroot=traverso&r1=1.9&r2=1.10

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- AudioClipView.cpp   24 May 2007 20:36:17 -0000      1.70
+++ AudioClipView.cpp   30 May 2007 06:31:56 -0000      1.71
@@ -82,6 +82,7 @@
        // we call curveviews calculate_bounding_rect() function!
        curveView->set_start_offset(m_clip->get_source_start_frame());
        curveView->calculate_bounding_rect();
+       connect(curveView, SIGNAL(curveModified()), m_sv, 
SLOT(stop_follow_play_head()));
        
        connect(m_clip, SIGNAL(muteChanged()), this, SLOT(repaint()));
        connect(m_clip, SIGNAL(stateChanged()), this, SLOT(repaint()));

Index: CurveView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- CurveView.cpp       30 May 2007 06:05:06 -0000      1.51
+++ CurveView.cpp       30 May 2007 06:31:57 -0000      1.52
@@ -469,6 +469,8 @@
        PENTER;
        QPointF point = mapFromScene(cpointer().scene_pos());
        
+       emit curveModified();
+       
        CurveNode* node = new CurveNode(m_curve, point.x() * m_sv->scalefactor 
+ m_startoffset,
                                         (m_boundingRect.height() - point.y()) 
/ m_boundingRect.height());
        return m_curve->add_node(node);
@@ -481,6 +483,8 @@
 
        QPointF 
origPos(mapFromScene(QPoint(cpointer().on_first_input_event_scene_x(), 
cpointer().on_first_input_event_scene_y())));
 
+       emit curveModified();
+
        update_softselected_node(QPoint((int)origPos.x(), (int)origPos.y()), 
true);
 
        if (m_blinkingNode) {
@@ -506,6 +510,8 @@
                CurveNode* node = m_blinkingNode->get_curve_node();
                int index = nodeList->indexOf(node);
 
+               emit curveModified();
+               
                if (index > 0) {
                        min = nodeList->at(index-1)->get_when() + 1;
                }

Index: CurveView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/CurveView.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CurveView.h 26 Apr 2007 13:46:42 -0000      1.9
+++ CurveView.h 30 May 2007 06:31:57 -0000      1.10
@@ -81,8 +81,10 @@
        void remove_curvenode_view(CurveNode* node);
        void node_moved();
        void set_view_mode();
-       
        void update_blink_color();
+       
+signals :
+       void curveModified();
 };