summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2006-03-17 16:34:36 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2006-03-17 16:34:36 +0000
commit614832d82ec4e3f0412a4251d39feb0eeff515d6 (patch)
treeccbcf8f5314a706e409edcdbb2b77c0460bec9d1
parent43586fff14aa2914f38393d8e4d09a661f4617da (diff)
downloadgst-plugins-bad-614832d82ec4e3f0412a4251d39feb0eeff515d6.tar.gz
gst-plugins-bad-614832d82ec4e3f0412a4251d39feb0eeff515d6.tar.bz2
gst-plugins-bad-614832d82ec4e3f0412a4251d39feb0eeff515d6.zip
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
-rw-r--r--ChangeLog7
-rw-r--r--sys/ximagesrc/ximagesrc.c18
2 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 091f375d..4e44f075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-17 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * sys/ximagesrc/ximagesrc.c: (gst_ximagesrc_open_display),
+ (gst_ximagesrc_set_property), (gst_ximagesrc_get_property),
+ (gst_ximagesrc_class_init), (gst_ximagesrc_init):
+ Have a show mouse pointer property and use it if we can
+
2006-03-15 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_dispose):
diff --git a/sys/ximagesrc/ximagesrc.c b/sys/ximagesrc/ximagesrc.c
index 433ff6d0..6775ce1c 100644
--- a/sys/ximagesrc/ximagesrc.c
+++ b/sys/ximagesrc/ximagesrc.c
@@ -36,7 +36,8 @@ GST_ELEMENT_DETAILS ("Ximage video source",
"Source/Video",
"Creates a screenshot video stream",
"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 =
GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
@@ -48,7 +49,8 @@ enum
{
PROP_0,
PROP_DISPLAY_NAME,
- PROP_SCREEN_NUM
+ PROP_SCREEN_NUM,
+ PROP_SHOW_POINTER
};
GST_BOILERPLATE (GstXImageSrc, gst_ximagesrc, GstPushSrc, GST_TYPE_PUSH_SRC);
@@ -107,6 +109,7 @@ gst_ximagesrc_open_display (GstXImageSrc * s, const gchar * name)
s->have_xfixes = TRUE;
GST_DEBUG_OBJECT (s, "X Server supports XFixes");
} else {
+
GST_DEBUG_OBJECT (s, "X Server does not support XFixes");
}
}
@@ -541,6 +544,9 @@ gst_ximagesrc_set_property (GObject * object, guint prop_id,
src->screen_num = g_value_get_uint (value);
// src->screen_num = MIN (src->screen_num, ScreenCount (src->display) - 1);
break;
+ case PROP_SHOW_POINTER:
+ src->show_pointer = g_value_get_boolean (value);
+ break;
default:
break;
}
@@ -563,6 +569,9 @@ gst_ximagesrc_get_property (GObject * object, guint prop_id, GValue * value,
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);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -700,6 +709,10 @@ gst_ximagesrc_class_init (GstXImageSrcClass * klass)
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_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);
@@ -720,6 +733,7 @@ gst_ximagesrc_init (GstXImageSrc * ximagesrc, GstXImageSrcClass * klass)
ximagesrc->pool_lock = g_mutex_new ();
ximagesrc->x_lock = g_mutex_new ();
+ ximagesrc->show_pointer = TRUE;
}
static gboolean