X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbatchrender.h;h=4a81520babf3ba1180863a4f58671504ac31ae05;hb=02a79c110b1bce1d500849c82b2098863cd60424;hp=356ebf7e82fa476275b37e936f7bc6214be29c47;hpb=af2d680fc71d16363f7f7fb7e602cb0c30015ee5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/batchrender.h b/cinelerra-5.1/cinelerra/batchrender.h
index 356ebf7e..4a81520b 100644
--- a/cinelerra-5.1/cinelerra/batchrender.h
+++ b/cinelerra-5.1/cinelerra/batchrender.h
@@ -36,10 +36,11 @@
 #include "render.inc"
 #include "timeentry.h"
 
-#define BATCHRENDER_COLUMNS 4
-
-
-
+enum {
+	ENABLED_COL, LABELED_COL, FARMED_COL,
+	OUTPUT_COL, EDL_COL, ELAPSED_COL,
+	BATCHRENDER_COLUMNS
+};
 
 class BatchRenderMenuItem : public BC_MenuItem
 {
@@ -54,19 +55,19 @@ public:
 class BatchRenderJob
 {
 public:
-	BatchRenderJob(Preferences *preferences);
+	BatchRenderJob(Preferences *preferences, int labeled=0, int farmed=-1);
 	~BatchRenderJob();
 
 	void copy_from(BatchRenderJob *src);
 	void load(FileXML *file);
 	void save(FileXML *file);
-	void fix_strategy();
+	int get_strategy();
 
 // Source EDL to render
 	char edl_path[BCTEXTLEN];
 // Destination file for output
 	Asset *asset;
-	int strategy;
+	int labeled, farmed;
 	int enabled;
 // Amount of time elapsed in last render operation
 	double elapsed;
@@ -130,7 +131,10 @@ public:
 	Preferences *preferences;
 	Render *render;
 	BatchRenderGUI *gui;
-	int column_width[BATCHRENDER_COLUMNS];
+
+	static const char *column_titles[BATCHRENDER_COLUMNS];
+	static int column_widths[BATCHRENDER_COLUMNS];
+	int list_width[BATCHRENDER_COLUMNS];
 // job being edited
 	int current_job;
 // job being rendered
@@ -196,6 +200,7 @@ public:
 	BatchRenderThread *thread;
 	BC_FileBox *gui;
 	void run();
+	void stop();
 	virtual int keypress_event();
 	Mutex *startup_lock;
 };
@@ -209,6 +214,7 @@ public:
 	BatchRenderThread *thread;
 	BC_FileBox *gui;
 	void run();
+	void stop();
 	virtual int keypress_event();
 	Mutex *startup_lock;
 };
@@ -274,6 +280,17 @@ public:
 	MWindow *mwindow;
 };
 
+class BatchRenderUseFarm : public BC_CheckBox
+{
+public:
+	BatchRenderUseFarm(BatchRenderThread *thread, int x, int y, int *output);
+	int handle_event();
+	void update(int *output);
+
+	BatchRenderThread *thread;
+	int *output;
+};
+
 
 class BatchRenderGUI : public BC_Window
 {
@@ -295,7 +312,9 @@ public:
 	void button_enable();
 	void button_disable();
 
-	ArrayList<BC_ListBoxItem*> list_columns[BATCHRENDER_COLUMNS];
+	ArrayList<BC_ListBoxItem*> list_items[BATCHRENDER_COLUMNS];
+	const char *list_titles[BATCHRENDER_COLUMNS];
+	int list_width[BATCHRENDER_COLUMNS], list_columns;
 
 	MWindow *mwindow;
 	BatchRenderThread *thread;
@@ -320,6 +339,7 @@ public:
 	BatchRenderCancel *cancel_button;
 	BatchRenderCurrentEDL *use_current_edl;
 	BatchRenderUpdateEDL *update_selected_edl;
+	BatchRenderUseFarm *use_renderfarm;
 };