X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformatwindow.C;h=a2c1ba36842b4a866a414a3c3d52d2436d3087eb;hb=5c1aff2fd123b65be6e51ca7652185e14ddaf168;hp=5c62fbbf3ce27aa200127287bbd9a74df5a17484;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formatwindow.C b/cinelerra-5.1/cinelerra/formatwindow.C
index 5c62fbbf..a2c1ba36 100644
--- a/cinelerra-5.1/cinelerra/formatwindow.C
+++ b/cinelerra-5.1/cinelerra/formatwindow.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "assets.h"
@@ -26,8 +26,8 @@
 
 
 FormatAWindow::FormatAWindow(Asset *asset, int *dither)
- : BC_Window(_(PROGRAM_NAME ": File format"), 410, 
- 	(asset->format == FILE_WAV) ? 115 : 185, 
+ : BC_Window(_(PROGRAM_NAME ": File format"), 410,
+ 	(asset->format == FILE_WAV) ? 115 : 185,
 	0, 0)
 { this->asset = asset; this->dither = dither; }
 
@@ -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,25 +129,12 @@ 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)
-{ 
-	this->asset = asset; 
+ : BC_ISlider(x, y, 0, 100, 100, 0, 100, default_, 1)
+{
+	this->asset = asset;
 }
-FormatQuality::~FormatQuality() 
+FormatQuality::~FormatQuality()
 {
 }
 int FormatQuality::handle_event()
@@ -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)
 {