X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileac3.C;h=f7d78c592af6e148c089342a5054b5dc86ab1cc0;hp=25276864175dcb471397a418481df9fd626ddacd;hb=1529091cdf16df199a901aabe6e8fa1813a933af;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/fileac3.C b/cinelerra-5.1/cinelerra/fileac3.C
index 25276864..f7d78c59 100644
--- a/cinelerra-5.1/cinelerra/fileac3.C
+++ b/cinelerra-5.1/cinelerra/fileac3.C
@@ -59,8 +59,8 @@ FileAC3::FileAC3(Asset *asset, File *file)
 
 FileAC3::~FileAC3()
 {
-	if( mpg_file ) delete mpg_file;
 	close_file();
+	delete mpg_file;
 }
 
 int FileAC3::reset_parameters_derived()
@@ -341,23 +341,14 @@ int FileAC3::write_samples(double **buffer, int64_t len)
 }
 
 
-
-
-
-
-
 AC3ConfigAudio::AC3ConfigAudio(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),
-	500,
-	BC_OKButton::calculate_h() + 100,
-	500,
-	BC_OKButton::calculate_h() + 100,
-	0,
-	0,
-	1)
+	xS(500), BC_OKButton::calculate_h() + yS(100),
+	xS(500), BC_OKButton::calculate_h() + yS(100),
+	0, 0, 1)
 {
 	this->parent_window = parent_window;
 	this->asset = asset;
@@ -365,15 +356,12 @@ AC3ConfigAudio::AC3ConfigAudio(BC_WindowBase *parent_window,
 
 void AC3ConfigAudio::create_objects()
 {
-	int x = 10, y = 10;
-	int x1 = 150;
+	int x = xS(10), y = yS(10);
+	int x1 = xS(150);
 	lock_window("AC3ConfigAudio::create_objects");
 	add_tool(new BC_Title(x, y, _("Bitrate (kbps):")));
 	AC3ConfigAudioBitrate *bitrate;
-	add_tool(bitrate =
-		new AC3ConfigAudioBitrate(this,
-			x1,
-			y));
+	add_tool(bitrate = new AC3ConfigAudioBitrate(this, x1, y));
 	bitrate->create_objects();
 
 	add_subwindow(new BC_OKButton(this));
@@ -388,16 +376,8 @@ int AC3ConfigAudio::close_event()
 }
 
 
-
-
-
-
-AC3ConfigAudioBitrate::AC3ConfigAudioBitrate(AC3ConfigAudio *gui,
-	int x,
-	int y)
- : BC_PopupMenu(x,
- 	y,
-	150,
+AC3ConfigAudioBitrate::AC3ConfigAudioBitrate(AC3ConfigAudio *gui, int x, int y)
+ : BC_PopupMenu(x, y, xS(150),
 	AC3ConfigAudioBitrate::bitrate_to_string(gui->string, gui->asset->ac3_bitrate))
 {
 	this->gui = gui;