X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=a27e10cc5e37a287c5244ea22f222945a92ec035;hp=9e14b082d9c003af3c534cee3bff931f5718054b;hb=0513350234a8dcd08e5a0117d5121724ef7b76b6;hpb=fee54016102a7a59d2181c8f16a7f2562f68540d

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 9e14b082..a27e10cc 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -240,6 +240,7 @@ int EDL::load_xml(FileXML *file,
 			for(int i = 0; i < clips.size(); i++)
 				clips.get(i)->Garbage::remove_user();
 			clips.remove_all();
+			mixers.remove_all_objects();
 		}
 
 		if(load_flags & LOAD_TIMEBAR)
@@ -299,10 +300,17 @@ int EDL::load_xml(FileXML *file,
 					new_folder(folder);
 				}
 				else
+				if(file->tag.title_is("MIXERS"))
+				{
+					if((load_flags & LOAD_SESSION))
+						mixers.load(file);
+					else
+						result = file->skip_tag();
+				}
+				else
 				if(file->tag.title_is("ASSETS"))
 				{
-					if((load_flags & LOAD_ASSETS) &&
-						!parent_edl)
+					if(load_flags & LOAD_ASSETS)
 						assets->load(file, load_flags);
 					else
 						result = file->skip_tag();
@@ -414,6 +422,7 @@ int EDL::copy_all(EDL *edl)
 	copy_session(edl);
 	copy_assets(edl);
 	copy_clips(edl);
+	copy_mixers(edl);
 	tracks->copy_from(edl->tracks);
 	labels->copy_from(edl->labels);
 	return 0;
@@ -457,6 +466,12 @@ void EDL::copy_assets(EDL *edl)
 	}
 }
 
+void EDL::copy_mixers(EDL *edl)
+{
+	if(this == edl) return;
+	mixers.copy_from(edl->mixers);
+}
+
 void EDL::copy_session(EDL *edl, int session_only)
 {
 	if(this == edl) return;
@@ -610,14 +625,9 @@ int EDL::copy(double start,
 
 // Media
 // Don't replicate all assets for every clip.
-// The assets for the clips are probably in the mane EDL.
-		if(!is_clip)
-			copy_assets(start,
-				end,
-				file,
-				all,
-				output_path);
-
+// The assets for the clips are probably in the main EDL.
+		if( !is_clip )
+			copy_assets(start, end, file, all, output_path);
 // Clips
 // Don't want this if using clipboard
 		if(all)
@@ -635,6 +645,7 @@ int EDL::copy(double start,
 					output_path,
 					1,
 					0);
+			mixers.save(file);
 		}
 
 		file->append_newline();
@@ -650,10 +661,9 @@ int EDL::copy(double start,
 //printf("EDL::copy 2\n");
 
 // terminate file
-	if(is_clip)
+	if( is_clip )
 		file->tag.set_title("/CLIP_EDL");
-	else
-	if(is_vwindow)
+	else if( is_vwindow )
 		file->tag.set_title("/VWINDOW_EDL");
 	else
 		file->tag.set_title("/EDL");
@@ -815,12 +825,23 @@ void EDL::set_outpoint(double position)
 	}
 }
 
+void EDL::deglitch(double position)
+{
+	if( !session->cursor_on_frames ) return;
+	Track *current_track = tracks->first; 
+	for( ; current_track; current_track=current_track->next ) {
+		if( !current_track->record ) continue;
+		if( current_track->data_type != TRACK_AUDIO ) continue;
+		ATrack *atrack = (ATrack*)current_track;
+		atrack->deglitch(position, 
+			session->labels_follow_edits, 
+			session->plugins_follow_edits, 
+			session->autos_follow_edits);
+	}
+}
 
-int EDL::clear(double start,
-	double end,
-	int clear_labels,
-	int clear_plugins,
-	int edit_autos)
+int EDL::clear(double start, double end,
+	int clear_labels, int clear_plugins, int edit_autos)
 {
 	if(start == end)
 	{
@@ -1143,7 +1164,7 @@ void EDL::insert_asset(Asset *asset,
 
 	if(new_nested_edl)
 	{
-		length = new_nested_edl->tracks->total_playable_length();
+		length = new_nested_edl->tracks->total_length();
 		layers = 1;
 		channels = new_nested_edl->session->audio_channels;
 	}
@@ -1475,7 +1496,7 @@ int EDL::get_sample_rate()
 
 int64_t EDL::get_audio_samples()
 {
-	return (int64_t)(tracks->total_playable_length() *
+	return (int64_t)(tracks->total_length() *
 		session->sample_rate);
 }
 
@@ -1512,7 +1533,7 @@ int EDL::get_video_layers()
 
 int64_t EDL::get_video_frames()
 {
-	return (int64_t)(tracks->total_playable_length() *
+	return (int64_t)(tracks->total_length() *
 		session->frame_rate);
 }
 
@@ -1556,3 +1577,51 @@ void EDL::append_vwindow_edl(EDL *edl, int increase_counter)
 }
 
 
+double EDL::next_edit(double position)
+{
+	Units::fix_double(&position);
+	double new_position = tracks->total_length();
+
+	double max_rate = get_frame_rate();
+	int sample_rate = get_sample_rate();
+	if( sample_rate > max_rate ) max_rate = sample_rate;
+	double min_movement = max_rate > 0 ? 1. / max_rate : 1e-6;
+
+// Test for edit handles after position
+	for( Track *track=tracks->first; track; track=track->next ) {
+		if( !track->record ) continue;
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			double edit_end = track->from_units(edit->startproject + edit->length);
+			Units::fix_double(&edit_end);
+			if( fabs(edit_end-position) < min_movement ) continue;
+			if( edit_end > position && edit_end < new_position )
+				new_position = edit_end;
+		}
+	}
+	return new_position;
+}
+
+double EDL::prev_edit(double position)
+{
+	Units::fix_double(&position);
+	double new_position = -1;
+
+	double max_rate = get_frame_rate();
+	int sample_rate = get_sample_rate();
+	if( sample_rate > max_rate ) max_rate = sample_rate;
+	double min_movement = max_rate > 0 ? 1. / max_rate : 1e-6;
+
+// Test for edit handles before cursor position
+	for( Track *track=tracks->first; track; track=track->next ) {
+		if( !track->record ) continue;
+		for( Edit *edit=track->edits->first; edit; edit=edit->next ) {
+			double edit_end = track->from_units(edit->startproject);
+			Units::fix_double(&edit_end);
+			if( fabs(edit_end-position) < min_movement ) continue;
+			if( edit_end < position && edit_end > new_position )
+				new_position = edit_end;
+		}
+	}
+	return new_position;
+}
+