projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch move/swap tracks, add mv trk shortcut, update msg
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
tracksedit.C
diff --git
a/cinelerra-5.1/cinelerra/tracksedit.C
b/cinelerra-5.1/cinelerra/tracksedit.C
index a3dfca741e4a69f784285087a934e65b2ead7e98..8a8602f6090f8032b150d42b8cb001a757ab28c2 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracksedit.C
+++ b/
cinelerra-5.1/cinelerra/tracksedit.C
@@
-851,7
+851,7
@@
int Tracks::copy(int copy_flags, double start, double end,
-int Tracks::
move
_track_up(Track *track)
+int Tracks::
roll
_track_up(Track *track)
{
if( first == last ) return 1;
int n = 1;
{
if( first == last ) return 1;
int n = 1;
@@
-865,11
+865,11
@@
int Tracks::move_track_up(Track *track)
while( dst && !dst->master ) { dst = dst->previous; }
}
if( src == dst ) return 1;
while( dst && !dst->master ) { dst = dst->previous; }
}
if( src == dst ) return 1;
-
move
_tracks(src, dst, n);
+
roll
_tracks(src, dst, n);
return 0;
}
return 0;
}
-int Tracks::
move
_track_down(Track *track)
+int Tracks::
roll
_track_down(Track *track)
{
if( first == last ) return 1;
int n = 1;
{
if( first == last ) return 1;
int n = 1;
@@
-890,12
+890,12
@@
int Tracks::move_track_down(Track *track)
else
dst = !dst ? first : dst->next;
if( src == dst ) return 1;
else
dst = !dst ? first : dst->next;
if( src == dst ) return 1;
-
move
_tracks(src, dst, n);
+
roll
_tracks(src, dst, n);
return 0;
}
return 0;
}
-int Tracks::
move
_tracks_up()
+int Tracks::
roll
_tracks_up()
{
if( first == last ) return 1;
int n = 1;
{
if( first == last ) return 1;
int n = 1;
@@
-905,11
+905,11
@@
int Tracks::move_tracks_up()
while( nxt && !nxt->master ) { ++n; nxt = nxt->next; }
}
if( src == dst ) return 1;
while( nxt && !nxt->master ) { ++n; nxt = nxt->next; }
}
if( src == dst ) return 1;
-
move
_tracks(src, dst, n);
+
roll
_tracks(src, dst, n);
return 0;
}
return 0;
}
-int Tracks::
move
_tracks_down()
+int Tracks::
roll
_tracks_down()
{
if( first == last ) return 1;
int n = 1;
{
if( first == last ) return 1;
int n = 1;
@@
-918,12
+918,12
@@
int Tracks::move_tracks_down()
while( src && !src->master ) { ++n; src = src->previous; }
}
if( src == dst ) return 1;
while( src && !src->master ) { ++n; src = src->previous; }
}
if( src == dst ) return 1;
-
move
_tracks(src, dst, n);
+
roll
_tracks(src, dst, n);
return 0;
}
return 0;
}
-int Tracks::
swap
_track_up(Track *track)
+int Tracks::
move
_track_up(Track *track)
{
Track *next_track = track->previous;
if(!next_track) next_track = last;
{
Track *next_track = track->previous;
if(!next_track) next_track = last;
@@
-933,7
+933,7
@@
int Tracks::swap_track_up(Track *track)
return 0;
}
return 0;
}
-int Tracks::
swap
_track_down(Track *track)
+int Tracks::
move
_track_down(Track *track)
{
Track *next_track = track->next;
if(!next_track) next_track = first;
{
Track *next_track = track->next;
if(!next_track) next_track = first;
@@
-944,7
+944,7
@@
int Tracks::swap_track_down(Track *track)
}
}
-int Tracks::
swap
_tracks_up()
+int Tracks::
move
_tracks_up()
{
int result = 0;
Track *next = first;
{
int result = 0;
Track *next = first;
@@
-961,7
+961,7
@@
int Tracks::swap_tracks_up()
return result;
}
return result;
}
-int Tracks::
swap
_tracks_down()
+int Tracks::
move
_tracks_down()
{
int result = 0;
Track *prev = last;
{
int result = 0;
Track *prev = last;