X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fasset.C;h=4f911e984d544803057547946beb7b9de4ddd55e;hb=HEAD;hp=f4fe0c3ad3f2f05d3d640ce027115c63ebd46ca6;hpb=6c533a5098aa5a5ca85b97dd405bb06b26033a91;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/asset.C b/cinelerra-5.1/cinelerra/asset.C
index f4fe0c3a..4f911e98 100644
--- a/cinelerra-5.1/cinelerra/asset.C
+++ b/cinelerra-5.1/cinelerra/asset.C
@@ -72,7 +72,6 @@ int Asset::init_values()
 	path[0] = 0;
 // Has to be unknown for file probing to succeed
 	format = FILE_UNKNOWN;
-	fformat[0] = 0;
 	bits = 0;
 	byte_order = 0;
 	signed_ = 0;
@@ -84,6 +83,7 @@ int Asset::init_values()
 	strcpy(vcodec, "");
 	strcpy(acodec, "");
 
+	strcpy(fformat,"mp4");
 	ff_audio_options[0] = 0;
 	ff_sample_format[0] = 0;
 	ff_audio_bitrate = 0;
@@ -190,7 +190,7 @@ void Asset::copy_from(Asset *asset, int do_index)
 void Asset::copy_location(Asset *asset)
 {
 	strcpy(path, asset->path);
-	awindow_folder = asset->awindow_folder;
+	folder_no = asset->folder_no;
 }
 
 void Asset::copy_format(Asset *asset, int do_index)
@@ -459,9 +459,7 @@ int Asset::read(FileXML *file,
 			else
 			if(file->tag.title_is("FOLDER"))
 			{
-				const char *string = file->tag.get_property("NUMBER");
-				awindow_folder = string ? atoi(string) :
-					AWindowGUI::folder_number(file->read_text());
+				folder_no = file->tag.get_property("NUMBER", AW_MEDIA_FOLDER);
 			}
 			else
 			if(file->tag.title_is("VIDEO"))
@@ -579,7 +577,7 @@ int Asset::write(FileXML *file,
 	file->append_newline();
 
 	file->tag.set_title("FOLDER");
-	file->tag.set_property("NUMBER", awindow_folder);
+	file->tag.set_property("NUMBER", folder_no);
 	file->append_tag();
 	file->tag.set_title("/FOLDER");
 	file->append_tag();