X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileogg.C;h=b413066d200db285eca71ff11b3d6205e967e779;hb=df72ca6732207dc25472a23169ff79ef6d4cca1c;hp=a7612a4f1fd6ceb428b663e5960e02c787ef00d5;hpb=48c313de28fe6d39d9431dbe2dca6ffb176541ff;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/fileogg.C b/cinelerra-5.1/cinelerra/fileogg.C
index a7612a4f..b413066d 100644
--- a/cinelerra-5.1/cinelerra/fileogg.C
+++ b/cinelerra-5.1/cinelerra/fileogg.C
@@ -100,10 +100,8 @@ FileOGG::~FileOGG()
 }
 
 void FileOGG::get_parameters(BC_WindowBase *parent_window,
-	Asset *asset,
-	BC_WindowBase* &format_window,
-	int audio_options,
-	int video_options)
+	Asset *asset, BC_WindowBase* &format_window,
+	int audio_options, int video_options, EDL *edl)
 {
 	if(audio_options)
 	{
@@ -2323,7 +2321,7 @@ PackagingEngineOGG::~PackagingEngineOGG()
 		delete [] packages;
 	}
 	if (default_asset)
-		delete default_asset;
+		default_asset->remove_user();
 }
 
 
@@ -2490,6 +2488,7 @@ int PackagingEngineOGG::packages_are_done()
 	if (default_asset->audio_data)
 	{
 		audio_asset = new Asset(packages[local_current_package]->path);
+		audio_asset->format = FILE_OGG;
 		local_current_package++;
 
 		audio_file_gen = new File();
@@ -2502,6 +2501,7 @@ int PackagingEngineOGG::packages_are_done()
 	if (default_asset->video_data)
 	{
 		video_asset = new Asset(packages[local_current_package]->path);
+		video_asset->format = FILE_OGG;
 		local_current_package++;
 
 		video_file_gen = new File();
@@ -2541,8 +2541,9 @@ int PackagingEngineOGG::packages_are_done()
 						ogg_stream_clear(&video_in_stream);
 						video_file_gen->close_file();
 						delete video_file_gen;
-						delete video_asset;
+						if( video_asset ) video_asset->remove_user();
 						video_asset = new Asset(packages[local_current_package]->path);
+						video_asset->format = FILE_OGG;
 						local_current_package++;
 
 						video_file_gen = new File();
@@ -2623,22 +2624,24 @@ int PackagingEngineOGG::packages_are_done()
 		ogg_stream_clear(&audio_in_stream);
 		audio_file_gen->close_file();
 		delete audio_file_gen;
-		delete audio_asset;
+		if( audio_asset )
+			audio_asset->remove_user();
 	}
 	if (default_asset->video_data)
 	{
 		ogg_stream_clear(&video_in_stream);
 		video_file_gen->close_file();
 		delete video_file_gen;
-		delete video_asset;
+		if( video_asset )
+			video_asset->remove_user();
 	}
 
 	output_file_gen->close_file();
 	delete output_file_gen;
 
-// Now delete the temp files
-	for(int i = 0; i < total_packages; i++)
-		unlink(packages[i]->path);
+// don't delete the temp files, for now
+//	for(int i = 0; i < total_packages; i++)
+//		unlink(packages[i]->path);
 
 	return 0;
 }