X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffiledv.C;h=bcce24b21201bd11c7d09310e9d2cf1632a653f5;hb=09ccfde5a1fd65069f69b37490462b7ccf38a336;hp=1d22bc3d4edcebc10139825790171dd087ec0be8;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/filedv.C b/cinelerra-5.1/cinelerra/filedv.C
index 1d22bc3d..bcce24b2 100644
--- a/cinelerra-5.1/cinelerra/filedv.C
+++ b/cinelerra-5.1/cinelerra/filedv.C
@@ -102,10 +102,8 @@ FileDV::~FileDV()
 }
 
 void FileDV::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)
 	{
@@ -984,8 +982,7 @@ DVConfigAudio::DVConfigAudio(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Audio Compression"),
 	parent_window->get_abs_cursor_x(1),
 	parent_window->get_abs_cursor_y(1),
-	350,
-	250)
+	350, 250)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -998,8 +995,10 @@ DVConfigAudio::~DVConfigAudio()
 
 void DVConfigAudio::create_objects()
 {
+	lock_window("DVConfigAudio::create_objects");
 	add_tool(new BC_Title(10, 10, _("There are no audio options for this format")));
 	add_subwindow(new BC_OKButton(this));
+	unlock_window();
 }
 
 int DVConfigAudio::close_event()
@@ -1009,16 +1008,11 @@ int DVConfigAudio::close_event()
 }
 
 
-
-
-
-
 DVConfigVideo::DVConfigVideo(BC_WindowBase *parent_window, Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Video Compression"),
 	parent_window->get_abs_cursor_x(1),
 	parent_window->get_abs_cursor_y(1),
-	350,
-	250)
+	350, 250)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -1031,8 +1025,10 @@ DVConfigVideo::~DVConfigVideo()
 
 void DVConfigVideo::create_objects()
 {
+	lock_window("DVConfigVideo::create_objects");
 	add_tool(new BC_Title(10, 10, _("There are no video options for this format")));
 	add_subwindow(new BC_OKButton(this));
+	unlock_window();
 }
 
 int DVConfigVideo::close_event()