X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=41ee55b4fddd716757ef560dc68fc29cc13f61bc;hb=331564c0ebb30688da917fc1c89058e12771e348;hp=591db25212f9aa2af56243b61849580e7f71891d;hpb=2ba7e9962ea989863e152373e96a09b00a0b4eb8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 591db252..41ee55b4 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -278,6 +278,8 @@ int EDL::load_xml(FileXML *file,
 					if((load_flags & LOAD_VCONFIG) &&
 						(load_flags & LOAD_SESSION))
 						session->load_video_config(file, 0, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is("AUDIO"))
@@ -285,6 +287,8 @@ int EDL::load_xml(FileXML *file,
 					if((load_flags & LOAD_ACONFIG) &&
 						(load_flags & LOAD_SESSION))
 						session->load_audio_config(file, 0, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is("FOLDER"))
@@ -298,12 +302,16 @@ int EDL::load_xml(FileXML *file,
 				{
 					if(load_flags & LOAD_ASSETS)
 						assets->load(file, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is(labels->xml_tag))
 				{
 					if(load_flags & LOAD_TIMEBAR)
 						labels->load(file, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is("LOCALSESSION"))
@@ -311,6 +319,8 @@ int EDL::load_xml(FileXML *file,
 					if((load_flags & LOAD_SESSION) ||
 						(load_flags & LOAD_TIMEBAR))
 						local_session->load_xml(file, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is("SESSION"))
@@ -318,6 +328,8 @@ int EDL::load_xml(FileXML *file,
 					if((load_flags & LOAD_SESSION) &&
 						!parent_edl)
 						session->load_xml(file, 0, load_flags);
+					else
+						result = file->skip_tag();
 				}
 				else
 				if(file->tag.title_is("TRACK"))
@@ -746,7 +758,7 @@ double EDL::equivalent_output(EDL *edl)
 }
 
 
-void EDL::set_path(char *path)
+void EDL::set_path(const char *path)
 {
 	strcpy(this->path, path);
 }
@@ -1428,7 +1440,7 @@ if(debug) printf("EDL::get_use_vconsole %d\n", __LINE__);
 // Asset and output device must have same resulting de-interlacing method
 	if( ilaceautofixmethod2(session->interlace_mode,
 	    asset->interlace_autofixoption, asset->interlace_mode,
-	    asset->interlace_fixmethod) != BC_ILACE_FIXMETHOD_NONE )
+	    asset->interlace_fixmethod) != ILACE_FIXMETHOD_NONE )
 		return 1;
 
 // If we get here the frame is going to be directly copied.  Whether it is