X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracksedit.C;h=8a8602f6090f8032b150d42b8cb001a757ab28c2;hb=13a039ef755e81e65c9479b4b615fd89bfe3e038;hp=bf250b36623cd26379552478abfc719c22d1e01c;hpb=9303c74f396d12f0fb48639ff6a835824cbc5987;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/tracksedit.C b/cinelerra-5.1/cinelerra/tracksedit.C
index bf250b36..8a8602f6 100644
--- 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;
@@ -865,11 +865,11 @@ int Tracks::move_track_up(Track *track)
 		while( dst && !dst->master ) { dst = dst->previous; }
 	}
 	if( src == dst ) return 1;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
-int Tracks::move_track_down(Track *track)
+int Tracks::roll_track_down(Track *track)
 {
 	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;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
 
-int Tracks::move_tracks_up()
+int Tracks::roll_tracks_up()
 {
 	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;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	return 0;
 }
 
-int Tracks::move_tracks_down()
+int Tracks::roll_tracks_down()
 {
 	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;
-	move_tracks(src, dst, n);
+	roll_tracks(src, dst, n);
 	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;
@@ -933,7 +933,7 @@ int Tracks::swap_track_up(Track *track)
 	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;
@@ -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;
@@ -961,7 +961,7 @@ int Tracks::swap_tracks_up()
 	return result;
 }
 
-int Tracks::swap_tracks_down()
+int Tracks::move_tracks_down()
 {
 	int result = 0;
 	Track *prev = last;
@@ -1013,7 +1013,6 @@ void Tracks::paste_automation(double selectionstart,
 	Track* current_atrack = 0;
 	Track* current_vtrack = 0;
 	Track* dst_track = 0;
-	int src_type;
 	int result = 0;
 	double length;
 	double frame_rate = edl->session->frame_rate;
@@ -1022,10 +1021,9 @@ void Tracks::paste_automation(double selectionstart,
 	string[0] = 0;
 
 // Search for start
-	do{
-	  result = file->read_tag();
-	}while(!result &&
-		!file->tag.title_is("AUTO_CLIPBOARD"));
+	do {
+		result = file->read_tag();
+	} while(!result && !file->tag.title_is("AUTO_CLIPBOARD"));
 
 	if(!result)
 	{
@@ -1033,7 +1031,6 @@ void Tracks::paste_automation(double selectionstart,
 		frame_rate = file->tag.get_property("FRAMERATE", frame_rate);
 		sample_rate = file->tag.get_property("SAMPLERATE", sample_rate);
 
-
 		do
 		{
 			result = file->read_tag();
@@ -1048,15 +1045,9 @@ void Tracks::paste_automation(double selectionstart,
 				if(file->tag.title_is("TRACK"))
 				{
 					file->tag.get_property("TYPE", string);
-					if(!strcmp(string, "AUDIO"))
-					{
-						src_type = TRACK_AUDIO;
-					}
-					else
-					{
-						src_type = TRACK_VIDEO;
-					}
-
+					double src_rate = !strcmp(string, "AUDIO") ?
+						sample_rate : frame_rate;
+					double src_length = length / src_rate;
 // paste to any media type
 					if(typeless)
 					{
@@ -1098,22 +1089,9 @@ void Tracks::paste_automation(double selectionstart,
 
 					if(dst_track)
 					{
-						double frame_rate2 = frame_rate;
-						double sample_rate2 = sample_rate;
-
-						if(src_type != dst_track->data_type)
-						{
-							frame_rate2 = sample_rate;
-							sample_rate2 = frame_rate;
-						}
-
-						dst_track->paste_automation(selectionstart,
-							length,
-							frame_rate2,
-							sample_rate2,
-							file,
-							default_only,
-							active_only);
+						dst_track->paste_automation(file,
+							selectionstart, src_length, src_rate,
+							default_only, active_only);
 					}
 				}
 			}