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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/26 23:43:22

Modified files:
        src/traverso/songcanvas: AudioClipView.cpp FadeView.cpp 
                                 FadeView.h SongView.cpp SongView.h 

Log message:
        fix jumpiness when paging the h_scrollbar, stop_follow_playhead() when 
you edit a clip's fade in/out

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.cpp?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/FadeView.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.34&r2=1.35

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- AudioClipView.cpp   8 Jun 2007 10:25:14 -0000       1.74
+++ AudioClipView.cpp   26 Jun 2007 23:43:21 -0000      1.75
@@ -569,6 +569,7 @@
        PENTER;
        FadeView* view = new FadeView(m_sv, this, fade);
        m_fadeViews.append(view);
+       connect(view, SIGNAL(fadeModified()), m_sv, 
SLOT(stop_follow_play_head()));
 #if QT_VERSION < 0x040300
        scene()->addItem(view);
 #endif

Index: FadeView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- FadeView.cpp        30 May 2007 13:14:48 -0000      1.17
+++ FadeView.cpp        26 Jun 2007 23:43:21 -0000      1.18
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: FadeView.cpp,v 1.17 2007/05/30 13:14:48 r_sijrier Exp $
+$Id: FadeView.cpp,v 1.18 2007/06/26 23:43:21 benjie Exp $
 */
 
 #include "FadeView.h"
@@ -247,6 +247,8 @@
        prepareGeometryChange();
        calculate_bounding_rect();
        update();
+       
+       emit fadeModified();
 }
 
 

Index: FadeView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/FadeView.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FadeView.h  23 Feb 2007 13:54:33 -0000      1.3
+++ FadeView.h  26 Jun 2007 23:43:21 -0000      1.4
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: FadeView.h,v 1.3 2007/02/23 13:54:33 r_sijrier Exp $
+$Id: FadeView.h,v 1.4 2007/06/26 23:43:21 benjie Exp $
 */
 
 #ifndef FADE_VIEW_H
@@ -64,6 +64,9 @@
        Command* bend();
        Command* strength();
 //     Command* edit_properties();
+
+signals :
+       void fadeModified();
 };
 
 inline int FadeView::type() const {return Type;}

Index: SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- SongView.cpp        26 Jun 2007 20:08:51 -0000      1.71
+++ SongView.cpp        26 Jun 2007 23:43:21 -0000      1.72
@@ -115,8 +115,9 @@
        connect(m_song, SIGNAL(trackRemoved(Track*)), this, 
SLOT(remove_trackview(Track*)));
        connect(m_song, SIGNAL(lastFramePositionChanged()), this, 
SLOT(update_scrollbars()));
        connect(m_song, SIGNAL(modeChanged()), this, SLOT(song_mode_changed()));
-       connect(&m_shuttletimer, SIGNAL(timeout() ), this, SLOT 
(update_shuttle()) );
+       connect(&m_shuttletimer, SIGNAL(timeout()), this, SLOT 
(update_shuttle()));
        connect(m_hScrollBar, SIGNAL(sliderMoved(int)), this, 
SLOT(stop_follow_play_head()));
+       connect(m_hScrollBar, SIGNAL(actionTriggered(int)), this, 
SLOT(hscrollbar_action(int)));
        connect(m_hScrollBar, SIGNAL(valueChanged(int)), this, 
SLOT(hscrollbar_value_changed(int)));
        connect(m_vScrollBar, SIGNAL(valueChanged(int)), 
m_clipsViewPort->verticalScrollBar(), SLOT(setValue(int)));
        
@@ -567,6 +568,13 @@
        return m_clipsViewPort->horizontalScrollBar()->value();
 }
 
+void SongView::hscrollbar_action(int action)
+{
+       if (action == QAbstractSlider::SliderPageStepAdd || action == 
QAbstractSlider::SliderPageStepSub) {
+               stop_follow_play_head();
+       }
+}
+
 int SongView::vscrollbar_value() const
 {
        return m_clipsViewPort->verticalScrollBar()->value();

Index: SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- SongView.h  16 Jun 2007 15:53:46 -0000      1.34
+++ SongView.h  26 Jun 2007 23:43:21 -0000      1.35
@@ -159,6 +159,7 @@
        void update_shuttle();
        void song_mode_changed();
        void hscrollbar_value_changed(int);
+       void hscrollbar_action(int);
 };