merged hv7 mod

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

diff --git a/cinelerra-5.1/cinelerra/vdeviceprefs.h b/cinelerra-5.1/cinelerra/vdeviceprefs.h
index 06c1fa84f52170c8313981b2ecdbaf5ef06eae96..c29d932535434533598d3cbf0e3e527d74f92c9e 100644 (file)
--- a/cinelerra-5.1/cinelerra/vdeviceprefs.h
+++ b/cinelerra-5.1/cinelerra/vdeviceprefs.h
@@ -61,7 +61,7 @@ public:
        int initialize(int creation /* = 0 */);
        int delete_objects();
        void reset_objects();
-       static int max(int a,int b) { return a>b ? a : b; }
+       int get_h();
 
        PreferencesWindow *pwindow;
        PreferencesDialog *dialog;
@@ -84,6 +84,7 @@ private:
        BC_Title *device_title;
        BC_Title *port_title;
        BC_CheckBox *follow_video_config;
+       BC_CheckBox *use_direct_x11;
        BC_Title *channel_title;
        BC_Title *output_title;
        BC_Title *syt_title;