[Traverso-commit] traverso/src core/Song.cpp traverso/songcanvas/...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/27 13:34:34

Modified files:
        src/core       : Song.cpp 
        src/traverso/songcanvas: SongView.cpp 

Log message:
        * sort track list when they are added to a Song
        * re-set the track's sort index when they are added/removed in SongView

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.159&r2=1.160
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.84&r2=1.85

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- core/Song.cpp       24 Nov 2007 11:07:45 -0000      1.159
+++ core/Song.cpp       27 Nov 2007 13:34:33 -0000      1.160
@@ -1056,7 +1056,7 @@
 
 void Song::private_add_track(Track* track)
 {
-       m_tracks.append(track);
+       m_tracks.add_and_sort(track);
 }
 
 void Song::private_remove_track(Track* track)

Index: traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- traverso/songcanvas/SongView.cpp    23 Nov 2007 17:55:39 -0000      1.84
+++ traverso/songcanvas/SongView.cpp    27 Nov 2007 13:34:33 -0000      1.85
@@ -209,6 +209,10 @@
                
m_trackViews.at(m_trackViews.size()-1)->get_track()->set_height(height);
        }
        
+       for(int i=0; i<m_trackViews.size(); ++i) {
+               m_trackViews.at(i)->get_track()->set_sort_index(i);
+       }
+       
        layout_tracks();
 }
 
@@ -222,10 +226,15 @@
                        m_trackViews.removeAll(view);
                        delete view;
                        delete tpv;
-                       layout_tracks();
-                       return;
+                       break;
                }
        }
+       
+       for(int i=0; i<m_trackViews.size(); ++i) {
+               m_trackViews.at(i)->get_track()->set_sort_index(i);
+       }
+       
+       layout_tracks();
 }
 
 void SongView::update_scrollbars()