X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ftracks.C;h=08952e429d3fbd06e50bfe9859b335a15e623ceb;hp=1eec0d4179c1dcae49829432aa7027c5c4666e6a;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hpb=0513350234a8dcd08e5a0117d5121724ef7b76b6

diff --git a/cinelerra-5.1/cinelerra/tracks.C b/cinelerra-5.1/cinelerra/tracks.C
index 1eec0d41..08952e42 100644
--- a/cinelerra-5.1/cinelerra/tracks.C
+++ b/cinelerra-5.1/cinelerra/tracks.C
@@ -201,31 +201,23 @@ int Tracks::load(FileXML *xml,
 	xml->tag.get_property("TYPE", string);
 
 	if((load_flags & LOAD_ALL) == LOAD_ALL ||
-		(load_flags & LOAD_EDITS))
-	{
-		if(!strcmp(string, "VIDEO"))
-		{
-			add_video_track(0, 0);
+		(load_flags & LOAD_EDITS)) {
+		if(!strcmp(string, "VIDEO")) {
+			track = add_video_track(0, 0);
 		}
-		else
-		if(!strcmp(string, "SUBTTL"))
-		{
-			add_subttl_track(0, 0);
+		else if(!strcmp(string, "SUBTTL")) {
+			track = add_subttl_track(0, 0);
 		}
-		else
-		{
-			add_audio_track(0, 0);    // default to audio
+		else {
+			track = add_audio_track(0, 0);    // default to audio
 		}
-		track = last;
 	}
-	else
-	{
-		track = get_item_number(track_offset);
-		track_offset++;
+	else {
+		track = get_item_number(track_offset++);
 	}
 
 // load it
-	if(track) track->load(xml, track_offset, load_flags);
+	if( track ) track->load(xml, track_offset, load_flags);
 
 	return 0;
 }
@@ -287,83 +279,39 @@ Track* Tracks::add_audio_track(int above, Track *dst_track)
 
 Track* Tracks::add_video_track(int above, Track *dst_track)
 {
-const int debug = 0;
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
 	VTrack* new_track = new VTrack(edl, this);
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
 	if(!dst_track)
 		dst_track = (above ? first : last);
-
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
 	if(above)
-	{
 		insert_before(dst_track, (Track*)new_track);
-	}
 	else
-	{
 		insert_after(dst_track, (Track*)new_track);
-	}
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
-
 
-
-// Shift effects referenced below the new track
-	for(Track *track = last;
-		track && track != new_track;
-		track = track->previous)
-	{
+	for(Track *track = last; track && track != new_track; track = track->previous)
 		change_modules(number_of(track) - 1, number_of(track), 0);
-	}
-
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
-
 
 	new_track->create_objects();
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
 	new_track->set_default_title();
-if(debug) printf("Tracks::add_video_track %d\n", __LINE__);
 	return new_track;
 }
 
 
 Track* Tracks::add_subttl_track(int above, Track *dst_track)
 {
-const int debug = 0;
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
 	STrack* new_track = new STrack(edl, this);
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
 	if(!dst_track)
 		dst_track = (above ? first : last);
 
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
 	if(above)
-	{
 		insert_before(dst_track, (Track*)new_track);
-	}
 	else
-	{
 		insert_after(dst_track, (Track*)new_track);
-	}
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
-
 
-// Shift effects referenced below the new track
-	for(Track *track = last;
-		track && track != new_track;
-		track = track->previous)
-	{
+	for(Track *track = last; track && track != new_track; track = track->previous)
 		change_modules(number_of(track) - 1, number_of(track), 0);
-	}
-
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
 
 	new_track->create_objects();
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
 	new_track->set_default_title();
-if(debug) printf("Tracks::add_subttl_track %d\n", __LINE__);
-
 //	new_track->paste_silence(0,total_length(),0);
 	return new_track;
 }