X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fnew.C;h=9877894bd05bd29ce749385520b1717399f5c24f;hb=d94bbdeebde4f16a77c388f9f28114b945db41d9;hp=fce4c09fd5833787fddf7459850de228e9fb2f8b;hpb=14c59195960203265f308a703e834e7c5f59f6d2;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/new.C b/cinelerra-5.1/cinelerra/new.C
index fce4c09f..9877894b 100644
--- a/cinelerra-5.1/cinelerra/new.C
+++ b/cinelerra-5.1/cinelerra/new.C
@@ -41,6 +41,8 @@
 #include "preferences.h"
 #include "theme.h"
 #include "transportque.h"
+#include "track.h"
+#include "tracks.h"
 #include "videowindow.h"
 #include "vplayback.h"
 #include "vwindow.h"
@@ -49,12 +51,10 @@
 #include <string.h>
 
 
-#define WIDTH 600
-#define HEIGHT 400
-
+#define WIDTH 640
+#define HEIGHT 425
 
 New::New(MWindow *mwindow)
- : BC_MenuItem(_("New Project..."), "n", 'n')
 {
 	this->mwindow = mwindow;
 	script = 0;
@@ -67,17 +67,11 @@ New::~New()
 	delete thread;
 }
 
-void New::create_objects()
-{
-	thread = new NewThread(mwindow, this);
-}
-
 int New::handle_event()
 {
 	mwindow->gui->unlock_window();
 	mwindow->edl->save_defaults(mwindow->defaults);
 	create_new_edl();
-	create_new_project();
 	thread->start();
 	mwindow->gui->lock_window("New::handle_event");
 
@@ -86,8 +80,7 @@ int New::handle_event()
 
 void New::create_new_edl()
 {
-	if(!new_edl)
-	{
+	if( !new_edl ) {
 		new_edl = new EDL;
 		new_edl->create_objects();
 		new_edl->load_defaults(mwindow->defaults);
@@ -95,57 +88,87 @@ void New::create_new_edl()
 }
 
 
-int New::create_new_project()
+int New::create_new_project(int load_mode)
 {
-	mwindow->cwindow->playback_engine->que->send_command(STOP,
-		CHANGE_NONE,
-		0,
-		0);
-
-	for(int i = 0; i < mwindow->vwindows.size(); i++)
-	{
-		VWindow *vwindow = mwindow->vwindows.get(i);
-		if( !vwindow->is_running() ) continue;
-		vwindow->playback_engine->que->send_command(STOP, CHANGE_NONE, 0, 0);
-		vwindow->playback_engine->interrupt_playback(0);
-	}
-
-	mwindow->cwindow->playback_engine->interrupt_playback(0);
-
+	mwindow->stop_playback(0);
 	mwindow->gui->lock_window();
 	mwindow->reset_caches();
 
-
-
 	memcpy(new_edl->session->achannel_positions,
-		&mwindow->preferences->channel_positions[
-			MAXCHANNELS * (new_edl->session->audio_channels - 1)],
-		sizeof(int) * MAXCHANNELS);
+		&mwindow->preferences->channel_positions[new_edl->session->audio_channels - 1],
+		sizeof(new_edl->session->achannel_positions));
 	new_edl->session->boundaries();
 	new_edl->create_default_tracks();
-
+	if( load_mode == LOADMODE_NEW_TRACKS ) {
+		Tracks *tracks =  mwindow->edl->tracks;
+		int vindex = tracks->total_video_tracks();
+		int aindex = tracks->total_audio_tracks();
+		for( Track *track=new_edl->tracks->first; track; track=track->next ) {
+			switch( track->data_type ) {
+			case TRACK_AUDIO:
+				sprintf(track->title, _("Audio %d"), ++aindex);
+				break;
+			case TRACK_VIDEO:
+				sprintf(track->title, _("Video %d"), ++vindex);
+				break;
+			}
+		}
+	}
 	mwindow->undo->update_undo_before();
 	mwindow->set_filename("");
-
-	mwindow->hide_plugins();
-	mwindow->edl->Garbage::remove_user();
-	mwindow->edl = new_edl;
+	ArrayList<EDL *>new_edls;
+	new_edls.append(new_edl);
+	mwindow->paste_edls(&new_edls, load_mode, 0,0,0,0,0,0);
+	new_edl->remove_user();
 	new_edl = 0;
-	mwindow->save_defaults();
 
 // Load file sequence
-	mwindow->update_project(LOADMODE_REPLACE);
+	mwindow->update_project(load_mode);
 	mwindow->session->changes_made = 0;
-	mwindow->undo->update_undo_after(_("New Project"), LOAD_ALL);
+	mwindow->undo->update_undo_after(load_mode == LOADMODE_REPLACE ?
+		_("New Project") : _("Append to Project"), LOAD_ALL);
 	mwindow->gui->unlock_window();
 	return 0;
 }
 
-NewThread::NewThread(MWindow *mwindow, New *new_project)
+NewProject::NewProject(MWindow *mwindow)
+ : BC_MenuItem(_("New Project..."), "n", 'n'), New(mwindow)
+{
+}
+NewProject::~NewProject()
+{
+}
+
+void NewProject::create_objects()
+{
+	thread = new NewThread(mwindow, this,
+		_(PROGRAM_NAME ": New Project"), LOADMODE_REPLACE);
+}
+
+AppendTracks::AppendTracks(MWindow *mwindow)
+ : BC_MenuItem(_("Append to Project..."), "N", 'N'), New(mwindow)
+{
+	set_shift(1);
+}
+AppendTracks::~AppendTracks()
+{
+}
+
+void AppendTracks::create_objects()
+{
+	thread = new NewThread(mwindow, this,
+		_(PROGRAM_NAME ": Append to Project"), LOADMODE_NEW_TRACKS);
+}
+
+
+NewThread::NewThread(MWindow *mwindow, New *new_project,
+		const char *title, int load_mode)
  : BC_DialogThread()
 {
 	this->mwindow = mwindow;
 	this->new_project = new_project;
+	this->title = title;
+	this->load_mode = load_mode;
 	nwindow = 0;
 }
 
@@ -154,8 +177,6 @@ NewThread::~NewThread()
 	close_window();
 }
 
-
-
 BC_Window* NewThread::new_gui()
 {
 	mwindow->edl->save_defaults(mwindow->defaults);
@@ -163,8 +184,8 @@ BC_Window* NewThread::new_gui()
 	load_defaults();
 
 	mwindow->gui->lock_window("NewThread::new_gui");
-	int x = mwindow->gui->get_abs_cursor_x(0) - WIDTH / 2;
-	int y = mwindow->gui->get_abs_cursor_y(0) - HEIGHT / 2;
+	int x = mwindow->gui->get_pop_cursor_x(0);
+	int y = mwindow->gui->get_pop_cursor_y(0);
 
 	nwindow = new NewWindow(mwindow, this, x, y);
 	nwindow->create_objects();
@@ -172,28 +193,22 @@ BC_Window* NewThread::new_gui()
 	return nwindow;
 }
 
-
-
 void NewThread::handle_close_event(int result)
 {
-
+	if( !new_project->new_edl ) return;
 	new_project->new_edl->save_defaults(mwindow->defaults);
 	mwindow->defaults->save();
 
-	if(result)
-	{
+	if( result ) {
 // Aborted
 		if( !new_project->new_edl->Garbage::remove_user() )
 			new_project->new_edl = 0;
 	}
-	else
-	{
-		new_project->create_new_project();
+	else {
+		new_project->create_new_project(load_mode);
 	}
 }
 
-
-
 int NewThread::load_defaults()
 {
 	auto_aspect = mwindow->defaults->get("AUTOASPECT", 0);
@@ -208,46 +223,47 @@ int NewThread::save_defaults()
 
 int NewThread::update_aspect()
 {
-	if(auto_aspect)
-	{
+	if( auto_aspect ) {
 		char string[BCTEXTLEN];
 		mwindow->create_aspect_ratio(new_project->new_edl->session->aspect_w,
 			new_project->new_edl->session->aspect_h,
 			new_project->new_edl->session->output_w,
 			new_project->new_edl->session->output_h);
 		sprintf(string, "%.02f", new_project->new_edl->session->aspect_w);
-		nwindow->aspect_w_text->update(string);
+		if( nwindow->aspect_w_text ) nwindow->aspect_w_text->update(string);
 		sprintf(string, "%.02f", new_project->new_edl->session->aspect_h);
-		nwindow->aspect_h_text->update(string);
+		if( nwindow->aspect_h_text )nwindow->aspect_h_text->update(string);
 	}
 	return 0;
 }
 
 
-
-
 NewWindow::NewWindow(MWindow *mwindow, NewThread *new_thread, int x, int y)
- : BC_Window(_(_(PROGRAM_NAME ": New Project")),
- 		x,
-		y,
-		WIDTH,
-		HEIGHT,
-		-1,
-		-1,
-		0,
-		0,
-		1)
+ : BC_Window(new_thread->title, x, y,
+		WIDTH, new_thread->load_mode == LOADMODE_REPLACE ? HEIGHT : HEIGHT-180,
+		-1, -1, 0, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->new_thread = new_thread;
 	this->new_edl = new_thread->new_project->new_edl;
 	format_presets = 0;
+	atracks = 0;
+	achannels = 0;
+	sample_rate = 0;
+	vtracks = 0;
+	frame_rate = 0;
+	output_w_text = 0;
+	output_h_text = 0;
+	aspect_w_text = 0;
+	aspect_h_text = 0;
+	interlace_pulldown = 0;
+	color_model = 0;
 }
 
 NewWindow::~NewWindow()
 {
 	lock_window("NewWindow::~NewWindow");
-	if(format_presets) delete format_presets;
+	delete format_presets;
 	unlock_window();
 }
 
@@ -259,7 +275,9 @@ void NewWindow::create_objects()
 	lock_window("NewWindow::create_objects");
 	mwindow->theme->draw_new_bg(this);
 
-	add_subwindow(new BC_Title(x, y, _("Parameters for the new project:")));
+	add_subwindow( new BC_Title(x, y, new_thread->load_mode == LOADMODE_REPLACE ?
+			_("Parameters for the new project:") :
+			_("Parameters for additional tracks:") ) );
 	y += 20;
 
 	format_presets = new NewPresets(mwindow,
@@ -270,8 +288,6 @@ void NewWindow::create_objects()
 	x = format_presets->x;
 	y = format_presets->y;
 
-
-
 	y += 40;
 	y1 = y;
 	add_subwindow(new BC_Title(x, y, _("Audio"), LARGEFONT));
@@ -285,20 +301,22 @@ void NewWindow::create_objects()
 	add_subwindow(new NewATracksTumbler(this, x1, y));
 	y += atracks->get_h() + 5;
 
-	x1 = x;
-	add_subwindow(new BC_Title(x1, y, _("Channels:")));
-	x1 += 100;
-	add_subwindow(achannels = new NewAChannels(this, "", x1, y));
-	x1 += achannels->get_w();
-	add_subwindow(new NewAChannelsTumbler(this, x1, y));
-	y += achannels->get_h() + 5;
-
-	x1 = x;
-	add_subwindow(new BC_Title(x1, y, _("Samplerate:")));
-	x1 += 100;
-	add_subwindow(sample_rate = new NewSampleRate(this, "", x1, y));
-	x1 += sample_rate->get_w();
-	add_subwindow(new SampleRatePulldown(mwindow, sample_rate, x1, y));
+	if( new_thread->load_mode == LOADMODE_REPLACE ) {
+		x1 = x;
+		add_subwindow(new BC_Title(x1, y, _("Channels:")));
+		x1 += 100;
+		add_subwindow(achannels = new NewAChannels(this, "", x1, y));
+		x1 += achannels->get_w();
+		add_subwindow(new NewAChannelsTumbler(this, x1, y));
+		y += achannels->get_h() + 5;
+
+		x1 = x;
+		add_subwindow(new BC_Title(x1, y, _("Samplerate:")));
+		x1 += 100;
+		add_subwindow(sample_rate = new NewSampleRate(this, "", x1, y));
+		x1 += sample_rate->get_w();
+		add_subwindow(new SampleRatePulldown(mwindow, sample_rate, x1, y));
+	}
 
 	x += 250;
 	y = y1;
@@ -306,27 +324,28 @@ void NewWindow::create_objects()
 	y += 30;
 	x1 = x;
 	add_subwindow(new BC_Title(x1, y, _("Tracks:")));
-	x1 += 100;
+	x1 += 115;
 	add_subwindow(vtracks = new NewVTracks(this, "", x1, y));
 	x1 += vtracks->get_w();
 	add_subwindow(new NewVTracksTumbler(this, x1, y));
 	y += vtracks->get_h() + 5;
 
-// 	x1 = x;
-// 	add_subwindow(new BC_Title(x1, y, _("Channels:")));
-// 	x1 += 100;
-// 	add_subwindow(vchannels = new NewVChannels(this, "", x1, y));
-// 	x1 += vchannels->get_w();
-// 	add_subwindow(new NewVChannelsTumbler(this, x1, y));
-// 	y += vchannels->get_h() + 5;
-	x1 = x;
-	add_subwindow(new BC_Title(x1, y, _("Framerate:")));
-	x1 += 100;
-	add_subwindow(frame_rate = new NewFrameRate(this, "", x1, y));
-	x1 += frame_rate->get_w();
-	add_subwindow(new FrameRatePulldown(mwindow, frame_rate, x1, y));
-	y += frame_rate->get_h() + 5;
-
+	if( new_thread->load_mode == LOADMODE_REPLACE ) {
+// 		x1 = x;
+//	 	add_subwindow(new BC_Title(x1, y, _("Channels:")));
+// 		x1 += 100;
+// 		add_subwindow(vchannels = new NewVChannels(this, "", x1, y));
+// 		x1 += vchannels->get_w();
+// 		add_subwindow(new NewVChannelsTumbler(this, x1, y));
+// 		y += vchannels->get_h() + 5;
+		x1 = x;
+		add_subwindow(new BC_Title(x1, y, _("Framerate:")));
+		x1 += 115;
+		add_subwindow(frame_rate = new NewFrameRate(this, "", x1, y));
+		x1 += frame_rate->get_w();
+		add_subwindow(new FrameRatePulldown(mwindow, frame_rate, x1, y));
+		y += frame_rate->get_h() + 5;
+	}
 //	x1 = x;
 //	add_subwindow(new BC_Title(x1, y, _("Canvas size:")));
 // 	x1 += 100;
@@ -346,8 +365,8 @@ void NewWindow::create_objects()
 //	y += canvas_h_text->get_h() + 5;
 
 	x1 = x;
-	add_subwindow(new BC_Title(x1, y, _("Canvas size:")));
-	x1 += 100;
+	add_subwindow(new BC_Title(x1, y, _("Track size:")));
+	x1 += 115;
 	add_subwindow(output_w_text = new NewOutputW(this, x1, y));
 	x1 += output_w_text->get_w() + 2;
 	add_subwindow(new BC_Title(x1, y, "x"));
@@ -360,48 +379,45 @@ void NewWindow::create_objects()
 		output_h_text,
 		x1,
 		y));
-	x1 += pulldown->get_w() + 5;
+	x1 += pulldown->get_w() + 10;
 	add_subwindow(new NewSwapExtents(mwindow, this, x1, y));
 	y += output_h_text->get_h() + 5;
 
-	x1 = x;
-	add_subwindow(new BC_Title(x1, y, _("Aspect ratio:")));
-	x1 += 100;
-	add_subwindow(aspect_w_text = new NewAspectW(this, "", x1, y));
-	x1 += aspect_w_text->get_w() + 2;
-	add_subwindow(new BC_Title(x1, y, ":"));
-	x1 += 10;
-	add_subwindow(aspect_h_text = new NewAspectH(this, "", x1, y));
-	x1 += aspect_h_text->get_w();
-	add_subwindow(new AspectPulldown(mwindow,
-		aspect_w_text,
-		aspect_h_text,
-		x1,
-		y));
-
-	x1 = aspect_w_text->get_x();
-	y += aspect_w_text->get_h() + 5;
-	add_subwindow(new NewAspectAuto(this, x1, y));
-	y += 40;
-	add_subwindow(new BC_Title(x, y, _("Color model:")));
-	add_subwindow(textbox = new BC_TextBox(x + 100, y, 200, 1, ""));
-	add_subwindow(color_model = new ColormodelPulldown(mwindow,
-		textbox,
-		&new_edl->session->color_model,
-		x + 100 + textbox->get_w(),
-		y));
-	y += textbox->get_h() + 5;
-
-	// --------------------
-	add_subwindow(new BC_Title(x, y, _("Interlace mode:")));
-	add_subwindow(textbox = new BC_TextBox(x + 100, y, 140, 1, ""));
-	add_subwindow(interlace_pulldown = new InterlacemodePulldown(mwindow,
-		textbox,
-		&new_edl->session->interlace_mode,
-		(ArrayList<BC_ListBoxItem*>*)&mwindow->interlace_project_modes,
-		x + 100 + textbox->get_w(),
-		y));
-	y += textbox->get_h() + 5;
+	if( new_thread->load_mode == LOADMODE_REPLACE ) {
+		x1 = x;
+		add_subwindow(new BC_Title(x1, y, _("Aspect ratio:")));
+		x1 += 115;
+		add_subwindow(aspect_w_text = new NewAspectW(this, "", x1, y));
+		x1 += aspect_w_text->get_w() + 2;
+		add_subwindow(new BC_Title(x1, y, ":"));
+		x1 += 10;
+		add_subwindow(aspect_h_text = new NewAspectH(this, "", x1, y));
+		x1 += aspect_h_text->get_w();
+		add_subwindow(new AspectPulldown(mwindow,
+			aspect_w_text, aspect_h_text, x1, y));
+
+		x1 = aspect_w_text->get_x();
+		y += aspect_w_text->get_h() + 5;
+		add_subwindow(new NewAspectAuto(this, x1, y));
+		y += 40;
+		BC_Title *title;
+		add_subwindow(title = new BC_Title(x, y, _("Color model:")));
+		x1 = x + title->get_w();
+		y1 = y;  y += title->get_h() + 10;
+		add_subwindow(title = new BC_Title(x, y, _("Interlace mode:")));
+		int x2 = x + title->get_w();
+		int y2 = y;  y += title->get_h() + 10;
+		if( x1 < x2 ) x1 = x2;
+		x1 += 20;
+		add_subwindow(textbox = new BC_TextBox(x1, y1, 150, 1, ""));
+		add_subwindow(color_model = new ColormodelPulldown(mwindow,
+			textbox, &new_edl->session->color_model, x1+textbox->get_w(), y1));
+		add_subwindow(textbox = new BC_TextBox(x1, y2, 150, 1, ""));
+		add_subwindow(interlace_pulldown = new InterlacemodePulldown(mwindow,
+			textbox, &new_edl->session->interlace_mode,
+			(ArrayList<BC_ListBoxItem*>*)&mwindow->interlace_project_modes,
+			x1+textbox->get_w(), y2));
+	}
 
 	add_subwindow(new BC_OKButton(this,
 		mwindow->theme->get_image_set("new_ok_images")));
@@ -415,26 +431,21 @@ void NewWindow::create_objects()
 
 int NewWindow::update()
 {
-	atracks->update((int64_t)new_edl->session->audio_tracks);
-	achannels->update((int64_t)new_edl->session->audio_channels);
-	sample_rate->update((int64_t)new_edl->session->sample_rate);
-	vtracks->update((int64_t)new_edl->session->video_tracks);
-	frame_rate->update((float)new_edl->session->frame_rate);
-	output_w_text->update((int64_t)new_edl->session->output_w);
-	output_h_text->update((int64_t)new_edl->session->output_h);
-	aspect_w_text->update((float)new_edl->session->aspect_w);
-	aspect_h_text->update((float)new_edl->session->aspect_h);
-	interlace_pulldown->update(new_edl->session->interlace_mode);
-	color_model->update_value(new_edl->session->color_model);
+	if( atracks ) atracks->update((int64_t)new_edl->session->audio_tracks);
+	if( achannels ) achannels->update((int64_t)new_edl->session->audio_channels);
+	if( sample_rate ) sample_rate->update((int64_t)new_edl->session->sample_rate);
+	if( vtracks ) vtracks->update((int64_t)new_edl->session->video_tracks);
+	if( frame_rate ) frame_rate->update((float)new_edl->session->frame_rate);
+	if( output_w_text ) output_w_text->update((int64_t)new_edl->session->output_w);
+	if( output_h_text ) output_h_text->update((int64_t)new_edl->session->output_h);
+	if( aspect_w_text ) aspect_w_text->update((float)new_edl->session->aspect_w);
+	if( aspect_h_text ) aspect_h_text->update((float)new_edl->session->aspect_h);
+	if( interlace_pulldown ) interlace_pulldown->update(new_edl->session->interlace_mode);
+	if( color_model ) color_model->update_value(new_edl->session->color_model);
 	return 0;
 }
 
 
-
-
-
-
-
 NewPresets::NewPresets(MWindow *mwindow, NewWindow *gui, int x, int y)
  : FormatPresets(mwindow, gui, 0, x, y)
 {
@@ -456,7 +467,6 @@ EDL* NewPresets::get_edl()
 }
 
 
-
 NewATracks::NewATracks(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 90, 1, text)
 {
@@ -489,6 +499,7 @@ int NewATracksTumbler::handle_down_event()
 	return 1;
 }
 
+
 NewAChannels::NewAChannels(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 90, 1, text)
 {
@@ -501,6 +512,7 @@ int NewAChannels::handle_event()
 	return 1;
 }
 
+
 NewAChannelsTumbler::NewAChannelsTumbler(NewWindow *nwindow, int x, int y)
  : BC_Tumbler(x, y)
 {
@@ -534,18 +546,10 @@ int NewSampleRate::handle_event()
 	return 1;
 }
 
+
 SampleRatePulldown::SampleRatePulldown(MWindow *mwindow, BC_TextBox *output, int x, int y)
- : BC_ListBox(x,
- 	y,
-	100,
-	200,
-	LISTBOX_TEXT,
-	&mwindow->theme->sample_rates,
-	0,
-	0,
-	1,
-	0,
-	1)
+ : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT,
+	&mwindow->theme->sample_rates, 0, 0, 1, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->output = output;
@@ -559,19 +563,6 @@ int SampleRatePulldown::handle_event()
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 NewVTracks::NewVTracks(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 90, 1, text)
 {
@@ -584,6 +575,7 @@ int NewVTracks::handle_event()
 	return 1;
 }
 
+
 NewVTracksTumbler::NewVTracksTumbler(NewWindow *nwindow, int x, int y)
  : BC_Tumbler(x, y)
 {
@@ -604,6 +596,7 @@ int NewVTracksTumbler::handle_down_event()
 	return 1;
 }
 
+
 NewVChannels::NewVChannels(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 90, 1, text)
 {
@@ -616,6 +609,7 @@ int NewVChannels::handle_event()
 	return 1;
 }
 
+
 NewVChannelsTumbler::NewVChannelsTumbler(NewWindow *nwindow, int x, int y)
  : BC_Tumbler(x, y)
 {
@@ -636,6 +630,7 @@ int NewVChannelsTumbler::handle_down_event()
 	return 1;
 }
 
+
 NewFrameRate::NewFrameRate(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 90, 1, text)
 {
@@ -648,21 +643,11 @@ int NewFrameRate::handle_event()
 	return 1;
 }
 
+
 FrameRatePulldown::FrameRatePulldown(MWindow *mwindow,
-	BC_TextBox *output,
-	int x,
-	int y)
- : BC_ListBox(x,
- 	y,
-	100,
-	200,
-	LISTBOX_TEXT,
-	&mwindow->theme->frame_rates,
-	0,
-	0,
-	1,
-	0,
-	1)
+	BC_TextBox *output, int x, int y)
+ : BC_ListBox(x, y, 150, 250, LISTBOX_TEXT,
+	&mwindow->theme->frame_rates, 0, 0, 1, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->output = output;
@@ -676,26 +661,15 @@ int FrameRatePulldown::handle_event()
 }
 
 FrameSizePulldown::FrameSizePulldown(Theme *theme,
-		BC_TextBox *output_w,
-		BC_TextBox *output_h,
-		int x,
-		int y)
- : BC_ListBox(x,
- 	y,
-	100,
-	250,
-	LISTBOX_TEXT,
-	&theme->frame_sizes,
-	0,
-	0,
-	1,
-	0,
-	1)
+		BC_TextBox *output_w, BC_TextBox *output_h, int x, int y)
+ : BC_ListBox(x, y, 180, 250, LISTBOX_TEXT,
+	&theme->frame_sizes, 0, 0, 1, 0, 1)
 {
 	this->theme = theme;
 	this->output_w = output_w;
 	this->output_h = output_h;
 }
+
 int FrameSizePulldown::handle_event()
 {
 	char *text = get_selection(0, 0)->get_text();
@@ -705,8 +679,7 @@ int FrameSizePulldown::handle_event()
 
 	strcpy(string, text);
 	ptr = strrchr(string, 'x');
-	if(ptr)
-	{
+	if( ptr ) {
 		ptr++;
 		h = atol(ptr);
 
@@ -720,6 +693,7 @@ int FrameSizePulldown::handle_event()
 	return 1;
 }
 
+
 NewOutputW::NewOutputW(NewWindow *nwindow, int x, int y)
  : BC_TextBox(x, y, 70, 1, nwindow->new_edl->session->output_w)
 {
@@ -732,6 +706,7 @@ int NewOutputW::handle_event()
 	return 1;
 }
 
+
 NewOutputH::NewOutputH(NewWindow *nwindow, int x, int y)
  : BC_TextBox(x, y, 70, 1, nwindow->new_edl->session->output_h)
 {
@@ -744,6 +719,7 @@ int NewOutputH::handle_event()
 	return 1;
 }
 
+
 NewAspectW::NewAspectW(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 70, 1, text)
 {
@@ -756,6 +732,7 @@ int NewAspectW::handle_event()
 	return 1;
 }
 
+
 NewAspectH::NewAspectH(NewWindow *nwindow, const char *text, int x, int y)
  : BC_TextBox(x, y, 70, 1, text)
 {
@@ -768,27 +745,17 @@ int NewAspectH::handle_event()
 	return 1;
 }
 
+
 AspectPulldown::AspectPulldown(MWindow *mwindow,
-		BC_TextBox *output_w,
-		BC_TextBox *output_h,
-		int x,
-		int y)
- : BC_ListBox(x,
- 	y,
-	100,
-	200,
-	LISTBOX_TEXT,
-	&mwindow->theme->aspect_ratios,
-	0,
-	0,
-	1,
-	0,
-	1)
+		BC_TextBox *output_w, BC_TextBox *output_h, int x, int y)
+ : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT,
+	&mwindow->theme->aspect_ratios, 0, 0, 1, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->output_w = output_w;
 	this->output_h = output_h;
 }
+
 int AspectPulldown::handle_event()
 {
 	char *text = get_selection(0, 0)->get_text();
@@ -798,8 +765,7 @@ int AspectPulldown::handle_event()
 
 	strcpy(string, text);
 	ptr = strrchr(string, ':');
-	if(ptr)
-	{
+	if( ptr ) {
 		ptr++;
 		h = atof(ptr);
 
@@ -813,6 +779,7 @@ int AspectPulldown::handle_event()
 	return 1;
 }
 
+
 ColormodelItem::ColormodelItem(const char *text, int value)
  : BC_ListBoxItem(text)
 {
@@ -820,21 +787,9 @@ ColormodelItem::ColormodelItem(const char *text, int value)
 }
 
 ColormodelPulldown::ColormodelPulldown(MWindow *mwindow,
-		BC_TextBox *output_text,
-		int *output_value,
-		int x,
-		int y)
- : BC_ListBox(x,
- 	y,
-	200,
-	150,
-	LISTBOX_TEXT,
-	(ArrayList<BC_ListBoxItem*>*)&mwindow->colormodels,
-	0,
-	0,
-	1,
-	0,
-	1)
+		BC_TextBox *output_text, int *output_value, int x, int y)
+ : BC_ListBox(x, y, 200, 150, LISTBOX_TEXT,
+	(ArrayList<BC_ListBoxItem*>*)&mwindow->colormodels, 0, 0, 1, 0, 1)
 {
 	this->mwindow = mwindow;
 	this->output_text = output_text;
@@ -851,8 +806,8 @@ int ColormodelPulldown::handle_event()
 
 const char* ColormodelPulldown::colormodel_to_text()
 {
-	for(int i = 0; i < mwindow->colormodels.total; i++)
-		if(mwindow->colormodels.values[i]->value == *output_value)
+	for( int i=0; i<mwindow->colormodels.total; ++i )
+		if( mwindow->colormodels.values[i]->value == *output_value )
 			return mwindow->colormodels.values[i]->get_text();
 	return _("Unknown");
 }
@@ -921,12 +876,6 @@ int NewAspectAuto::handle_event()
 }
 
 
-
-
-
-
-
-
 NewSwapExtents::NewSwapExtents(MWindow *mwindow, NewWindow *gui, int x, int y)
  : BC_Button(x, y, mwindow->theme->get_image_set("swap_extents"))
 {
@@ -947,6 +896,3 @@ int NewSwapExtents::handle_event()
 	return 1;
 }
 
-
-
-