Commit 3d7d7485 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move --x11-display to the XCB window plugin

parent 873b1ceb
......@@ -40,10 +40,15 @@ typedef xcb_atom_t Atom;
#include "xcb_vlc.h"
#define XID_TEXT N_("ID of the video output X window")
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"Video will be rendered with this X11 display. " \
"If empty, the default display will be used.")
#define XID_TEXT N_("X11 window ID")
#define XID_LONGTEXT N_( \
"VLC can embed its video output in an existing X11 window. " \
"This is the X identifier of that window (0 means none).")
"Video will be embedded in this pre-existing X11 window. " \
"If zero, a new window will be created.")
static int Open (vout_window_t *, const vout_window_cfg_t *);
static void Close (vout_window_t *);
......@@ -76,6 +81,7 @@ vlc_module_begin ()
set_callbacks (EmOpen, EmClose)
add_shortcut ("embed-xid")
add_string ("x11-display", NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
add_integer ("drawable-xid", 0, XID_TEXT, XID_LONGTEXT, true)
change_volatile ()
......
......@@ -431,11 +431,6 @@ 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" )
......@@ -1666,10 +1661,6 @@ vlc_module_begin ()
#ifdef __APPLE__
add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */
#endif
add_string( "x11-display", NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */
//add_deprecated_alias( "glx-display" ) cannot have more than one
add_bool( "xlib", true, "", "", true )
change_private ()
add_bool( "drop-late-frames", 1, DROP_LATE_FRAMES_TEXT,
......
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