X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmenueffects.C;h=b58d770c224814430b22eb7356a0d2fa5b12aa8e;hp=12ae34e102b6d13ac4d7e39dfb847afa1da1863c;hb=54b918a8b84f666bf32548ebd12b93908061d2a6;hpb=3fc547b01e919d3044bacf2a78baddeaed04e3a0

diff --git a/cinelerra-5.1/cinelerra/menueffects.C b/cinelerra-5.1/cinelerra/menueffects.C
index 12ae34e1..b58d770c 100644
--- a/cinelerra-5.1/cinelerra/menueffects.C
+++ b/cinelerra-5.1/cinelerra/menueffects.C
@@ -360,7 +360,9 @@ void MenuEffectThread::run()
 		default_asset->height = mwindow->edl->session->output_h;
 	}
 
-	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, use_labels);
+	int range = File::is_image_render(default_asset->format) ?
+		RANGE_1FRAME : RANGE_SELECTION;
+	int strategy = Render::get_strategy(mwindow->preferences->use_renderfarm, use_labels, range);
 // Process the total length in fragments
 	ArrayList<MenuEffectPacket*> packets;
 	if(!result)
@@ -566,15 +568,11 @@ MenuEffectWindow::MenuEffectWindow(MWindow *mwindow,
 	ArrayList<BC_ListBoxItem*> *plugin_list,
 	Asset *asset)
  : BC_Window(_(PROGRAM_NAME ": Render effect"),
- 		mwindow->gui->get_abs_cursor_x(1),
+		mwindow->gui->get_abs_cursor_x(1),
 		mwindow->gui->get_abs_cursor_y(1) - mwindow->session->menueffect_h / 2,
 		mwindow->session->menueffect_w,
 		mwindow->session->menueffect_h,
-		580,
-		350,
-		1,
-		0,
-		1)
+		xS(580), yS(350), 1, 0, 1)
 {
 	this->menueffects = menueffects;
 	this->plugin_list = plugin_list;
@@ -607,11 +605,12 @@ void MenuEffectWindow::create_objects()
 		add_subwindow(list_title = new BC_Title(mwindow->theme->menueffect_list_x,
 			mwindow->theme->menueffect_list_y,
 			_("Select an effect")));
+		int ys5 = yS(5);
 		add_subwindow(list = new MenuEffectWindowList(this,
 			mwindow->theme->menueffect_list_x,
-			mwindow->theme->menueffect_list_y + list_title->get_h() + 5,
+			mwindow->theme->menueffect_list_y + list_title->get_h() + ys5,
 			mwindow->theme->menueffect_list_w,
-			mwindow->theme->menueffect_list_h - list_title->get_h() - 5,
+			mwindow->theme->menueffect_list_h - list_title->get_h() - ys5,
 			plugin_list));
 	}
 
@@ -630,7 +629,7 @@ void MenuEffectWindow::create_objects()
 	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 = new LoadMode(mwindow, this, x, y, &menueffects->load_mode);
 	loadmode->create_objects();
 
 	add_subwindow(new MenuEffectWindowOK(this));
@@ -649,10 +648,11 @@ int MenuEffectWindow::resize_event(int w, int h)
 	{
 		list_title->reposition_window(mwindow->theme->menueffect_list_x,
 			mwindow->theme->menueffect_list_y);
+		int ys5 = yS(5);
 		list->reposition_window(mwindow->theme->menueffect_list_x,
-			mwindow->theme->menueffect_list_y + list_title->get_h() + 5,
+			mwindow->theme->menueffect_list_y + list_title->get_h() + ys5,
 			mwindow->theme->menueffect_list_w,
-			mwindow->theme->menueffect_list_h - list_title->get_h() - 5);
+			mwindow->theme->menueffect_list_h - list_title->get_h() - ys5);
 	}
 
 	if(file_title) file_title->reposition_window(mwindow->theme->menueffect_file_x,
@@ -719,12 +719,7 @@ MenuEffectWindowList::MenuEffectWindowList(MenuEffectWindow *window,
 	int w,
 	int h,
 	ArrayList<BC_ListBoxItem*> *plugin_list)
- : BC_ListBox(x,
- 		y,
-		w,
-		h,
-		LISTBOX_TEXT,
-		plugin_list)
+ : BC_ListBox(x, y, w, h, LISTBOX_TEXT, plugin_list)
 {
 	this->window = window;
 }
@@ -737,12 +732,14 @@ int MenuEffectWindowList::handle_event()
 }
 
 #define PROMPT_TEXT _("Set up effect panel and hit \"OK\"")
+#define MEP_W xS(260)
+#define MEP_H yS(100)
 
 MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow)
  : BC_Window(_(PROGRAM_NAME ": Effect Prompt"),
- 		mwindow->gui->get_abs_cursor_x(1) - 260 / 2,
-		mwindow->gui->get_abs_cursor_y(1) - 300,
- 		MenuEffectPrompt::calculate_w(mwindow->gui),
+		mwindow->gui->get_abs_cursor_x(1) - MEP_W/2,
+		mwindow->gui->get_abs_cursor_y(1) - MEP_H/2,
+		MenuEffectPrompt::calculate_w(mwindow->gui),
 		MenuEffectPrompt::calculate_h(mwindow->gui),
 		MenuEffectPrompt::calculate_w(mwindow->gui),
 		MenuEffectPrompt::calculate_h(mwindow->gui),
@@ -752,15 +749,15 @@ MenuEffectPrompt::MenuEffectPrompt(MWindow *mwindow)
 
 int MenuEffectPrompt::calculate_w(BC_WindowBase *gui)
 {
-	int w = BC_Title::calculate_w(gui, PROMPT_TEXT) + 10;
-	w = MAX(w, BC_OKButton::calculate_w() + BC_CancelButton::calculate_w() + 30);
+	int w = BC_Title::calculate_w(gui, PROMPT_TEXT) + xS(10);
+	w = MAX(w, BC_OKButton::calculate_w() + BC_CancelButton::calculate_w() + xS(30));
 	return w;
 }
 
 int MenuEffectPrompt::calculate_h(BC_WindowBase *gui)
 {
 	int h = BC_Title::calculate_h(gui, PROMPT_TEXT);
-	h += BC_OKButton::calculate_h() + 30;
+	h += BC_OKButton::calculate_h() + yS(30);
 	return h;
 }
 
@@ -768,7 +765,7 @@ int MenuEffectPrompt::calculate_h(BC_WindowBase *gui)
 void MenuEffectPrompt::create_objects()
 {
 	lock_window("MenuEffectPrompt::create_objects");
-	int x = 10, y = 10;
+	int x = xS(10), y = yS(10);
 	BC_Title *title;
 	add_subwindow(title = new BC_Title(x, y, PROMPT_TEXT));
 	add_subwindow(new BC_OKButton(this));