[Traverso-commit] traverso/src commands/MoveClip.cpp traverso/son...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/28 03:11:28

Modified files:
        src/commands   : MoveClip.cpp 
        src/traverso/songcanvas: TrackView.h 

Log message:
        Fix a crash bug which happens when copying clips that are smaller than 
3-4 pixels (the new clip wasn't in the context items list for some reason, so 
look in the track's clipview list instead)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.h?cvsroot=traverso&r1=1.18&r2=1.19

Patches:
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- commands/MoveClip.cpp       27 Jun 2007 13:19:49 -0000      1.47
+++ commands/MoveClip.cpp       28 Jun 2007 03:11:28 -0000      1.48
@@ -105,10 +105,10 @@
 
 void MoveClip::audioclip_added(AudioClip * clip)
 {
-       QList<QObject* > items = cpointer().get_context_items();
+       QList<AudioClipView* >* clipviews = 
d->view->get_trackview()->get_clipviews();
        
-       foreach(QObject* obj, items) {
-               AudioClipView* acv = qobject_cast<AudioClipView*>(obj);
+       for (int i = 0; i < clipviews->size(); ++i) {
+               AudioClipView* acv = clipviews->at(i);
                
                if ( ! acv) {
                        continue;

Index: traverso/songcanvas/TrackView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- traverso/songcanvas/TrackView.h     2 May 2007 05:58:20 -0000       1.18
+++ traverso/songcanvas/TrackView.h     28 Jun 2007 03:11:28 -0000      1.19
@@ -47,6 +47,7 @@
        void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, 
QWidget *widget);
        
        Track* get_track() const;
+       QList<AudioClipView* >* get_clipviews() {return &m_clipViews;}
        TrackPanelView* get_trackpanel_view() const;
        
        int get_childview_y_offset() const;