projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audio chan pos rework, batchrender deadlock, titler/crikey grab_event tweak, thread...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
batchrender.h
diff --git
a/cinelerra-5.1/cinelerra/batchrender.h
b/cinelerra-5.1/cinelerra/batchrender.h
index 2791d0e43b7abac89e8c43f448f5118f2f2ffab3..3350f792c3f4050abeaec85873a8bbc6f53d2482 100644
(file)
--- a/
cinelerra-5.1/cinelerra/batchrender.h
+++ b/
cinelerra-5.1/cinelerra/batchrender.h
@@
-36,10
+36,11
@@
#include "render.inc"
#include "timeentry.h"
#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
{
class BatchRenderMenuItem : public BC_MenuItem
{
@@
-54,19
+55,19
@@
public:
class BatchRenderJob
{
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);
~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;
// 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;
int enabled;
// Amount of time elapsed in last render operation
double elapsed;
@@
-92,11
+93,11
@@
public:
int test_edl_files();
void calculate_dest_paths(ArrayList<char*> *paths,
Preferences *preferences);
int test_edl_files();
void calculate_dest_paths(ArrayList<char*> *paths,
Preferences *preferences);
- void reset(
int warn
=0);
+ void reset(
const char *path
=0);
// Load batch rendering jobs
void load_jobs(char *path, Preferences *preferences);
// Not applicable to western civilizations
// Load batch rendering jobs
void load_jobs(char *path, Preferences *preferences);
// Not applicable to western civilizations
- void save_jobs(char *path);
+ void save_jobs(char *path
=0
);
void load_defaults(BC_Hash *defaults);
void save_defaults(BC_Hash *defaults);
// Create path for persistent storage functions
void load_defaults(BC_Hash *defaults);
void save_defaults(BC_Hash *defaults);
// Create path for persistent storage functions
@@
-118,8
+119,10
@@
public:
void update_active(int number);
void update_done(int number, int create_list, double elapsed_time);
void move_batch(int src, int dst);
void update_active(int number);
void update_done(int number, int create_list, double elapsed_time);
void move_batch(int src, int dst);
+ static void trap_hook(FILE *fp, void *vp);
MWindow *mwindow;
MWindow *mwindow;
+ char batch_path[BCTEXTLEN];
double current_start;
double current_end;
BatchRenderJob *default_job;
double current_start;
double current_end;
BatchRenderJob *default_job;
@@
-128,14
+131,16
@@
public:
Preferences *preferences;
Render *render;
BatchRenderGUI *gui;
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
int rendering_job;
int is_rendering;
int warn;
// job being edited
int current_job;
// job being rendered
int rendering_job;
int is_rendering;
int warn;
- ArrayList<BC_ListBoxItem*> *file_entries;
};
};
@@
-273,6
+278,17
@@
public:
MWindow *mwindow;
};
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
{
class BatchRenderGUI : public BC_Window
{
@@
-294,7
+310,9
@@
public:
void button_enable();
void button_disable();
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;
MWindow *mwindow;
BatchRenderThread *thread;
@@
-307,6
+325,7
@@
public:
// BC_Title *status_text;
// BC_ProgressBar *progress_bar;
BC_Title *list_title;
// BC_Title *status_text;
// BC_ProgressBar *progress_bar;
BC_Title *list_title;
+ BC_Title *batch_path;
BatchRenderNew *new_batch;
BatchRenderDelete *delete_batch;
BatchRenderSaveList *savelist_batch;
BatchRenderNew *new_batch;
BatchRenderDelete *delete_batch;
BatchRenderSaveList *savelist_batch;
@@
-318,6
+337,7
@@
public:
BatchRenderCancel *cancel_button;
BatchRenderCurrentEDL *use_current_edl;
BatchRenderUpdateEDL *update_selected_edl;
BatchRenderCancel *cancel_button;
BatchRenderCurrentEDL *use_current_edl;
BatchRenderUpdateEDL *update_selected_edl;
+ BatchRenderUseFarm *use_renderfarm;
};
};