diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 06:54:22 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-11-16 07:01:46 +0200 |
| commit | 287b62163eed8811b6cd33716c0691d328947d48 (patch) | |
| tree | 3143d2cb17b32a19e3e7e0aa428210d1bba3eb0b /cfg-mplayer.h | |
| parent | 507f4fe6c7811558b1367e4b64855ae7f9bc8da8 (diff) | |
| parent | b411278fbb00767b8013604157a43e0203f66f4c (diff) | |
| download | mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.bz2 mpv-287b62163eed8811b6cd33716c0691d328947d48.tar.xz | |
Merge svn changes up to r29912
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index ac9518b038..efd69d6708 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -158,6 +158,9 @@ const m_option_t mplayer_opts[]={ {"geometry", &vo_geometry, CONF_TYPE_STRING, 0, 0, 0, NULL}, OPT_FLAG_ON("force-window-position", force_window_position, 0), OPT_FLAG_OFF("noforce-window-position", force_window_position, 0), + // vo name (X classname) and window title strings + {"name", &vo_winname, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"title", &vo_wintitle, CONF_TYPE_STRING, 0, 0, 0, NULL}, // set aspect ratio of monitor - useful for 16:9 TV-out OPT_FLOATRANGE("monitoraspect", force_monitor_aspect, 0, 0.0, 9.0), OPT_FLOATRANGE("monitorpixelaspect", monitor_pixel_aspect, 0, 0.2, 9.0), @@ -234,6 +237,8 @@ const m_option_t mplayer_opts[]={ {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nouse-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, + {"use-filename-title", &use_filename_title, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"nouse-filename-title", &use_filename_title, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef CONFIG_CRASH_DEBUG {"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, |