merged hv7 mod

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

diff --git a/cinelerra-5.1/cinelerra/playbackconfig.h b/cinelerra-5.1/cinelerra/playbackconfig.h
index 8e0e8bb5f006bd523d98e4bd362c14fccc3ea528..1896a5da8c9f839aadf248dc741070a6b1f45632 100644 (file)
--- a/cinelerra-5.1/cinelerra/playbackconfig.h
+++ b/cinelerra-5.1/cinelerra/playbackconfig.h
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #ifndef PLAYBACKCONFIG_H
@@ -94,14 +94,12 @@ public:
        void copy_from(VideoOutConfig *src);
        int load_defaults(BC_Hash *defaults, int active_config);
        int save_defaults(BC_Hash *defaults, int active_config);
-       char* get_path();
+       const char *get_path();
+       static const char *default_video_device;
 
        int driver;
-       char lml_out_device[BCTEXTLEN];
-       char buz_out_device[BCTEXTLEN];
-// Entry in the buz channel table
-       int buz_out_channel;
-       int buz_swap_fields;
+       int out_channel;
+       int use_direct_x11;
 
 // X11 options
        char x11_host[BCTEXTLEN];