X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=7298baa32cac604c0548507e0c171122114a05ae;hb=d1c0b1246b02c5232b059f6f753585b3e0c011e7;hp=cd20a7b0d56e570d3a36de7b47bd6315fcff947e;hpb=9d832a1fff11b11aaa1108c460690ed05e2bdc05;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index cd20a7b0..7298baa3 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,6 +300,14 @@ 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)
@@ -413,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;
@@ -456,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;
@@ -629,6 +645,7 @@ int EDL::copy(double start,
 					output_path,
 					1,
 					0);
+			mixers.save(file);
 		}
 
 		file->append_newline();
@@ -808,19 +825,15 @@ void EDL::set_outpoint(double position)
 	}
 }
 
-void EDL::deglitch(double position)
+void EDL::unset_inoutpoint()
 {
-	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);
-	}
+	local_session->unset_inpoint();
+	local_session->unset_outpoint();
+}
+
+int EDL::blade(double position)
+{
+	return tracks->blade(position);
 }
 
 int EDL::clear(double start, double end,
@@ -1147,7 +1160,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;
 	}
@@ -1312,15 +1325,20 @@ void EDL::get_shared_tracks(Track *track,
 	}
 }
 
-// Convert position to frames if cursor alignment is enabled
+// aligned frame time
+double EDL::frame_align(double position, int round)
+{
+	double frame_pos = position * session->frame_rate;
+	frame_pos = (int64_t)(frame_pos + (round ? 0.5 : 1e-6));
+	position = frame_pos / session->frame_rate;
+	return position;
+}
+
+// Convert position to frames if alignment is enabled.
 double EDL::align_to_frame(double position, int round)
 {
-	if( session->cursor_on_frames && session->frame_rate > 0 ) {
-		double frame_no = position * session->frame_rate;
-		int64_t frame_pos = frame_no + (round ? 0.5 : 1e-6);
-		double pos = frame_pos / session->frame_rate;
-		if( !EQUIV(pos, position) ) position = pos;
-	}
+	if( session->cursor_on_frames )
+		position = frame_align(position, round);
 	return position;
 }
 
@@ -1479,7 +1497,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);
 }
 
@@ -1516,7 +1534,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);
 }