X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=7618d48dbcd96bb5f32f7325f91d389a1fe639cb;hp=c680d8c634c4854ba86eb64af4eae0449ac17d01;hb=834732af87bfd7f1d4035109f31e48db12b415fa;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index c680d8c6..7618d48d 100644
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -29,6 +29,7 @@
 #include "edlsession.h"
 #include "filexml.h"
 #include "filesystem.h"
+#include "labels.h"
 #include "localsession.h"
 #include "plugin.h"
 #include "mainsession.h"
@@ -83,8 +84,11 @@ void Edit::reset()
 	user_title[0] = 0;
 	nested_edl = 0;
 	is_plugin = 0;
+	is_selected = 0;
 	hard_left = 0;
 	hard_right = 0;
+	color = 0;
+	group_id = 0;
 }
 
 Indexable* Edit::get_source()
@@ -140,6 +144,8 @@ int Edit::copy(int64_t start,
 			file->tag.set_property("LENGTH", length_in_selection);
 			file->tag.set_property("HARD_LEFT", hard_left);
 			file->tag.set_property("HARD_RIGHT", hard_right);
+			file->tag.set_property("COLOR", color);
+			file->tag.set_property("GROUP_ID", group_id);
 			if(user_title[0]) file->tag.set_property("USER_TITLE", user_title);
 //printf("Edit::copy 5\n");
 
@@ -238,6 +244,13 @@ int Edit::silence()
 		*((SEdit *)this)->get_text()) ? 0 : 1;
 }
 
+void Edit::set_selected(int v)
+{
+	if( group_id )
+		edl->tracks->set_group_selected(group_id, v);
+	else
+		is_selected = v >= 0 ? v : !is_selected ? 1 : 0;
+}
 
 void Edit::copy_from(Edit *edit)
 {
@@ -248,6 +261,8 @@ void Edit::copy_from(Edit *edit)
 	this->length = edit->length;
 	this->hard_left = edit->hard_left;
 	this->hard_right = edit->hard_right;
+	this->color = edit->color;
+	this->group_id = edit->group_id;
 	strcpy (this->user_title, edit->user_title);
 
 	if(edit->transition)
@@ -323,8 +338,6 @@ int Edit::identical(Edit &edit)
 		this->startsource == edit.startsource &&
 		this->startproject == edit.startproject &&
 		this->length == edit.length &&
-		this->hard_left == edit.hard_left &&
-		this->hard_right == edit.hard_right &&
 		this->transition == edit.transition &&
 		this->channel == edit.channel);
 	return result;
@@ -376,7 +389,8 @@ int Edit::dump(FILE *fp)
 		asset,
 		asset ? asset->path : "");
 	fflush(fp);
-	fprintf(fp,"      channel %d\n", channel);
+	fprintf(fp,"      channel %d, color %08x, group_id %d, is_selected %d\n",
+		channel, color, group_id, is_selected);
 	if(transition)
 	{
 		fprintf(fp,"      TRANSITION %p\n", transition);
@@ -393,6 +407,8 @@ int Edit::load_properties(FileXML *file, int64_t &startproject)
 	length = file->tag.get_property("LENGTH", (int64_t)0);
 	hard_left = file->tag.get_property("HARD_LEFT", (int64_t)0);
 	hard_right = file->tag.get_property("HARD_RIGHT", (int64_t)0);
+	color = file->tag.get_property("COLOR", 0);
+	group_id = file->tag.get_property("GROUP_ID", group_id);
 	user_title[0] = 0;
 	file->tag.get_property("USER_TITLE", user_title);
 	this->startproject = startproject;
@@ -402,380 +418,150 @@ int Edit::load_properties(FileXML *file, int64_t &startproject)
 
 void Edit::shift(int64_t difference)
 {
-//printf("Edit::shift 1 %p %jd %jd\n", this, startproject, difference);
 	startproject += difference;
-//printf("Edit::shift 2 %jd %jd\n", startproject, difference);
 }
 
-int Edit::shift_start_in(int edit_mode,
-	int64_t newposition,
-	int64_t oldposition,
-	int edit_edits,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	Edits *trim_edits)
+
+int Edit::shift_start(int edit_mode, int64_t newposition, int64_t oldposition,
+        int edit_edits, int edit_labels, int edit_plugins, int edit_autos,
+        Edits *trim_edits)
 {
+	int64_t startproject = this->startproject;
+	int64_t startsource = this->startsource;
+	int64_t length = this->length;
+	int64_t source_len = get_source_end(startsource + length);
 	int64_t cut_length = newposition - oldposition;
-	int64_t end_previous_source, end_source;
-
-	if(edit_mode == MOVE_ALL_EDITS)
-	{
-		if(cut_length < length)
-		{        // clear partial
-			edits->clear_recursive(oldposition,
-				newposition,
-				edit_edits,
-				edit_labels,
-				edit_plugins,
-				edit_autos,
-				trim_edits);
-		}
-		else
-		{        // clear entire
-			edits->clear_recursive(oldposition,
-				startproject + length,
-				edit_edits,
-				edit_labels,
-				edit_plugins,
-				edit_autos,
-				trim_edits);
-		}
-	}
-	else
-	if(edit_mode == MOVE_ONE_EDIT)
-	{
-// Paste silence and cut
-//printf("Edit::shift_start_in 1\n");
-		if(!previous)
-		{
-			Edit *new_edit = edits->create_edit();
-			new_edit->startproject = this->startproject;
-			new_edit->length = 0;
-			edits->insert_before(this,
-				new_edit);
-		}
-//printf("Edit::shift_start_in 2 %p\n", previous);
-
-		end_previous_source = previous->get_source_end(previous->startsource + previous->length + cut_length);
-		if(end_previous_source > 0 &&
-			previous->startsource + previous->length + cut_length > end_previous_source)
-			cut_length = end_previous_source - previous->startsource - previous->length;
-
-		if(cut_length < length)
-		{		// Move in partial
-			startproject += cut_length;
-			startsource += cut_length;
-			length -= cut_length;
-			previous->length += cut_length;
-//printf("Edit::shift_start_in 2\n");
-		}
-		else
-		{		// Clear entire edit
-			cut_length = length;
-			previous->length += cut_length;
-			for(Edit* current_edit = this; current_edit; current_edit = current_edit->next)
-			{
-				current_edit->startproject += cut_length;
-			}
-			edits->clear_recursive(oldposition + cut_length,
-				startproject + cut_length,
-				edit_edits,
-				edit_labels,
-				edit_plugins,
-				edit_autos,
-				trim_edits);
-		}
-//printf("Edit::shift_start_in 3\n");
-	}
-	else
-	if(edit_mode == MOVE_NO_EDITS)
-	{
-		end_source = get_source_end(startsource + length + cut_length);
-		if(end_source > 0 && startsource + length + cut_length > end_source)
-			cut_length = end_source - startsource - length;
+	source_len -= cut_length;
 
+	switch( edit_mode ) {
+	case MOVE_EDGE:
+		startproject += cut_length;
 		startsource += cut_length;
+		length -= cut_length;
+		break;
+	case MOVE_MEDIA:
+		startsource += cut_length;
+		break;
+	case MOVE_EDGE_MEDIA:
+		startproject += cut_length;
+		length -= cut_length;
+		break;
 	}
-	return 0;
-}
 
-int Edit::shift_start_out(int edit_mode,
-	int64_t newposition,
-	int64_t oldposition,
-	int edit_edits,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	Edits *trim_edits)
-{
-	int64_t cut_length = oldposition - newposition;
-
-
-	if(asset || nested_edl)
-	{
-		int64_t end_source = get_source_end(1);
-
-//printf("Edit::shift_start_out 1 %jd %jd\n", startsource, cut_length);
-		if(end_source > 0 && startsource < cut_length)
-		{
-			cut_length = startsource;
-		}
+	if( startproject < 0 ) {
+		startsource += startproject;
+		length += startproject;
+		startproject = 0;
 	}
-
-	if(edit_mode == MOVE_ALL_EDITS)
-	{
-//printf("Edit::shift_start_out 10 %jd\n", cut_length);
-		startsource -= cut_length;
-		length += cut_length;
-
-		if(edit_autos)
-			edits->shift_keyframes_recursive(startproject,
-				cut_length);
-		if(edit_plugins)
-			edits->shift_effects_recursive(startproject,
-				cut_length,
-				edit_autos);
-
-		for(Edit* current_edit = next; current_edit; current_edit = current_edit->next)
-		{
-			current_edit->startproject += cut_length;
-		}
+	if( startsource < 0 )
+		startsource = 0;
+	if( length > source_len )
+		length = source_len;
+	if( length < 0 )
+		length = 0;
+
+	int64_t start = this->startproject;
+	int64_t end = start + this->length;
+	if( edit_labels ) {
+		double cut_len = track->from_units(cut_length);
+		double start_pos = edits->track->from_units(start);
+		edits->edl->labels->insert(start_pos, cut_len);
+		double end_pos = edits->track->from_units(end);
+		edits->edl->labels->insert(end_pos + cut_len, -cut_len);
 	}
-	else
-	if(edit_mode == MOVE_ONE_EDIT)
-	{
-		if(previous)
-		{
-			if(cut_length < previous->length)
-			{   // Cut into previous edit
-				previous->length -= cut_length;
-				startproject -= cut_length;
-				startsource -= cut_length;
-				length += cut_length;
-			}
-			else
-			{   // Clear entire previous edit
-				cut_length = previous->length;
-				previous->length = 0;
-				length += cut_length;
-				startsource -= cut_length;
-				startproject -= cut_length;
-			}
-		}
+	if( edit_autos ) {
+		edits->shift_keyframes_recursive(start, cut_length);
+		edits->shift_keyframes_recursive(end + cut_length, -cut_length);
 	}
-	else
-	if(edit_mode == MOVE_NO_EDITS)
-	{
-		startsource -= cut_length;
+	if( edit_plugins ) {
+		edits->shift_effects_recursive(start, cut_length, 1);
+		edits->shift_effects_recursive(end + cut_length, -cut_length, 1);
 	}
-
-// Fix infinite length files
-	if(startsource < 0) startsource = 0;
-	return 0;
-}
-
-int Edit::shift_end_in(int edit_mode,
-	int64_t newposition,
-	int64_t oldposition,
-	int edit_edits,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	Edits *trim_edits)
-{
-	int64_t cut_length = oldposition - newposition;
-
-	if(edit_mode == MOVE_ALL_EDITS)
-	{
-//printf("Edit::shift_end_in 1\n");
-		if(newposition > startproject)
-		{        // clear partial edit
-//printf("Edit::shift_end_in %p %p\n", track->edits, edits);
-			edits->clear_recursive(newposition,
-				oldposition,
-				edit_edits,
-				edit_labels,
-				edit_plugins,
-				edit_autos,
-				trim_edits);
-		}
-		else
-		{        // clear entire edit
-			edits->clear_recursive(startproject,
-				oldposition,
-				edit_edits,
-				edit_labels,
-				edit_plugins,
-				edit_autos,
-				trim_edits);
-		}
+	if( !edit_edits && startproject < start ) {
+		edits->clear(startproject, start);
+		cut_length = start - startproject;
+		for( Edit *edit=next; edit; edit=edit->next )
+			edit->startproject += cut_length;
 	}
-	else
-	if(edit_mode == MOVE_ONE_EDIT)
-	{
-		if(next)
-		{
-			if(next->asset)
-			{
-				int64_t end_source = next->get_source_end(1);
 
-				if(end_source > 0 && next->startsource - cut_length < 0)
-				{
-					cut_length = next->startsource;
-				}
-			}
+	this->startproject = startproject;
+	this->startsource = startsource;
+	this->length = length;
 
-			if(cut_length < length)
-			{
-				length -= cut_length;
-				next->startproject -= cut_length;
-				next->startsource -= cut_length;
-				next->length += cut_length;
-//printf("Edit::shift_end_in 2 %d\n", cut_length);
-			}
-			else
-			{
-				cut_length = length;
-				next->length += cut_length;
-				next->startsource -= cut_length;
-				next->startproject -= cut_length;
-				length -= cut_length;
-			}
-		}
-		else
-		{
-			if(cut_length < length)
-			{
-				length -= cut_length;
-			}
-			else
-			{
-				cut_length = length;
-				edits->clear_recursive(startproject,
-					oldposition,
-					edit_edits,
-					edit_labels,
-					edit_plugins,
-					edit_autos,
-					trim_edits);
-			}
-		}
-	}
-	else
-// Does nothing for plugins
-	if(edit_mode == MOVE_NO_EDITS)
-	{
-//printf("Edit::shift_end_in 3\n");
-		int64_t end_source = get_source_end(1);
-		if(end_source > 0 && startsource < cut_length)
-		{
-			cut_length = startsource;
-		}
-		startsource -= cut_length;
-	}
 	return 0;
 }
 
-int Edit::shift_end_out(int edit_mode,
-	int64_t newposition,
-	int64_t oldposition,
-	int edit_edits,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	Edits *trim_edits)
+int Edit::shift_end(int edit_mode, int64_t newposition, int64_t oldposition,
+        int edit_edits, int edit_labels, int edit_plugins, int edit_autos,
+        Edits *trim_edits)
 {
+	int64_t startproject = this->startproject;
+	int64_t startsource = this->startsource;
+	int64_t length = this->length;
+	int64_t source_len = get_source_end(startsource + length);
 	int64_t cut_length = newposition - oldposition;
-	int64_t endsource = get_source_end(startsource + length + cut_length);
-
-// check end of edit against end of source file
-	if(endsource > 0 && startsource + length + cut_length > endsource)
-		cut_length = endsource - startsource - length;
+	source_len += cut_length;
 
-//printf("Edit::shift_end_out 1 %jd %d %d %d\n", oldposition, newposition, this->length, cut_length);
-	if(edit_mode == MOVE_ALL_EDITS)
-	{
-// Extend length
-		this->length += cut_length;
-
-// Effects are shifted in length extension
-		if(edit_plugins)
-			edits->shift_effects_recursive(oldposition /* startproject */,
-				cut_length,
-				edit_autos);
-		if(edit_autos)
-			edits->shift_keyframes_recursive(oldposition /* startproject */,
-				cut_length);
-
-		for(Edit* current_edit = next; current_edit; current_edit = current_edit->next)
-		{
-			current_edit->startproject += cut_length;
-		}
+	switch( edit_mode ) {
+	case MOVE_EDGE:
+		length += cut_length;
+		break;
+	case MOVE_MEDIA:
+		startsource += cut_length;
+		break;
+	case MOVE_EDGE_MEDIA:
+		startsource -= cut_length;
+		length += cut_length;
+		break;
 	}
-	else
-	if(edit_mode == MOVE_ONE_EDIT)
-	{
-		if(next)
-		{
-			if(cut_length < next->length)
-			{
-				length += cut_length;
-				next->startproject += cut_length;
-				next->startsource += cut_length;
-				next->length -= cut_length;
-//printf("Edit::shift_end_out %d cut_length=%d\n", __LINE__, cut_length);
-			}
-			else
-			{
-//printf("Edit::shift_end_out %d cut_length=%d next->length=%d\n", __LINE__, cut_length, next->length);
-				cut_length = next->length;
-				next->startproject += next->length;
-				next->startsource += next->length;
-				next->length = 0;
-				length += cut_length;
-//track->dump();
-			}
-		}
+	if( startproject < 0 ) {
+		startsource += startproject;
+		length += startproject;
+		startproject = 0;
+	}
+	if( startsource < 0 )
+		startsource = 0;
+	if( length > source_len )
+		length = source_len;
+	if( length < 0 )
+		length = 0;
+
+	int64_t start = this->startproject;
+	int64_t end = start + this->length;
+	if( edit_labels ) {
+		double cut_len = track->from_units(cut_length);
+		double end_pos = edits->track->from_units(end);
+		if( cut_len < 0 )
+			edits->edl->labels->clear(end_pos + cut_len, end_pos, 1);
 		else
-		{
-			length += cut_length;
-		}
+			edits->edl->labels->insert(end_pos, cut_len);
 	}
-	else
-	if(edit_mode == MOVE_NO_EDITS)
-	{
-		startsource += cut_length;
+	Track *track = edits->track;
+	if( cut_length < 0 )
+		track->clear(end+cut_length, end,
+			0, 0, edit_autos, edit_plugins, trim_edits);
+	else if( cut_length > 0 ) {
+		if( edit_autos )
+			track->shift_keyframes(end, cut_length);
+		if( edit_plugins )
+			track->shift_effects(end, cut_length, 1, trim_edits);
 	}
-	return 0;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+	int64_t new_end = startproject + length;
+	if( edit_edits ) {
+		cut_length = new_end - end;
+		for( Edit* edit=next; edit; edit=edit->next )
+			edit->startproject += cut_length;
+	}
+	else if( new_end > end )
+		edits->clear(end, new_end);
 
+	this->startproject = startproject;
+	this->startsource = startsource;
+	this->length = length;
 
+	return 0;
+}
 
 
 int Edit::popup_transition(float view_start, float zoom_units, int cursor_x, int cursor_y)