repair default keyframe load, tweak init default histogram threshold

[goodguy/history.git] / cinelerra-5.1 / cinelerra / render.h

diff --git a/cinelerra-5.1/cinelerra/render.h b/cinelerra-5.1/cinelerra/render.h
index 6faf558903f8b8e46b62545383070d49a73c2211..aa7b652b18d107a274591528222f7b3c7b0b704f 100644 (file)
--- 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;
@@ -168,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;
@@ -179,7 +181,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;
@@ -275,6 +277,16 @@ public:
 };
 
 
+class RenderBeepOnDone : public BC_CheckBox
+{
+public:
+       RenderBeepOnDone(RenderWindow *rwindow, int x, int y);
+       int handle_event();
+
+       RenderWindow *rwindow;
+};
+
+
 class RenderWindow : public BC_Window
 {
 public:
@@ -294,6 +306,7 @@ public:
        RenderRangeSelection *rangeselection;
        RenderRangeInOut *rangeinout;
        RenderRange1Frame *range1frame;
+       RenderBeepOnDone *beep_on_done;
 
        RenderProfile *renderprofile;