Remove VESA/FBDEV remains, clean up example.conf

Remove VESA and FBDEV specific code that was forgotten when the
respective VOs were removed. Remove references to old or broken
stuff from example.conf.

4 files changed, 5 insertions, 149 deletions

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 4acdf96657..4140af4924 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -34,9 +34,6 @@
 #include "stream/stream_radio.h"
 #include "libvo/csputils.h"
 
-extern char *fb_mode_cfgfile;
-extern char *fb_mode_name;
-
 extern char *lirc_configfile;
 
 /* only used at startup (setting these values from configfile) */
@@ -602,17 +599,6 @@ const m_option_t mplayer_opts[]={
     {"display", &mDisplayName, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #endif
 
-#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
-    {"monitor-hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"monitor-vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"monitor-dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#endif
-
-#ifdef CONFIG_FBDEV
-    {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0, NULL},
-    {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0, NULL},
-#endif
-
     // force window width/height or resolution (with -vm)
     OPT_INTRANGE("x", screen_size_x, 0, 0, 4096),
     OPT_INTRANGE("y", screen_size_y, 0, 0, 4096),
@@ -634,12 +620,12 @@ const m_option_t mplayer_opts[]={
     OPT_MAKE_FLAGS("fs", fullscreen, CONF_GLOBAL),
     // set fullscreen switch method (workaround for buggy WMs)
     {"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
-    // set bpp (x11+vm, dga, fbdev, vesa, svga?)
+    // set bpp (x11+vm)
     OPT_INTRANGE("bpp", vo_dbpp, 0, 0, 32),
     {"colorkey", &vo_colorkey, CONF_TYPE_INT, 0, 0, 0, NULL},
     {"no-colorkey", &vo_colorkey, CONF_TYPE_FLAG, 0, 0, 0x1000000, NULL},
     {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-    // wait for v-sync (vesa)
+    // wait for v-sync (gl)
     {"vsync", &vo_vsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},
     {"panscan", &vo_panscan, CONF_TYPE_FLOAT, CONF_RANGE, -1.0, 1.0, NULL},
     OPT_FLOATRANGE("panscanrange", vo_panscanrange, 0, -19.0, 99.0),
diff --git a/etc/example.conf b/etc/example.conf
index ab58551102..588ec00b7e 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -22,29 +22,8 @@
 # Specify default video driver (see -vo help for a list).
 #vo=xv
 
-# Use SDL video with the aalib subdriver by default.
-#vo = sdl:aalib
-
-# FBdev driver:
-#
-# mode to use (read from fb.modes)
-#fbmode = 640x480-120
-#
-# location of the fb.modes file
-#fbmodeconfig = /etc/fb.modes
-
-# Specify your monitor timings for the vesa and fbdev video output drivers.
-# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
-# that exceed the capabilities of your monitor, you may damage it.
-#
-# horizontal frequency range (k stands for 1000)
-#monitor-hfreq = 31.5k-50k,70k
-#
-# vertical frequency range
-#monitor-vfreq = 50-90
-#
-# dotclock (or pixelclock) range (m stands for 1000000)
-#monitor-dotclock = 30M-300M
+# Use OpenGL video by default
+#vo = gl
 
 # Start in fullscreen mode by default.
 #fs=yes
@@ -74,10 +53,7 @@
 ##################
 
 # Specify default audio driver (see -ao help for a list).
-#ao=oss
-
-# Use SDL audio driver with the esd subdriver by default.
-#ao = sdl:esd
+#ao=alsa
 
 # Specify the mixer device.
 #mixer = /dev/mixer
@@ -85,10 +61,6 @@
 # Resample the sound to 44100Hz with the lavcresample audio filter.
 #af=lavcresample=44100
 
-# Output audio to S/PDIF
-#ao=alsa:device=spdif
-#ac=hwac3,hwdts,hwmpa,
-
 
 ##################
 # other settings #
@@ -117,10 +89,6 @@
 # Drop frames to preserve audio/video sync.
 #framedrop = yes
 
-# Specify your preferred skin here (skins are searched for in
-# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
-#skin = Abyss
-
 # Resample the font alphamap.
 # 0     plain white fonts
 # 0.75  very narrow black outline (default)
@@ -153,11 +121,6 @@
 # The options declared as part of profiles override global default settings,
 # but only take effect when the profile is active.
 
-[protocol.dvdnav]
-#vc=ffmpeg12,
-#mouse-movements=yes
-#nocache=yes
-
 #[vo.vdpau]
 #vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
 # Most video filters do not work with vdpau.
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 3ae3e319ed..64b2a605c5 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -496,84 +496,3 @@ void vo_mouse_movement(struct vo *vo, int posx, int posy)
   snprintf(cmd_str, sizeof(cmd_str), "set_mouse_pos %i %i", posx, posy);
   mp_input_queue_cmd(vo->input_ctx, mp_input_parse_cmd(cmd_str));
 }
-
-#if defined(CONFIG_FBDEV) || defined(CONFIG_VESA)
-/* Borrowed from vo_fbdev.c
-Monitor ranges related functions*/
-
-char *monitor_hfreq_str = NULL;
-char *monitor_vfreq_str = NULL;
-char *monitor_dotclock_str = NULL;
-
-float range_max(range_t *r)
-{
-float max = 0;
-
-	for (/* NOTHING */; (r->min != -1 && r->max != -1); r++)
-		if (max < r->max) max = r->max;
-	return max;
-}
-
-
-int in_range(range_t *r, float f)
-{
-	for (/* NOTHING */; (r->min != -1 && r->max != -1); r++)
-		if (f >= r->min && f <= r->max)
-			return 1;
-	return 0;
-}
-
-range_t *str2range(char *s)
-{
-	float tmp_min, tmp_max;
-	char *endptr = s;	// to start the loop
-	range_t *r = NULL;
-	int i;
-
-	if (!s)
-		return NULL;
-	for (i = 0; *endptr; i++) {
-		if (*s == ',')
-			goto out_err;
-		if (!(r = realloc(r, sizeof(*r) * (i + 2)))) {
-			mp_msg(MSGT_GLOBAL, MSGL_WARN,"can't realloc 'r'\n");
-			return NULL;
-		}
-		tmp_min = strtod(s, &endptr);
-		if (*endptr == 'k' || *endptr == 'K') {
-			tmp_min *= 1000.0;
-			endptr++;
-		} else if (*endptr == 'm' || *endptr == 'M') {
-			tmp_min *= 1000000.0;
-			endptr++;
-		}
-		if (*endptr == '-') {
-			tmp_max = strtod(endptr + 1, &endptr);
-			if (*endptr == 'k' || *endptr == 'K') {
-				tmp_max *= 1000.0;
-				endptr++;
-			} else if (*endptr == 'm' || *endptr == 'M') {
-				tmp_max *= 1000000.0;
-				endptr++;
-			}
-			if (*endptr != ',' && *endptr)
-				goto out_err;
-		} else if (*endptr == ',' || !*endptr) {
-			tmp_max = tmp_min;
-		} else
-			goto out_err;
-		r[i].min = tmp_min;
-		r[i].max = tmp_max;
-		if (r[i].min < 0 || r[i].max < 0)
-			goto out_err;
-		s = endptr + 1;
-	}
-	r[i].min = r[i].max = -1;
-	return r;
-out_err:
-	free(r);
-	return NULL;
-}
-
-/* Borrowed from vo_fbdev.c END */
-#endif
diff --git a/libvo/video_out.h b/libvo/video_out.h
index e98dd36a72..dd2a1f79bd 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -328,18 +328,6 @@ extern int vo_colorkey;
 
 extern int64_t WinID;
 
-typedef struct {
-        float min;
-	float max;
-	} range_t;
-
-float range_max(range_t *r);
-int in_range(range_t *r, float f);
-range_t *str2range(char *s);
-extern char *monitor_hfreq_str;
-extern char *monitor_vfreq_str;
-extern char *monitor_dotclock_str;
-
 struct mp_keymap {
   int from;
   int to;