histogram rework to add sum_frames, update suv/cakewalk autorange icons, add new...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / tracks.C

diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C
index 73e7706d3452125bf03a92165eed4174a5373ae3..07524f1f342ccb296a1b32dfb9eda4b6e6b7071d 100644 (file)
--- a/cinelerra-5.1/cinelerra/tracks.C
+++ b/cinelerra-5.1/cinelerra/tracks.C
@@ -336,8 +336,7 @@ int Tracks::delete_track(Track *track, int gang)
                gang = edl->session->gang_tracks != GANG_NONE ? 1 : 0;
        Track *nxt = track->next;
        if( gang ) {
-               while( track && !track->master && track->previous )
-                       track = track->previous;
+               track = track->gang_master();
                while( nxt && !nxt->master )
                        nxt = nxt->next;
        }
@@ -783,7 +782,7 @@ Track *Tracks::get(int idx, int data_type)
        return 0;
 }
 
-void Tracks::move_tracks(Track *src, Track *dst, int n)
+void Tracks::roll_tracks(Track *src, Track *dst, int n)
 {
        if( src == dst ) return;
        while( --n >= 0 && src ) {