p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / filedv.C

diff --git a/cinelerra-5.1/cinelerra/filedv.C b/cinelerra-5.1/cinelerra/filedv.C
index 1a543744898764cafc96c57b365e8420b60f27ba..bcce24b21201bd11c7d09310e9d2cf1632a653f5 100644 (file)
--- a/cinelerra-5.1/cinelerra/filedv.C
+++ b/cinelerra-5.1/cinelerra/filedv.C
@@ -982,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;
@@ -996,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()
@@ -1007,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;
@@ -1029,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()