X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftrack.C;h=e3f624c0e3fc4564f92b6dc76c90705d237e0091;hb=0513350234a8dcd08e5a0117d5121724ef7b76b6;hp=05bb50365446eeaddbda67a3b00b8273ac6a4445;hpb=0983c78067d86d25426fd34655ad9a9992ef04c7;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/track.C b/cinelerra-5.1/cinelerra/track.C
index 05bb5036..e3f624c0 100644
--- a/cinelerra-5.1/cinelerra/track.C
+++ b/cinelerra-5.1/cinelerra/track.C
@@ -66,6 +66,7 @@ Track::Track(EDL *edl, Tracks *tracks) : ListItem<Track>()
 	track_w = edl->session->output_w;
 	track_h = edl->session->output_h;
 	id = EDL::next_id();
+	mixer_id = -1;
 }
 
 Track::~Track()
@@ -87,6 +88,7 @@ int Track::copy_settings(Track *track)
 	this->gang = track->gang;
 	this->record = track->record;
 	this->nudge = track->nudge;
+	this->mixer_id = track->mixer_id;
 	this->play = track->play;
 	this->track_w = track->track_w;
 	this->track_h = track->track_h;
@@ -321,6 +323,7 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
 	gang = file->tag.get_property("GANG", gang);
 	draw = file->tag.get_property("DRAW", draw);
 	nudge = file->tag.get_property("NUDGE", nudge);
+	mixer_id = file->tag.get_property("MIXER_ID", mixer_id);
 	expand_view = file->tag.get_property("EXPAND", expand_view);
 	track_w = file->tag.get_property("TRACK_W", track_w);
 	track_h = file->tag.get_property("TRACK_H", track_h);
@@ -339,7 +342,7 @@ int Track::load(FileXML *file, int track_offset, uint32_t load_flags)
 			else
 			if(file->tag.title_is("TITLE"))
 			{
-				result = file->skip_tag();
+				file->read_text_until("/TITLE", title, BCTEXTLEN);
 			}
 			else
 			if(load_flags && automation->load(file)
@@ -1068,6 +1071,7 @@ int Track::copy(double start,
 	file->tag.set_title("TRACK");
 	file->tag.set_property("RECORD", record);
 	file->tag.set_property("NUDGE", nudge);
+	file->tag.set_property("MIXER_ID", mixer_id);
 	file->tag.set_property("PLAY", play);
 	file->tag.set_property("GANG", gang);
 	file->tag.set_property("DRAW", draw);
@@ -1150,17 +1154,9 @@ int Track::copy_assets(double start,
 }
 
 
-
-
-
-int Track::clear(double start,
-	double end,
-	int edit_edits,
-	int edit_labels,
-	int edit_plugins,
-	int edit_autos,
-	int convert_units,
-	Edits *trim_edits)
+int Track::clear(double start, double end,
+	int edit_edits, int edit_labels, int edit_plugins,
+	int edit_autos, int convert_units, Edits *trim_edits)
 {
 // Edits::move_auto calls this routine after the units are converted to the track
 // format.
@@ -1874,3 +1870,14 @@ int Track::plugin_exists(Plugin *plugin)
 	return 0;
 }
 
+int Track::get_mixer_id()
+{
+	if( mixer_id < 0 ) {
+		int v = 0;
+		for( Track *track=tracks->first; track!=0; track=track->next )
+			if( track->mixer_id > v ) v = track->mixer_id;
+		mixer_id = v + 1;
+	}
+	return mixer_id;
+}
+