Commit 4a4c3063 authored by Zaheer Abbas Merali's avatar Zaheer Abbas Merali
Browse files

Have a show mouse pointer property and use it if we can

Original commit message from CVS:
Have a show mouse pointer property and use it if we can
parent 33daa1ef
...@@ -36,7 +36,8 @@ GST_ELEMENT_DETAILS ("Ximage video source", ...@@ -36,7 +36,8 @@ GST_ELEMENT_DETAILS ("Ximage video source",
"Source/Video", "Source/Video",
"Creates a screenshot video stream", "Creates a screenshot video stream",
"Lutz Mueller <lutz@users.sourceforge.net>" "Lutz Mueller <lutz@users.sourceforge.net>"
"Jan Schmidt <thaytan@mad.scientist.com>"); "Jan Schmidt <thaytan@mad.scientist.com>"
"Zaheer Merali <zaheerabbas at merali dot org>");
static GstStaticPadTemplate t = static GstStaticPadTemplate t =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
...@@ -48,7 +49,8 @@ enum ...@@ -48,7 +49,8 @@ enum
{ {
PROP_0, PROP_0,
PROP_DISPLAY_NAME, PROP_DISPLAY_NAME,
PROP_SCREEN_NUM PROP_SCREEN_NUM,
PROP_SHOW_POINTER
}; };
GST_BOILERPLATE (GstXImageSrc, gst_ximagesrc, GstPushSrc, GST_TYPE_PUSH_SRC); GST_BOILERPLATE (GstXImageSrc, gst_ximagesrc, GstPushSrc, GST_TYPE_PUSH_SRC);
...@@ -107,6 +109,7 @@ gst_ximagesrc_open_display (GstXImageSrc * s, const gchar * name) ...@@ -107,6 +109,7 @@ gst_ximagesrc_open_display (GstXImageSrc * s, const gchar * name)
s->have_xfixes = TRUE; s->have_xfixes = TRUE;
GST_DEBUG_OBJECT (s, "X Server supports XFixes"); GST_DEBUG_OBJECT (s, "X Server supports XFixes");
} else { } else {
GST_DEBUG_OBJECT (s, "X Server does not support XFixes"); GST_DEBUG_OBJECT (s, "X Server does not support XFixes");
} }
} }
...@@ -541,6 +544,9 @@ gst_ximagesrc_set_property (GObject * object, guint prop_id, ...@@ -541,6 +544,9 @@ gst_ximagesrc_set_property (GObject * object, guint prop_id,
src->screen_num = g_value_get_uint (value); src->screen_num = g_value_get_uint (value);
// src->screen_num = MIN (src->screen_num, ScreenCount (src->display) - 1); // src->screen_num = MIN (src->screen_num, ScreenCount (src->display) - 1);
break; break;
case PROP_SHOW_POINTER:
src->show_pointer = g_value_get_boolean (value);
break;
default: default:
break; break;
} }
...@@ -563,6 +569,9 @@ gst_ximagesrc_get_property (GObject * object, guint prop_id, GValue * value, ...@@ -563,6 +569,9 @@ gst_ximagesrc_get_property (GObject * object, guint prop_id, GValue * value,
case PROP_SCREEN_NUM: case PROP_SCREEN_NUM:
g_value_set_uint (value, src->screen_num); g_value_set_uint (value, src->screen_num);
break; break;
case PROP_SHOW_POINTER:
g_value_set_boolean (value, src->show_pointer);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
...@@ -700,6 +709,10 @@ gst_ximagesrc_class_init (GstXImageSrcClass * klass) ...@@ -700,6 +709,10 @@ gst_ximagesrc_class_init (GstXImageSrcClass * klass)
g_object_class_install_property (gc, PROP_SCREEN_NUM, g_object_class_install_property (gc, PROP_SCREEN_NUM,
g_param_spec_uint ("screen_num", "Screen number", "X Screen number", g_param_spec_uint ("screen_num", "Screen number", "X Screen number",
0, G_MAXINT, 0, G_PARAM_READWRITE)); 0, G_MAXINT, 0, G_PARAM_READWRITE));
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,
G_PARAM_READWRITE));
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
...@@ -720,6 +733,7 @@ gst_ximagesrc_init (GstXImageSrc * ximagesrc, GstXImageSrcClass * klass) ...@@ -720,6 +733,7 @@ gst_ximagesrc_init (GstXImageSrc * ximagesrc, GstXImageSrcClass * klass)
ximagesrc->pool_lock = g_mutex_new (); ximagesrc->pool_lock = g_mutex_new ();
ximagesrc->x_lock = g_mutex_new (); ximagesrc->x_lock = g_mutex_new ();
ximagesrc->show_pointer = TRUE;
} }
static gboolean static gboolean
......
Supports Markdown
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