X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.h;h=1e025abcd95c078a2aebccc28961b36c7c7db44a;hp=6faf558903f8b8e46b62545383070d49a73c2211;hb=723142d62d61cde588e961426440f839ca9dcda9;hpb=c228887ab37c08509ae86a46f52b8f62b474129a

diff --git a/cinelerra-5.1/cinelerra/render.h b/cinelerra-5.1/cinelerra/render.h
index 6faf5589..1e025abc 100644
--- a/cinelerra-5.1/cinelerra/render.h
+++ b/cinelerra-5.1/cinelerra/render.h
@@ -112,8 +112,7 @@ public:
 	void start_batches(ArrayList<BatchRenderJob*> *jobs);
 // The batches are processed in the foreground in non interactive mode.
 	void start_batches(ArrayList<BatchRenderJob*> *jobs,
-		BC_Hash *boot_defaults,
-		Preferences *preferences);
+		BC_Hash *boot_defaults, Preferences *batch_prefs);
 // Called by BatchRender to stop the operation.
 	void stop_operation();
 	BC_Window* new_gui();
@@ -129,8 +128,9 @@ public:
 // force asset parameters regardless of window
 // This should be integrated into the Asset Class.
 	static int check_asset(EDL *edl, Asset &asset);
-// Fix strategy to conform with using renderfarm.
-	static int fix_strategy(int strategy, int use_renderfarm);
+// strategy to conform with using renderfarm.
+	static int get_strategy(int use_renderfarm, int file_per_label);
+	int get_strategy();
 // Force filename to have a 0 padded number if rendering to a list.
 	int check_numbering(Asset &asset);
 	static void create_filename(char *path,
@@ -169,7 +169,6 @@ public:
 // Background compression must be disabled when direct frame copying and reenabled afterwards
 	int direct_frame_copying;
 
-// Copy of mwindow preferences or pointer to another preferences object
 	Preferences *preferences;
 	VFrame *compressed_output;
 	MainProgressBar *progress;
@@ -179,7 +178,7 @@ public:
 	PlayableTracks *playable_tracks;
 	PackageDispatcher *packages;
 	Mutex *package_lock, *counter_lock;
-	int strategy;
+	int file_per_label;
 	int range_type;
 // Total selection to render in seconds
 	double total_start, total_end;