mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

clean up Makefile.am

Browse source 
Original commit message from CVS:
clean up Makefile.am
This commit is contained in:
Thomas Vander Stichele 2006-04-28 16:15:20 +00:00
parent d60e890ed2
commit 7e18cca101
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/ximage/Makefile.am
View file

@ -1,11 +1,14 @@
plugin_LTLIBRARIES = libgstximagesrc.la plugin_LTLIBRARIES = libgstximagesrc.la
libgstximagesrc_la_SOURCES = ximagesrc.c ximageutil.c libgstximagesrc_la_SOURCES = ximagesrc.c ximageutil.c
libgstximagesrc_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstximagesrc_la_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(XFIXES_CFLAGS) $(XDAMAGE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
libgstximagesrc_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) \ $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(XFIXES_LIBS) $(XDAMAGE_LIBS) $(X_CFLAGS) $(XFIXES_CFLAGS) $(XDAMAGE_CFLAGS)
libgstximagesrc_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
$(GST_BASE_LIBS) \
$(X_LIBS) $(XSHM_LIBS) $(XFIXES_LIBS) $(XDAMAGE_LIBS)
libgstximagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstximagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = ximagesrc.h ximageutil.h noinst_HEADERS = ximagesrc.h ximageutil.h

26
sys/ximage/gstximagesrc.c
View file

@ -1,4 +1,6 @@
/* GStreamer /* GStreamer
*
* Copyright (C) 2006 Zaheer Merali <zaheerabbas at merali dot org>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -25,8 +27,8 @@
* This element captures your X Display and creates raw RGB video. It uses * This element captures your X Display and creates raw RGB video. It uses
* the XDamage extension if available to only capture areas of the screen that * the XDamage extension if available to only capture areas of the screen that
* have changed since the last frame. It uses the XFixes extension if * have changed since the last frame. It uses the XFixes extension if
* available to also capture your mouse pointer. By defaukt it will fixate to * available to also capture your mouse pointer. By default it will fixate to
* 25 frames per second.. * 25 frames per second.
* </para> * </para>
* <title>Example pipelines</title> * <title>Example pipelines</title>
* <para> * <para>
@ -242,7 +244,6 @@ gst_ximagesrc_recalc (GstXImageSrc * src)
return TRUE; return TRUE;
} }
/* ifdeff'ed to prevent warnings of not being used when xfixes not there */
#ifdef HAVE_XFIXES #ifdef HAVE_XFIXES
static void static void
composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src) composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src)
@ -272,7 +273,6 @@ composite_pixel (GstXContext * xcontext, guchar * dest, guchar * src)
g_assert_not_reached (); g_assert_not_reached ();
} }
/* possible optimisation: /* possible optimisation:
* move the code that finds shift and max in the _link function */ * move the code that finds shift and max in the _link function */
for (r_shift = 0; !(xcontext->visual->red_mask & (1 << r_shift)); r_shift++); for (r_shift = 0; !(xcontext->visual->red_mask & (1 << r_shift)); r_shift++);
@ -527,15 +527,14 @@ gst_ximagesrc_create (GstPushSrc * bs, GstBuffer ** buf)
if (!gst_ximagesrc_recalc (s)) { if (!gst_ximagesrc_recalc (s)) {
GST_ELEMENT_ERROR (s, RESOURCE, FAILED, GST_ELEMENT_ERROR (s, RESOURCE, FAILED,
(_("X11 Display changed resolution, we do not support this yet.")), (_("Changing resolution at runtime is not yet supported.")), (NULL));
(NULL));
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
if (s->fps_n <= 0 || s->fps_d <= 0) if (s->fps_n <= 0 || s->fps_d <= 0)
return GST_FLOW_NOT_NEGOTIATED; /* FPS must be > 0 */ return GST_FLOW_NOT_NEGOTIATED; /* FPS must be > 0 */
/* Now, we might need to wait for the next multiple of the fps /* Now, we might need to wait for the next multiple of the fps
* before capturing */ * before capturing */
GST_OBJECT_LOCK (s); GST_OBJECT_LOCK (s);
@ -615,12 +614,9 @@ gst_ximagesrc_set_property (GObject * object, guint prop_id,
g_free (src->display_name); g_free (src->display_name);
src->display_name = g_strdup (g_value_get_string (value)); src->display_name = g_strdup (g_value_get_string (value));
/* src->screen_num = MIN (src->screen_num, ScreenCount (src->display) - 1); */
break; break;
case PROP_SCREEN_NUM: case PROP_SCREEN_NUM:
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); */
break; break;
case PROP_SHOW_POINTER: case PROP_SHOW_POINTER:
src->show_pointer = g_value_get_boolean (value); src->show_pointer = g_value_get_boolean (value);
@ -783,14 +779,14 @@ gst_ximagesrc_class_init (GstXImageSrcClass * klass)
gc->finalize = gst_ximagesrc_finalize; gc->finalize = gst_ximagesrc_finalize;
g_object_class_install_property (gc, PROP_DISPLAY_NAME, g_object_class_install_property (gc, PROP_DISPLAY_NAME,
g_param_spec_string ("display_name", "Display", "X Display name", NULL, g_param_spec_string ("display_name", "Display", "X Display Name", NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
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_object_class_install_property (gc, PROP_SHOW_POINTER,
g_param_spec_boolean ("show_pointer", "Show Mouse Pointer", g_param_spec_boolean ("show_pointer", "Show Mouse Pointer",
"Show mouse pointer if XFixes extension enabled", TRUE, "Show mouse pointer (if XFixes extension enabled)", TRUE,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
@ -832,5 +828,5 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"ximagesrc", "ximagesrc",
"X11 video input plugin based on standard Xlib calls", "X11 video input plugin using standard Xlib calls",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);