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

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

diff --git a/cinelerra-5.1/cinelerra/formatwindow.C b/cinelerra-5.1/cinelerra/formatwindow.C
index 73694876c207885d6ddcb0c42c2dd8ee92252ac1..a2c1ba36842b4a866a414a3c3d52d2436d3087eb 100644 (file)
--- a/cinelerra-5.1/cinelerra/formatwindow.C
+++ b/cinelerra-5.1/cinelerra/formatwindow.C
@@ -37,6 +37,7 @@ FormatAWindow::~FormatAWindow()
 
 void FormatAWindow::create_objects()
 {
+       lock_window("FormatAWindow::create_objects");
        int x;
        int init_x;
        int y = 10;
@@ -75,6 +76,7 @@ void FormatAWindow::create_objects()
        x = init_x;
 
        add_subwindow(new BC_OKButton(x + 170, y));
+       unlock_window();
 }
 
 
@@ -85,7 +87,6 @@ int FormatAWindow::close_event()
 
 
 
-
 FormatVWindow::FormatVWindow(Asset *asset, int recording)
  : BC_Window(_(PROGRAM_NAME ": File format"), 410, 115, 0, 0)
 { this->asset = asset; this->recording = recording; }
@@ -96,6 +97,7 @@ FormatVWindow::~FormatVWindow()
 
 void FormatVWindow::create_objects()
 {
+       lock_window("FormatVWindow::create_objects");
        int x, y = 10;
        int init_x;
 
@@ -118,6 +120,7 @@ void FormatVWindow::create_objects()
        }
 
        add_subwindow(new BC_OKButton(x + 170, y));
+       unlock_window();
 }
 
 int FormatVWindow::close_event()
@@ -126,21 +129,8 @@ int FormatVWindow::close_event()
 }
 
 
-
-
-
-
-
 FormatQuality::FormatQuality(int x, int y, Asset *asset, int default_)
- : BC_ISlider(x,
-       y,
-       0,
-       100,
-       100,
-       0,
-       100,
-       default_,
-       1)
+ : BC_ISlider(x, y, 0, 100, 100, 0, 100, default_, 1)
 {
        this->asset = asset;
 }
@@ -153,7 +143,6 @@ int FormatQuality::handle_event()
 }
 
 
-
 FormatBits::FormatBits(int x, int y, Asset *asset)
  : BitsPopup(x, y, asset)
 { this->asset = asset; }
@@ -164,7 +153,6 @@ int FormatBits::handle_event()
 }
 
 
-
 FormatDither::FormatDither(int x, int y, int *dither)
  : BC_CheckBox(x, y, *dither, _("Dither"))
 { this->dither = dither; }
@@ -187,10 +175,6 @@ int FormatSigned::handle_event()
 }
 
 
-
-
-
-
 FormatHILO::FormatHILO(int x, int y, Asset *asset)
  : BC_Radial(x, y, asset->byte_order ^ 1)
 {