Commit 6f8cdd0f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Move x11-display config to core

It is used in many places, namely all X11 plugins _except_ the video
display ones. So it did not make much sense to keep it there IMHO.
parent 64d3a241
......@@ -37,11 +37,6 @@
#include "xcb_vlc.h"
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default VLC will " \
"use the value of the DISPLAY environment variable.")
#define SHM_TEXT N_("Use shared memory")
#define SHM_LONGTEXT N_( \
"Use shared memory to communicate between VLC and the X server.")
......@@ -60,8 +55,6 @@ vlc_module_begin ()
set_capability ("vout display", 75)
set_callbacks (Open, Close)
add_string ("x11-display", NULL, NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
vlc_module_end ()
......
......@@ -39,11 +39,6 @@
#include "xcb_vlc.h"
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default, VLC will " \
"use the value of the DISPLAY environment variable.")
#define ADAPTOR_TEXT N_("XVideo adaptor number")
#define ADAPTOR_LONGTEXT N_( \
"XVideo hardware adaptor to use. By default, VLC will " \
......@@ -67,9 +62,6 @@ vlc_module_begin ()
set_capability ("vout display", 155)
set_callbacks (Open, Close)
add_string ("x11-display", NULL, NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
add_deprecated_alias ("xvideo-display")
add_integer ("xvideo-adaptor", -1, NULL,
ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true)
add_bool ("x11-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true)
......
......@@ -421,6 +421,11 @@ static const char *const ppsz_align_descriptions[] =
#define EMBEDDED_LONGTEXT N_( \
"Embed the video output in the main interface." )
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default VLC will " \
"use the value of the DISPLAY environment variable.")
#define FULLSCREEN_TEXT N_("Fullscreen video output")
#define FULLSCREEN_LONGTEXT N_( \
"Start video in fullscreen mode" )
......@@ -1627,6 +1632,9 @@ vlc_module_begin ()
#ifdef __APPLE__
add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */
#endif
add_string( "x11-display", NULL, NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */
add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, true )
/* Used in vout_synchro */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment