X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fvdeviceprefs.h;h=c29d932535434533598d3cbf0e3e527d74f92c9e;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=a2b1591ee20b6b39c33310539eb80888db2a258b;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/vdeviceprefs.h b/cinelerra-5.1/cinelerra/vdeviceprefs.h
index a2b1591e..c29d9325 100644
--- 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;
@@ -70,15 +70,12 @@ public:
 	PrefsChannelPicker *channel_picker;
 
 private:
-	int create_lml_objs();
 	int create_firewire_objs();
 	int create_dv1394_objs();
-	int create_v4l_objs();
 	int create_v4l2_objs();
 	int create_v4l2jpeg_objs();
 	int create_v4l2mpeg_objs();
 	int create_screencap_objs();
-	int create_buz_objs();
 	int create_x11_objs();
 	void create_dvb_objs();
 
@@ -87,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;
@@ -102,7 +100,6 @@ private:
 	VDeviceTumbleBox *device_fields;
 	VDeviceTumbleBox *dvb_adapter_device;
 
-	VDeviceCheckBox *buz_swap_channels;
 	int driver, mode;
 	int x;
 	int y;