X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Frender.h;h=aa7b652b18d107a274591528222f7b3c7b0b704f;hp=357af62fee957d8e207464cca0c08ae4c515c126;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=ea0f83a2b769f440ac637ceee4fca5ea85340cdf

diff --git a/cinelerra-5.1/cinelerra/render.h b/cinelerra-5.1/cinelerra/render.h
index 357af62f..aa7b652b 100644
--- a/cinelerra-5.1/cinelerra/render.h
+++ b/cinelerra-5.1/cinelerra/render.h
@@ -36,7 +36,7 @@
 #include "errorbox.inc"
 #include "file.inc"
 #include "formatpopup.inc"
-#include "formattools.inc"
+#include "formattools.h"
 #include "guicast.h"
 #include "loadmode.inc"
 #include "mainprogress.inc"
@@ -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();
@@ -125,11 +124,13 @@ public:
 	int load_defaults(Asset *asset);
 	int save_defaults(Asset *asset);
 	int load_profile(int profile_slot, Asset *asset);
+	double get_render_range();
 // 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,
@@ -151,6 +152,7 @@ public:
 
 	void start_progress();
 	void stop_progress();
+	void show_progress();
 
 // Procedure the run function should use.
 	int mode;
@@ -167,8 +169,9 @@ public:
 	int in_progress;
 // Background compression must be disabled when direct frame copying and reenabled afterwards
 	int direct_frame_copying;
+// beep on done
+	int beep;
 
-// Copy of mwindow preferences or pointer to another preferences object
 	Preferences *preferences;
 	VFrame *compressed_output;
 	MainProgressBar *progress;
@@ -178,13 +181,12 @@ 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;
 // External Render farm checks this every frame.
 	int result;
-	int format_error;
 	Asset *default_asset;
 // Asset containing the file format
 	Asset *asset;
@@ -257,6 +259,33 @@ public:
 };
 
 
+class RenderRange1Frame : public BC_Radial
+{
+public:
+	RenderRange1Frame(RenderWindow *rwindow, int value, int x, int y);
+	int handle_event();
+	RenderWindow *rwindow;
+};
+
+
+class RenderFormat : public FormatTools
+{
+public:
+	RenderFormat(MWindow *mwindow, BC_WindowBase *window, Asset *asset);
+	~RenderFormat();
+	void update_format();
+};
+
+
+class RenderBeepOnDone : public BC_CheckBox
+{
+public:
+	RenderBeepOnDone(RenderWindow *rwindow, int x, int y);
+	int handle_event();
+
+	RenderWindow *rwindow;
+};
+
 
 class RenderWindow : public BC_Window
 {
@@ -269,33 +298,24 @@ public:
 	~RenderWindow();
 
 	void create_objects();
+	void enable_render_range(int v);
 	void update_range_type(int range_type);
 	void load_profile(int profile_slot);
 
 	RenderRangeProject *rangeproject;
 	RenderRangeSelection *rangeselection;
 	RenderRangeInOut *rangeinout;
+	RenderRange1Frame *range1frame;
+	RenderBeepOnDone *beep_on_done;
 
 	RenderProfile *renderprofile;
 
 	LoadMode *loadmode;
-	FormatTools *format_tools;
+	RenderFormat *render_format;
 
 	MWindow *mwindow;
 	Render *render;
 	Asset *asset;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
 #endif