[Traverso-commit] traverso/src/traverso/songcanvas Cursors.cpp So...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/16 15:53:46

Modified files:
        src/traverso/songcanvas: Cursors.cpp SongView.h 

Log message:
        use songview to set scrollbar position (fixes non-scrolling hscrollbar 
during playback)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/Cursors.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.33&r2=1.34

Patches:
Index: Cursors.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/Cursors.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Cursors.cpp 30 May 2007 18:04:18 -0000      1.23
+++ Cursors.cpp 16 Jun 2007 15:53:45 -0000      1.24
@@ -139,11 +139,10 @@
                return;
        }
        
-       QScrollBar* horizontalScrollbar = m_vp->horizontalScrollBar();
        int vpWidth = m_vp->viewport()->width();
        
        if (m_mode == CENTERED) {
-               horizontalScrollbar->setValue((int)scenePos().x() - (int)(0.5 * 
vpWidth));
+               m_sv->set_hscrollbar_value((int)scenePos().x() - (int)(0.5 * 
vpWidth));
                return;
        }
         
@@ -152,7 +151,8 @@
        if (vppoint.x() < 0 || (vppoint.x() > vpWidth)) {
                
                // If the playhead is _not_ in the viewports range, center it 
in the middle!
-               horizontalScrollbar->setValue((int) ((int)scenePos().x() - (0.5 
* vpWidth)) );
+//             horizontalScrollbar->setValue((int) ((int)scenePos().x() - (0.5 
* vpWidth)) );
+               m_sv->set_hscrollbar_value((int)scenePos().x() - (int)(0.5 * 
vpWidth));
        
        } else if (vppoint.x() > ( vpWidth * 0.85) ) {
                
@@ -165,14 +165,14 @@
                                m_totalAnimValue = 0;
                                m_animation.setFrameRange(0, m_animFrameRange);
                                calculate_total_anim_frames();
-                               m_animationScrollStartPos = 
horizontalScrollbar->value();
+                               m_animationScrollStartPos = 
m_sv->hscrollbar_value();
                                //during the animation, we stop the play update 
timer
                                // to avoid unnecessary update/paint events
                                play_stop();
                                m_animation.start();
                        }
                } else {
-                       horizontalScrollbar->setValue((int) 
((int)scenePos().x() - (0.1 * vpWidth)) );
+                       m_sv->set_hscrollbar_value((int) ((int)scenePos().x() - 
(0.1 * vpWidth)) );
                }
        }
 }
@@ -193,7 +193,7 @@
                setPos(newPos);
        }
        
-       m_vp->horizontalScrollBar()->setValue(newXPos);
+       m_sv->set_hscrollbar_value(newXPos);
 }
 
 void PlayHead::calculate_total_anim_frames()

Index: SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- SongView.h  4 Jun 2007 23:37:57 -0000       1.33
+++ SongView.h  16 Jun 2007 15:53:46 -0000      1.34
@@ -119,6 +119,8 @@
        void set_hscrollbar_value(int value);
        void set_vscrollbar_value(int value);
 
+       friend class PlayHead;
+
 
 public slots:
        void set_snap_range(int);