Video mode switching is off by default

2 files changed, 16 insertions, 4 deletions

diff --git a/config.c b/config.c
index 050a1508..0db72481 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c,v 1.103 2011-03-20 21:31:36 phintuka Exp $
+ * $Id: config.c,v 1.104 2011-07-10 17:46:52 phintuka Exp $
  *
  */
 
@@ -604,7 +604,7 @@ config_t::config_t() {
   alpha_correction_abs = 0;
 
   fullscreen     = 0;
-  modeswitch     = 1;
+  modeswitch     = 0;
   width          = 720;
   height         = 576;
   scale_video    = 0;
@@ -716,7 +716,7 @@ bool config_t::ProcessArg(const char *Name, const char *Value)
 
 bool config_t::ProcessArgs(int argc, char *argv[])
 {
-  static const char short_options[] = "fDw:h:l:r:A:V:d:P:C:pc";
+  static const char short_options[] = "fDw:h:l:mr:A:V:d:P:C:pc";
 
   static const struct option long_options[] = {
       { "fullscreen",   no_argument,       NULL, 'f' },
@@ -734,6 +734,7 @@ bool config_t::ProcessArgs(int argc, char *argv[])
       { "video",        required_argument, NULL, 'V' },
       { "display",      required_argument, NULL, 'd' },
       { "window",       required_argument, NULL, 'W' },
+      { "modeswitch",   no_argument,       NULL, 'm' },
       { "post",         required_argument, NULL, 'P' },
       { "config",       required_argument, NULL, 'C' },
       { "primary",      no_argument,       NULL, 'p' },
@@ -748,6 +749,11 @@ bool config_t::ProcessArgs(int argc, char *argv[])
               break;
     case 'W': ProcessArg("X11.WindowId", optarg);
               break;
+    case 'm': ProcessArg("VideoModeSwitching", "1");
+#ifndef HAVE_XRANDR
+              LOGMSG("Video mode switching not supported");
+#endif
+              break;
     case 'f': ProcessArg("Fullscreen", "1");
               break;
     case 'D': ProcessArg("X11.HUDOSD", "1");
diff --git a/config.h b/config.h
index d363a211..5123da8f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.78 2011-03-20 21:31:36 phintuka Exp $
+ * $Id: config.h,v 1.79 2011-07-10 17:46:12 phintuka Exp $
  *
  */
 
@@ -361,6 +361,12 @@ class config_t {
     int  ffmpeg_pp_quality;   // 0...6
     char ffmpeg_pp_mode[256];
 
+#if 1
+    int autocrop_method;
+    int autocrop_output_aspect;
+    int autocrop_overscan;
+#endif
+
     // automatic 4:3 letterbox -> 16:9 cropping post plugin
     int  autocrop;            // enable / disable
     int  autocrop_autodetect;