rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt

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

diff --git a/cinelerra-5.1/cinelerra/videodevice.h b/cinelerra-5.1/cinelerra/videodevice.h
index 57264d3d50e00cfc730a930cd2cea386eb899b4c..61f566574cd7d0f45ed205c15996b8ac01e4ce8f 100644 (file)
--- a/cinelerra-5.1/cinelerra/videodevice.h
+++ b/cinelerra-5.1/cinelerra/videodevice.h
@@ -42,9 +42,6 @@
 #include "thread.h"
 #include "picture.inc"
 #include "vdevicebase.inc"
-#include "vdevicebuz.inc"
-#include "vdevicelml.inc"
-#include "vdevicev4l.inc"
 #include "vdevicex11.inc"
 #include "videoconfig.inc"
 #include "videowindow.inc"
@@ -147,6 +144,7 @@ public:
        void set_quality(int quality);
 // Change field order
        int set_field_order(int odd_field_first);
+       void set_do_cursor(int do_cursor, int do_big_cursor);
 // Set frames to clear after translation change.
        int set_latency_counter(int value);
 // Values from -100 to 100
@@ -180,7 +178,7 @@ public:
        int interrupt_playback();
 // Get output buffer for playback using colormodel.
 // colormodel argument should be as close to best_colormodel as possible
-       void new_output_buffer(VFrame **output, int colormodel);
+       void new_output_buffer(VFrame **output, int colormodel, EDL *edl);
        int wait_for_startup();
        int wait_for_completion();
        int output_visible();     // Whether the output is visible or not.
@@ -216,7 +214,7 @@ public:
 // Flag when output is interrupted
        int interrupt;
 // Compression format in use by the output device
-       int output_format;   
+       int output_format;
        int is_playing_back;
 // Audio device to share data with
        AudioDevice *adevice;
@@ -266,6 +264,7 @@ public:
 // All the input sources on the device
        ArrayList<Channel*> input_sources;
        int odd_field_first;
+       int do_cursor;
 // Quality for the JPEG compressor
        int quality;
 // Single frame mode for playback
@@ -284,7 +283,7 @@ public:
 
 
 // Change the capture size when ready
-       int update_translation();  
+       int update_translation();
 
        VDeviceBase *input_base;
        VDeviceBase *output_base;