mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 12:45:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ximagesrc: Remove unused screen-num property

Browse source 
The screen number can be still specified as part of the display-name
property (e.g. for screen 1 of display 0 use display-name=":0.1").

https://bugzilla.gnome.org/show_bug.cgi?id=736122
This commit is contained in:
Antonio Ospite 2014-09-15 14:39:41 +02:00 committed by Sebastian Dröge
parent 7554bd3916
commit 80fa912b06
4 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/ximage/gstximagesrc.c
View file

@ -66,7 +66,6 @@ enum
{
PROP_0,
PROP_DISPLAY_NAME,
PROP_SCREEN_NUM,
PROP_SHOW_POINTER,
PROP_USE_DAMAGE,
PROP_STARTX,
@ -920,9 +919,6 @@ gst_ximage_src_set_property (GObject * object, guint prop_id,
g_free (src->display_name);
src->display_name = g_strdup (g_value_get_string (value));
break;
case PROP_SCREEN_NUM:
src->screen_num = g_value_get_uint (value);
break;
case PROP_SHOW_POINTER:
src->show_pointer = g_value_get_boolean (value);
break;
@ -977,9 +973,6 @@ gst_ximage_src_get_property (GObject * object, guint prop_id, GValue * value,
else
g_value_set_string (value, src->display_name);
break;
case PROP_SCREEN_NUM:
g_value_set_uint (value, src->screen_num);
break;
case PROP_SHOW_POINTER:
g_value_set_boolean (value, src->show_pointer);
@ -1193,9 +1186,6 @@ gst_ximage_src_class_init (GstXImageSrcClass * klass)
g_object_class_install_property (gc, PROP_DISPLAY_NAME,
g_param_spec_string ("display-name", "Display", "X Display Name", NULL,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gc, PROP_SCREEN_NUM,
g_param_spec_uint ("screen-num", "Screen number", "X Screen Number",
0, G_MAXINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gc, PROP_SHOW_POINTER,
g_param_spec_boolean ("show-pointer", "Show Mouse Pointer",
"Show mouse pointer (if XFixes extension enabled)", TRUE,

1
sys/ximage/gstximagesrc.h
View file

@ -56,7 +56,6 @@ struct _GstXImageSrc
Window xwindow;
gchar *display_name;
guint screen_num;
/* Window selection */
guint64 xid;

17
sys/ximage/ximageutil.c
View file

@ -175,18 +175,17 @@ ximageutil_xcontext_get (GstElement * parent, const gchar * display_name)
return NULL;
}
xcontext->screen = DefaultScreenOfDisplay (xcontext->disp);
xcontext->screen_num = DefaultScreen (xcontext->disp);
xcontext->visual = DefaultVisual (xcontext->disp, xcontext->screen_num);
xcontext->root = DefaultRootWindow (xcontext->disp);
xcontext->white = XWhitePixel (xcontext->disp, xcontext->screen_num);
xcontext->black = XBlackPixel (xcontext->disp, xcontext->screen_num);
xcontext->visual = DefaultVisualOfScreen (xcontext->screen);
xcontext->root = RootWindowOfScreen (xcontext->screen);
xcontext->white = WhitePixelOfScreen (xcontext->screen);
xcontext->black = BlackPixelOfScreen (xcontext->screen);
xcontext->depth = DefaultDepthOfScreen (xcontext->screen);
xcontext->width = DisplayWidth (xcontext->disp, xcontext->screen_num);
xcontext->height = DisplayHeight (xcontext->disp, xcontext->screen_num);
xcontext->width = WidthOfScreen (xcontext->screen);
xcontext->height = HeightOfScreen (xcontext->screen);
xcontext->widthmm = DisplayWidthMM (xcontext->disp, xcontext->screen_num);
xcontext->heightmm = DisplayHeightMM (xcontext->disp, xcontext->screen_num);
xcontext->widthmm = WidthMMOfScreen (xcontext->screen);
xcontext->heightmm = HeightMMOfScreen (xcontext->screen);
xcontext->caps = NULL;

2
sys/ximage/ximageutil.h
View file

@ -50,7 +50,6 @@ typedef struct _GstMetaXImage GstMetaXImage;
* GstXContext:
* @disp: the X11 Display of this context
* @screen: the default Screen of Display @disp
* @screen_num: the Screen number of @screen
* @visual: the default Visual of Screen @screen
* @root: the root Window of Display @disp
* @white: the value of a white pixel on Screen @screen
@ -78,7 +77,6 @@ struct _GstXContext {
Display *disp;
Screen *screen;
gint screen_num;
Visual *visual;