X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmenueffects.C;h=92217a6b93dd9e9409a987b2846739c9ce333f34;hb=ae44cc4a24c9e04ee5e3b38baf6ce529832cfb39;hp=bc089e7f5848f5155449856233d13d722f942e69;hpb=26fe9e12d6d42ae8f7087ac7f08242769d77a84a;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C
index bc089e7f..92217a6b 100644
--- a/cinelerra-5.1/cinelerra/menueffects.C
+++ b/cinelerra-5.1/cinelerra/menueffects.C
@@ -169,27 +169,15 @@ void MenuEffectThread::run()
 	get_derived_attributes(default_asset, defaults);
 //	to_tracks = defaults->get("RENDER_EFFECT_TO_TRACKS", 1);
 	load_mode = defaults->get("RENDER_EFFECT_LOADMODE", LOADMODE_PASTE);
-	strategy = defaults->get("RENDER_EFFECT_STRATEGY", SINGLE_PASS);
+	use_labels = defaults->get("RENDER_FILE_PER_LABEL", 0);
 
 // get plugin information
-	int need_plugin;
-	if(!strlen(title))
-		need_plugin = 1;
-	else
-		need_plugin = 0;
-
+	int need_plugin = !strlen(title) ? 1 : 0;
 // generate a list of plugins for the window
-	if(need_plugin)
-	{
+	if( need_plugin ) {
 		mwindow->search_plugindb(default_asset->audio_data,
-			default_asset->video_data,
-			-1,
-			0,
-			0,
-			local_plugindb);
-
-		for(int i = 0; i < local_plugindb.total; i++)
-		{
+			default_asset->video_data, -1, 0, 0, local_plugindb);
+		for(int i = 0; i < local_plugindb.total; i++) {
 			plugin_list.append(new BC_ListBoxItem(_(local_plugindb.values[i]->title)));
 		}
 	}
@@ -219,7 +207,7 @@ void MenuEffectThread::run()
 // save defaults
 	save_derived_attributes(default_asset, defaults);
 	defaults->update("RENDER_EFFECT_LOADMODE", load_mode);
-	defaults->update("RENDER_EFFECT_STRATEGY", strategy);
+	defaults->update("RENDER_EFFECT_FILE_PER_LABEL", use_labels);
 	mwindow->save_defaults();
 
 // get plugin server to use and delete the plugin list
@@ -281,7 +269,7 @@ void MenuEffectThread::run()
 
 	if(mwindow->edl->local_session->get_selectionend() ==
 		mwindow->edl->local_session->get_selectionstart())
-		total_end = mwindow->edl->tracks->total_playable_length();
+		total_end = mwindow->edl->tracks->total_length();
 	else
 		total_end = mwindow->edl->local_session->get_selectionend();
 
@@ -372,6 +360,7 @@ void MenuEffectThread::run()
 		default_asset->height = mwindow->edl->session->output_h;
 	}
 
+	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, use_labels);
 // Process the total length in fragments
 	ArrayList<MenuEffectPacket*> packets;
 	if(!result)
@@ -629,7 +618,7 @@ void MenuEffectWindow::create_objects()
 	add_subwindow(file_title = new BC_Title(
 		mwindow->theme->menueffect_file_x,
 		mwindow->theme->menueffect_file_y,
-		(char*)((menueffects->strategy == FILE_PER_LABEL  || menueffects->strategy == FILE_PER_LABEL_FARM) ?
+		(char*)(menueffects->use_labels ?
 			_("Select the first file to render to:") :
 			_("Select a file to render to:"))));
 
@@ -638,18 +627,8 @@ void MenuEffectWindow::create_objects()
 	format_tools = new FormatTools(mwindow,
 					this,
 					asset);
-	format_tools->create_objects(x,
-					y,
-					asset->audio_data,
-					asset->video_data,
-					0,
-					0,
-					0,
-					1,
-					0,
-					0,
-					&menueffects->strategy,
-					0);
+	format_tools->create_objects(x, y, asset->audio_data, asset->video_data,
+		0, 0, 0, 1, 0, 0, &menueffects->use_labels, 0);
 
 	loadmode = new LoadMode(mwindow, this, x, y, &menueffects->load_mode, 1);
 	loadmode->create_objects();
@@ -767,9 +746,7 @@ MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow)
 		MenuEffectPrompt::calculate_h(mwindow->gui),
 		MenuEffectPrompt::calculate_w(mwindow->gui),
 		MenuEffectPrompt::calculate_h(mwindow->gui),
-		0,
-		0,
-		1)
+		0, 0, 1)
 {
 }
 
@@ -790,6 +767,7 @@ int MenuEffectPrompt::calculate_h(BC_WindowBase *gui)
 
 void MenuEffectPrompt::create_objects()
 {
+	lock_window("MenuEffectPrompt::create_objects");
 	int x = 10, y = 10;
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT));
@@ -797,5 +775,6 @@ void MenuEffectPrompt::create_objects()
 	add_subwindow(new BC_CancelButton(this));
 	show_window();
 	raise_window();
+	unlock_window();
 }