X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.h;h=ba7461ec5a8d25edfd0dc974b28c349f16702709;hb=114b45040c8027671cbe50e7d6cecb28bf73b35f;hp=6faf558903f8b8e46b62545383070d49a73c2211;hpb=e5d1c3ec8b49e9e4cd31f30e991f52ab11de93b1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/render.h b/cinelerra-5.1/cinelerra/render.h
index 6faf5589..ba7461ec 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 use_labels);
+	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,
@@ -152,6 +152,7 @@ public:
 
 	void start_progress();
 	void stop_progress();
+	void show_progress();
 
 // Procedure the run function should use.
 	int mode;
@@ -169,7 +170,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 +179,7 @@ public:
 	PlayableTracks *playable_tracks;
 	PackageDispatcher *packages;
 	Mutex *package_lock, *counter_lock;
-	int strategy;
+	int use_labels;
 	int range_type;
 // Total selection to render in seconds
 	double total_start, total_end;