X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedits.C;h=9e3c2a5efcd63a0d52b3cf42df26935420d9fd72;hp=765d657c40a95b658fabe0c4804ef8db81be2b1b;hb=c2e0e13ae922580f5eaa0953ade0f0958d1ab179;hpb=e41864cf7931bfb86f68c5d35d4578dfe161d386

diff --git a/cinelerra-5.1/cinelerra/edits.C b/cinelerra-5.1/cinelerra/edits.C
index 765d657c..9e3c2a5e 100644
--- a/cinelerra-5.1/cinelerra/edits.C
+++ b/cinelerra-5.1/cinelerra/edits.C
@@ -646,8 +646,7 @@ void Edits::clear_recursive(int64_t start, int64_t end,
 {
 //printf("Edits::clear_recursive 1\n");
 	track->clear(start, end,
-		edit_edits, edit_labels, edit_plugins, edit_autos, 0,
-		trim_edits);
+		edit_edits, edit_labels, edit_plugins, edit_autos, trim_edits);
 }
 
 
@@ -683,8 +682,7 @@ int Edits::clear_handle(double start, double end,
 // Lengthen effects
 					if(edit_plugins)
 						track->shift_effects(current_edit->next->startproject,
-							length,
-							edit_autos);
+								length, edit_autos, 0);
 
 					for(current_edit = current_edit->next; current_edit; current_edit = current_edit->next)
 					{
@@ -704,47 +702,38 @@ int Edits::clear_handle(double start, double end,
 
 int Edits::modify_handles(double oldposition, double newposition, int currentend,
 	int edit_mode, int edit_edits, int edit_labels, int edit_plugins, int edit_autos,
-	Edits *trim_edits)
+	Edits *trim_edits, int group_id)
 {
 	int result = 0;
 	Edit *current_edit;
+	Edit *left = 0, *right = 0;
+	if( group_id > 0 ) {
+		double start = DBL_MAX, end = DBL_MIN;
+		for( Edit *edit=first; edit; edit=edit->next ) {
+			if( edit->group_id != group_id ) continue;
+			double edit_start = edit->track->from_units(edit->startproject);
+			if( edit_start < start ) { start = edit_start;  left = edit; }
+			double edit_end = edit->track->from_units(edit->startproject+edit->length);
+			if( edit_end > end ) { end = edit_end;  right = edit; }
+		}
+	}
 
 //printf("Edits::modify_handles 1 %d %f %f\n", currentend, newposition, oldposition);
 	if(currentend == 0) {
 // left handle
 		for(current_edit = first; current_edit && !result;) {
-			if(edl->equivalent(track->from_units(current_edit->startproject),
-				oldposition)) {
+			if( group_id > 0 ? current_edit == left :
+			    edl->equivalent(track->from_units(current_edit->startproject),
+				oldposition) ) {
 // edit matches selection
 //printf("Edits::modify_handles 3 %f %f\n", newposition, oldposition);
+				double delta = newposition - oldposition;
 				oldposition = track->from_units(current_edit->startproject);
+				if( group_id > 0 ) newposition = oldposition + delta;
+				current_edit->shift_start(edit_mode,
+					track->to_units(newposition, 0), track->to_units(oldposition, 0),
+					edit_labels, edit_autos, edit_plugins, trim_edits);
 				result = 1;
-
-				if(newposition >= oldposition) {
-//printf("Edits::modify_handle 1 %s %f %f\n", track->title, oldposition, newposition);
-// shift start of edit in
-					current_edit->shift_start_in(edit_mode,
-						track->to_units(newposition, 0),
-						track->to_units(oldposition, 0),
-						edit_edits,
-						edit_labels,
-						edit_plugins,
-						edit_autos,
-						trim_edits);
-				}
-				else
-				{
-//printf("Edits::modify_handle 2 %s\n", track->title);
-// move start of edit out
-					current_edit->shift_start_out(edit_mode,
-						track->to_units(newposition, 0),
-						track->to_units(oldposition, 0),
-						edit_edits,
-						edit_labels,
-						edit_plugins,
-						edit_autos,
-						trim_edits);
-				}
 			}
 
 			if(!result) current_edit = current_edit->next;
@@ -753,40 +742,18 @@ int Edits::modify_handles(double oldposition, double newposition, int currentend
 	else {
 // right handle selected
 		for(current_edit = first; current_edit && !result;) {
-			if(edl->equivalent(track->from_units(current_edit->startproject) +
-				track->from_units(current_edit->length), oldposition)) {
-            	oldposition = track->from_units(current_edit->startproject) +
+			if( group_id > 0 ? current_edit == right :
+			    edl->equivalent(track->from_units(current_edit->startproject) +
+					track->from_units(current_edit->length), oldposition) ) {
+				double delta = newposition - oldposition;
+				oldposition = track->from_units(current_edit->startproject) +
 					track->from_units(current_edit->length);
+				if( group_id > 0 ) newposition = oldposition + delta;
 				result = 1;
 
-//printf("Edits::modify_handle 3\n");
-				if(newposition <= oldposition) {
-// shift end of edit in
-//printf("Edits::modify_handle 4\n");
-					current_edit->shift_end_in(edit_mode,
-						track->to_units(newposition, 0),
-						track->to_units(oldposition, 0),
-						edit_edits,
-						edit_labels,
-						edit_plugins,
-						edit_autos,
-						trim_edits);
-//printf("Edits::modify_handle 5\n");
-				}
-				else
-				{
-// move end of edit out
-//printf("Edits::modify_handle %d edit_mode=%d\n", __LINE__, edit_mode);
-					current_edit->shift_end_out(edit_mode,
-						track->to_units(newposition, 0),
-						track->to_units(oldposition, 0),
-						edit_edits,
-						edit_labels,
-						edit_plugins,
-						edit_autos,
-						trim_edits);
-//printf("Edits::modify_handle 7\n");
-				}
+				current_edit->shift_end(edit_mode,
+					track->to_units(newposition, 0), track->to_units(oldposition, 0),
+					edit_labels, edit_autos, edit_plugins, trim_edits);
 			}
 
 			if(!result) current_edit = current_edit->next;
@@ -798,7 +765,6 @@ int Edits::modify_handles(double oldposition, double newposition, int currentend
 	return 0;
 }
 
-
 void Edits::paste_silence(int64_t start, int64_t end)
 {
 	Edit *new_edit = editof(start, PLAY_FORWARD, 0);
@@ -848,6 +814,6 @@ void Edits::shift_keyframes_recursive(int64_t position, int64_t length)
 
 void Edits::shift_effects_recursive(int64_t position, int64_t length, int edit_autos)
 {
-	track->shift_effects(position, length, edit_autos);
+	track->shift_effects(position, length, edit_autos, 0);
 }