X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=79e95f36ee6202c67ed2e702de69bceb685190ae;hb=d5a0afb9bc8562f6c2698f88ff40790009a5e63c;hp=489a96944de08a04aef3984e56014292344e73f9;hpb=ee1879b1a1850e1d4e19c034d4a9c5459274bbb6;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index 489a9694..79e95f36 100644
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -86,6 +86,7 @@ void Edit::reset()
 	is_selected = 0;
 	hard_left = 0;
 	hard_right = 0;
+	color = 0;
 }
 
 Indexable* Edit::get_source()
@@ -141,6 +142,7 @@ 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);
 			if(user_title[0]) file->tag.set_property("USER_TITLE", user_title);
 //printf("Edit::copy 5\n");
 
@@ -249,6 +251,7 @@ 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;
 	strcpy (this->user_title, edit->user_title);
 
 	if(edit->transition)
@@ -324,8 +327,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;
@@ -377,7 +378,7 @@ int Edit::dump(FILE *fp)
 		asset,
 		asset ? asset->path : "");
 	fflush(fp);
-	fprintf(fp,"      channel %d\n", channel);
+	fprintf(fp,"      channel %d, color %08x\n", channel, color);
 	if(transition)
 	{
 		fprintf(fp,"      TRANSITION %p\n", transition);
@@ -394,6 +395,7 @@ 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", (int64_t)-1);
 	user_title[0] = 0;
 	file->tag.get_property("USER_TITLE", user_title);
 	this->startproject = startproject;
@@ -751,34 +753,6 @@ int Edit::shift_end_out(int edit_mode,
 	return 0;
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 int Edit::popup_transition(float view_start, float zoom_units, int cursor_x, int cursor_y)
 {
 	int64_t left, right, left_unit, right_unit;