diff --git a/ChangeLog b/ChangeLog index 54afed0874..96361cf153 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +2005-06-30 Thomas Vander Stichele + + * configure.ac: + * docs/libs/Makefile.am: + * docs/libs/gst-plugins-libs.types: + * ext/alsa/Makefile.am: + * ext/alsa/gstalsamixer.h: + * ext/alsa/gstalsamixeroptions.h: + * ext/alsa/gstalsamixertrack.h: + * gst-libs/gst/Makefile.am: + * gst-libs/gst/colorbalance/.cvsignore: + * gst-libs/gst/colorbalance/Makefile.am: + * gst-libs/gst/colorbalance/colorbalance-marshal.list: + * gst-libs/gst/colorbalance/colorbalance.c: + * gst-libs/gst/colorbalance/colorbalance.h: + * gst-libs/gst/colorbalance/colorbalance.vcproj: + * gst-libs/gst/colorbalance/colorbalancechannel.c: + * gst-libs/gst/colorbalance/colorbalancechannel.h: + * gst-libs/gst/interfaces/Makefile.am: + * gst-libs/gst/interfaces/colorbalance.c: + (gst_color_balance_class_init): + * gst-libs/gst/interfaces/colorbalance.h: + * gst-libs/gst/interfaces/interfaces-marshal.list: + * gst-libs/gst/interfaces/mixer.c: (gst_mixer_class_init): + * gst-libs/gst/interfaces/mixer.h: + * gst-libs/gst/interfaces/mixeroptions.h: + * gst-libs/gst/interfaces/navigation.c: + * gst-libs/gst/interfaces/tuner.c: (gst_tuner_class_init): + * gst-libs/gst/interfaces/tuner.h: + * gst/volume/Makefile.am: + * gst/volume/gstvolume.c: + * pkgconfig/gstreamer-interfaces-uninstalled.pc.in: + * sys/ximage/Makefile.am: + * sys/ximage/ximagesink.c: + * sys/xvimage/Makefile.am: + * sys/xvimage/xvimagesink.c: + fold in all interfaces into an interfaces dir, preserving CVS + history + 2005-06-30 Ronald S. Bultje * ext/ogg/gstogmparse.c: (gst_ogm_parse_chain): diff --git a/common b/common index 2826306411..4ca96aedcf 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2826306411790bf8aa9298922aa59b126897431f +Subproject commit 4ca96aedcf2be0b3dcf31fce732aed1da21b8850 diff --git a/configure.ac b/configure.ac index 5ecfb801e8..298d65f932 100644 --- a/configure.ac +++ b/configure.ac @@ -900,18 +900,13 @@ ext/vorbis/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/audio/Makefile -gst-libs/gst/colorbalance/Makefile gst-libs/gst/floatcast/Makefile gst-libs/gst/gconf/Makefile -gst-libs/gst/mixer/Makefile -gst-libs/gst/navigation/Makefile +gst-libs/gst/interfaces/Makefile gst-libs/gst/net/Makefile -gst-libs/gst/propertyprobe/Makefile gst-libs/gst/riff/Makefile gst-libs/gst/tag/Makefile -gst-libs/gst/tuner/Makefile gst-libs/gst/video/Makefile -gst-libs/gst/xoverlay/Makefile gst-libs/ext/Makefile examples/seeking/Makefile examples/Makefile diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 73de5ae119..404ec7e028 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -65,7 +65,7 @@ CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c # $(top_builddir)/gst/schedulers/libgstbasicomegascheduler.la #SCANOBJ_DEPS = $(top_builddir)/libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la SCANOBJ_DEPS = \ - $(top_builddir)/gst-libs/gst/colorbalance/libgstcolorbalance.la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la # Header files to ignore when scanning. diff --git a/docs/libs/gst-plugins-libs.types b/docs/libs/gst-plugins-libs.types index 0b17471deb..c0bfbcc6eb 100644 --- a/docs/libs/gst-plugins-libs.types +++ b/docs/libs/gst-plugins-libs.types @@ -1,6 +1,6 @@ #include -#include +#include #include gst_ringbuffer_get_type diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am index 24ffdff692..0a02686614 100644 --- a/ext/alsa/Makefile.am +++ b/ext/alsa/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = \ libgstalsa_la_CFLAGS = $(GST_CFLAGS) $(ALSA_CFLAGS) libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ libgstalsa_la_LIBADD = $(ALSA_LIBS) \ - ${top_builddir}/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la \ + ${top_builddir}/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ ${top_builddir}/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la noinst_HEADERS = \ diff --git a/ext/alsa/gstalsamixer.h b/ext/alsa/gstalsamixer.h index 4a54d63c1a..1f985669e4 100644 --- a/ext/alsa/gstalsamixer.h +++ b/ext/alsa/gstalsamixer.h @@ -22,7 +22,7 @@ #include "gstalsa.h" #include "gstalsamixeroptions.h" #include "gstalsamixertrack.h" -#include +#include G_BEGIN_DECLS diff --git a/ext/alsa/gstalsamixeroptions.h b/ext/alsa/gstalsamixeroptions.h index 80a615242e..0595a2c2fa 100644 --- a/ext/alsa/gstalsamixeroptions.h +++ b/ext/alsa/gstalsamixeroptions.h @@ -20,7 +20,7 @@ #define __GST_ALSA_MIXER_OPTIONS_H__ #include "gstalsa.h" -#include +#include G_BEGIN_DECLS diff --git a/ext/alsa/gstalsamixertrack.h b/ext/alsa/gstalsamixertrack.h index fe153820ef..1bba405616 100644 --- a/ext/alsa/gstalsamixertrack.h +++ b/ext/alsa/gstalsamixertrack.h @@ -20,7 +20,7 @@ #define __GST_ALSA_MIXER_TRACK_H__ #include "gstalsa.h" -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index aa280ce0d8..ae1c0a8055 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -6,49 +6,22 @@ endif SUBDIRS = \ audio \ - colorbalance \ floatcast \ $(GCONF_DIR) \ - mixer \ - navigation \ + interfaces \ net \ - propertyprobe \ riff \ tag \ - tuner \ - video \ - xoverlay \ - . + video DIST_SUBDIRS = \ audio \ - colorbalance \ floatcast \ gconf \ - mixer \ - navigation \ + interfaces \ net \ - propertyprobe \ riff \ tag \ - tuner \ - video \ - xoverlay - - -lib_LTLIBRARIES = libgstinterfaces-@GST_MAJORMINOR@.la - -libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = - -libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \ - colorbalance/libgstcolorbalance.la \ - mixer/libgstmixer.la \ - navigation/libgstnavigation.la \ - propertyprobe/libgstpropertyprobe.la \ - tuner/libgsttuner.la \ - xoverlay/libgstxoverlay.la \ - $(GST_LIBS) - -libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ + video noinst_HEADERS = gettext.h gst-i18n-plugin.h diff --git a/gst-libs/gst/colorbalance/.gitignore b/gst-libs/gst/colorbalance/.gitignore deleted file mode 100644 index 8a465f35d7..0000000000 --- a/gst-libs/gst/colorbalance/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -colorbalance-enumtypes.[ch] -colorbalance-marshal.[ch] diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am deleted file mode 100644 index 5888fb50a7..0000000000 --- a/gst-libs/gst/colorbalance/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# variables used for enum/marshal generation -glib_enum_headers=$(colorbalance_headers) -glib_enum_define=GST_COLOR_BALANCE -glib_enum_prefix=gst_color_balance - -libgstcolorbalanceincludedir = \ - $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance - -colorbalance_headers = \ - colorbalance.h \ - colorbalancechannel.h - -built_sources = \ - colorbalance-marshal.c \ - colorbalance-enumtypes.c - -built_headers = \ - colorbalance-marshal.h \ - colorbalance-enumtypes.h - -libgstcolorbalanceinclude_HEADERS = \ - $(colorbalance_headers) - -nodist_libgstcolorbalanceinclude_HEADERS = \ - colorbalance-enumtypes.h - -noinst_LTLIBRARIES = libgstcolorbalance.la - -libgstcolorbalance_la_SOURCES = \ - colorbalance.c \ - colorbalancechannel.c - -nodist_libgstcolorbalance_la_SOURCES = \ - $(built_sources) \ - colorbalance-marshal.h - -libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) - -BUILT_SOURCES = \ - $(built_sources) \ - $(built_headers) - -EXTRA_DIST = colorbalance-marshal.list - -CLEANFILES = $(BUILT_SOURCES) - -include $(top_srcdir)/common/glib-gen.mak diff --git a/gst-libs/gst/colorbalance/colorbalance-marshal.list b/gst-libs/gst/colorbalance/colorbalance-marshal.list deleted file mode 100644 index b9d0c499aa..0000000000 --- a/gst-libs/gst/colorbalance/colorbalance-marshal.list +++ /dev/null @@ -1 +0,0 @@ -VOID:OBJECT,INT diff --git a/gst-libs/gst/colorbalance/colorbalance.c b/gst-libs/gst/colorbalance/colorbalance.c deleted file mode 100644 index ac6e511ebe..0000000000 --- a/gst-libs/gst/colorbalance/colorbalance.c +++ /dev/null @@ -1,136 +0,0 @@ -/* GStreamer Color Balance - * Copyright (C) 2003 Ronald Bultje - * - * colorbalance.c: image color balance interface design - * virtual class function wrappers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "colorbalance.h" -#include "colorbalance-marshal.h" - -enum -{ - VALUE_CHANGED, - LAST_SIGNAL -}; - -static void gst_color_balance_class_init (GstColorBalanceClass * klass); - -static guint gst_color_balance_signals[LAST_SIGNAL] = { 0 }; - -GType -gst_color_balance_get_type (void) -{ - static GType gst_color_balance_type = 0; - - if (!gst_color_balance_type) { - static const GTypeInfo gst_color_balance_info = { - sizeof (GstColorBalanceClass), - (GBaseInitFunc) gst_color_balance_class_init, - NULL, - NULL, - NULL, - NULL, - 0, - 0, - NULL, - }; - - gst_color_balance_type = g_type_register_static (G_TYPE_INTERFACE, - "GstColorBalance", &gst_color_balance_info, 0); - g_type_interface_add_prerequisite (gst_color_balance_type, - GST_TYPE_IMPLEMENTS_INTERFACE); - } - - return gst_color_balance_type; -} - -static void -gst_color_balance_class_init (GstColorBalanceClass * klass) -{ - static gboolean initialized = FALSE; - - if (!initialized) { - gst_color_balance_signals[VALUE_CHANGED] = - g_signal_new ("value-changed", - GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstColorBalanceClass, value_changed), - NULL, NULL, - gst_color_balance_marshal_VOID__OBJECT_INT, - G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT); - - initialized = TRUE; - } - - klass->balance_type = GST_COLOR_BALANCE_SOFTWARE; - - /* default virtual functions */ - klass->list_channels = NULL; - klass->set_value = NULL; - klass->get_value = NULL; -} - -const GList * -gst_color_balance_list_channels (GstColorBalance * balance) -{ - GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance); - - if (klass->list_channels) { - return klass->list_channels (balance); - } - - return NULL; -} - -void -gst_color_balance_set_value (GstColorBalance * balance, - GstColorBalanceChannel * channel, gint value) -{ - GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance); - - if (klass->set_value) { - klass->set_value (balance, channel, value); - } -} - -gint -gst_color_balance_get_value (GstColorBalance * balance, - GstColorBalanceChannel * channel) -{ - GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance); - - if (klass->get_value) { - return klass->get_value (balance, channel); - } - - return channel->min_value; -} - -void -gst_color_balance_value_changed (GstColorBalance * balance, - GstColorBalanceChannel * channel, gint value) -{ - g_signal_emit (G_OBJECT (balance), - gst_color_balance_signals[VALUE_CHANGED], 0, channel, value); - - g_signal_emit_by_name (G_OBJECT (channel), "value_changed", value); -} diff --git a/gst-libs/gst/colorbalance/colorbalance.h b/gst-libs/gst/colorbalance/colorbalance.h deleted file mode 100644 index d7b92171ce..0000000000 --- a/gst-libs/gst/colorbalance/colorbalance.h +++ /dev/null @@ -1,96 +0,0 @@ -/* GStreamer Color Balance - * Copyright (C) 2003 Ronald Bultje - * - * color-balance.h: image color balance interface design - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_COLOR_BALANCE_H__ -#define __GST_COLOR_BALANCE_H__ - -#include -#include -#include - -G_BEGIN_DECLS - -#define GST_TYPE_COLOR_BALANCE \ - (gst_color_balance_get_type ()) -#define GST_COLOR_BALANCE(obj) \ - (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, \ - GstColorBalance)) -#define GST_COLOR_BALANCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE, \ - GstColorBalanceClass)) -#define GST_IS_COLOR_BALANCE(obj) \ - (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE)) -#define GST_IS_COLOR_BALANCE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE)) -#define GST_COLOR_BALANCE_GET_CLASS(inst) \ - (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass)) - -#define GST_COLOR_BALANCE_TYPE(klass) (klass->balance_type) - -typedef struct _GstColorBalance GstColorBalance; - -typedef enum -{ - GST_COLOR_BALANCE_HARDWARE, - GST_COLOR_BALANCE_SOFTWARE -} GstColorBalanceType; - -typedef struct _GstColorBalanceClass { - GTypeInterface klass; - - GstColorBalanceType balance_type; - - /* virtual functions */ - const GList * (* list_channels) (GstColorBalance *balance); - - void (* set_value) (GstColorBalance *balance, - GstColorBalanceChannel *channel, - gint value); - gint (* get_value) (GstColorBalance *balance, - GstColorBalanceChannel *channel); - - /* signals */ - void (* value_changed) (GstColorBalance *balance, - GstColorBalanceChannel *channel, - gint value); - - gpointer _gst_reserved[GST_PADDING]; -} GstColorBalanceClass; - -GType gst_color_balance_get_type (void); - -/* virtual class function wrappers */ -const GList * - gst_color_balance_list_channels (GstColorBalance *balance); -void gst_color_balance_set_value (GstColorBalance *balance, - GstColorBalanceChannel *channel, - gint value); -gint gst_color_balance_get_value (GstColorBalance *balance, - GstColorBalanceChannel *channel); - -/* trigger signal */ -void gst_color_balance_value_changed (GstColorBalance *balance, - GstColorBalanceChannel *channel, - gint value); - -G_END_DECLS - -#endif /* __GST_COLOR_BALANCE_H__ */ diff --git a/gst-libs/gst/colorbalance/colorbalance.vcproj b/gst-libs/gst/colorbalance/colorbalance.vcproj deleted file mode 100644 index 33980ed471..0000000000 --- a/gst-libs/gst/colorbalance/colorbalance.vcproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gst-libs/gst/colorbalance/colorbalancechannel.c b/gst-libs/gst/colorbalance/colorbalancechannel.c deleted file mode 100644 index 4fd0ea8887..0000000000 --- a/gst-libs/gst/colorbalance/colorbalancechannel.c +++ /dev/null @@ -1,106 +0,0 @@ -/* GStreamer Color Balance - * Copyright (C) 2003 Ronald Bultje - * - * colorbalancechannel.c: colorbalance channel object design - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "colorbalancechannel.h" - -enum -{ - /* FILL ME */ - SIGNAL_VALUE_CHANGED, - LAST_SIGNAL -}; - -static void gst_color_balance_channel_class_init (GstColorBalanceChannelClass * - klass); -static void gst_color_balance_channel_init (GstColorBalanceChannel * balance); -static void gst_color_balance_channel_dispose (GObject * object); - -static GObjectClass *parent_class = NULL; -static guint signals[LAST_SIGNAL] = { 0 }; - -GType -gst_color_balance_channel_get_type (void) -{ - static GType gst_color_balance_channel_type = 0; - - if (!gst_color_balance_channel_type) { - static const GTypeInfo color_balance_channel_info = { - sizeof (GstColorBalanceChannelClass), - NULL, - NULL, - (GClassInitFunc) gst_color_balance_channel_class_init, - NULL, - NULL, - sizeof (GstColorBalanceChannel), - 0, - (GInstanceInitFunc) gst_color_balance_channel_init, - NULL - }; - - gst_color_balance_channel_type = - g_type_register_static (G_TYPE_OBJECT, - "GstColorBalanceChannel", &color_balance_channel_info, 0); - } - - return gst_color_balance_channel_type; -} - -static void -gst_color_balance_channel_class_init (GstColorBalanceChannelClass * klass) -{ - GObjectClass *object_klass = (GObjectClass *) klass; - - parent_class = g_type_class_ref (G_TYPE_OBJECT); - - signals[SIGNAL_VALUE_CHANGED] = - g_signal_new ("value-changed", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstColorBalanceChannelClass, - value_changed), - NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - - object_klass->dispose = gst_color_balance_channel_dispose; -} - -static void -gst_color_balance_channel_init (GstColorBalanceChannel * channel) -{ - channel->label = NULL; - channel->min_value = channel->max_value = 0; -} - -static void -gst_color_balance_channel_dispose (GObject * object) -{ - GstColorBalanceChannel *channel = GST_COLOR_BALANCE_CHANNEL (object); - - if (channel->label) - g_free (channel->label); - - channel->label = NULL; - - if (parent_class->dispose) - parent_class->dispose (object); -} diff --git a/gst-libs/gst/colorbalance/colorbalancechannel.h b/gst-libs/gst/colorbalance/colorbalancechannel.h deleted file mode 100644 index 23f73f8ec2..0000000000 --- a/gst-libs/gst/colorbalance/colorbalancechannel.h +++ /dev/null @@ -1,64 +0,0 @@ -/* GStreamer Color Balance - * Copyright (C) 2003 Ronald Bultje - * - * colorbalancechannel.h: individual channel object - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_COLOR_BALANCE_CHANNEL_H__ -#define __GST_COLOR_BALANCE_CHANNEL_H__ - -#include - -G_BEGIN_DECLS - -#define GST_TYPE_COLOR_BALANCE_CHANNEL \ - (gst_color_balance_channel_get_type ()) -#define GST_COLOR_BALANCE_CHANNEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL, \ - GstColorBalanceChannel)) -#define GST_COLOR_BALANCE_CHANNEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL, \ - GstColorBalanceChannelClass)) -#define GST_IS_COLOR_BALANCE_CHANNEL(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL)) -#define GST_IS_COLOR_BALANCE_CHANNEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL)) - -typedef struct _GstColorBalanceChannel { - GObject parent; - - gchar *label; - gint min_value, - max_value; -} GstColorBalanceChannel; - -typedef struct _GstColorBalanceChannelClass { - GObjectClass parent; - - /* signals */ - void (* value_changed) (GstColorBalanceChannel *channel, - gint value); - - gpointer _gst_reserved[GST_PADDING]; -} GstColorBalanceChannelClass; - -GType gst_color_balance_channel_get_type (void); - -G_END_DECLS - -#endif /* __GST_COLOR_BALANCE_CHANNEL_H__ */ diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am new file mode 100644 index 0000000000..90038d826c --- /dev/null +++ b/gst-libs/gst/interfaces/Makefile.am @@ -0,0 +1,73 @@ +lib_LTLIBRARIES = libgstinterfaces-@GST_MAJORMINOR@.la +libgstinterfacesincludedir = \ + $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces + +headers_interfaces = \ + colorbalance.h \ + colorbalancechannel.h \ + mixer.h \ + mixeroptions.h \ + mixertrack.h \ + navigation.h \ + propertyprobe.h \ + tuner.h \ + tunernorm.h \ + tunerchannel.h \ + xoverlay.h + +# variables used for enum/marshal generation +glib_enum_headers=$(headers_interfaces) +glib_enum_define=GST_INTERFACES +glib_enum_prefix=gst_interfaces + +built_sources = \ + interfaces-marshal.c \ + interfaces-enumtypes.c + +built_headers = \ + interfaces-marshal.h \ + interfaces-enumtypes.h + +libgstinterfacesinclude_HEADERS = \ + $(headers_interfaces) + +nodist_libgstinterfacesinclude_HEADERS = \ + interfaces-enumtypes.h + +noinst_HEADERS = interfaces.h + +libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ + colorbalance.c \ + colorbalancechannel.c \ + mixer.c \ + mixeroptions.c \ + mixertrack.c \ + navigation.c \ + propertyprobe.c \ + tuner.c \ + tunernorm.c \ + tunerchannel.c \ + xoverlay.c + +nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ + $(built_sources) \ + interfaces-marshal.h + +libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = \ + $(GST_CFLAGS) + +libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \ + $(GST_LIBS) + +libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = \ + @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ + +BUILT_SOURCES = \ + $(built_sources) \ + $(built_headers) + +EXTRA_DIST = interfaces-marshal.list + +CLEANFILES = $(BUILT_SOURCES) + +include $(top_srcdir)/common/glib-gen.mak diff --git a/gst-libs/gst/interfaces/colorbalance.c b/gst-libs/gst/interfaces/colorbalance.c index ac6e511ebe..3682e6ca28 100644 --- a/gst-libs/gst/interfaces/colorbalance.c +++ b/gst-libs/gst/interfaces/colorbalance.c @@ -25,7 +25,7 @@ #endif #include "colorbalance.h" -#include "colorbalance-marshal.h" +#include "interfaces-marshal.h" enum { @@ -75,7 +75,7 @@ gst_color_balance_class_init (GstColorBalanceClass * klass) GST_TYPE_COLOR_BALANCE, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstColorBalanceClass, value_changed), NULL, NULL, - gst_color_balance_marshal_VOID__OBJECT_INT, + gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2, GST_TYPE_COLOR_BALANCE_CHANNEL, G_TYPE_INT); initialized = TRUE; diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h index d7b92171ce..5b9271e995 100644 --- a/gst-libs/gst/interfaces/colorbalance.h +++ b/gst-libs/gst/interfaces/colorbalance.h @@ -23,8 +23,8 @@ #define __GST_COLOR_BALANCE_H__ #include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/interfaces-marshal.list b/gst-libs/gst/interfaces/interfaces-marshal.list new file mode 100644 index 0000000000..cb7469c2d3 --- /dev/null +++ b/gst-libs/gst/interfaces/interfaces-marshal.list @@ -0,0 +1,5 @@ +VOID:OBJECT,BOOLEAN +VOID:OBJECT,POINTER +VOID:OBJECT,STRING +VOID:OBJECT,ULONG +VOID:OBJECT,INT diff --git a/gst-libs/gst/interfaces/mixer.c b/gst-libs/gst/interfaces/mixer.c index 158c2ad711..d7074d94cc 100644 --- a/gst-libs/gst/interfaces/mixer.c +++ b/gst-libs/gst/interfaces/mixer.c @@ -24,7 +24,7 @@ #endif #include "mixer.h" -#include "mixer-marshal.h" +#include "interfaces-marshal.h" enum { @@ -77,28 +77,28 @@ gst_mixer_class_init (GstMixerClass * klass) GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMixerClass, record_toggled), NULL, NULL, - gst_mixer_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN); gst_mixer_signals[SIGNAL_MUTE_TOGGLED] = g_signal_new ("mute-toggled", GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMixerClass, mute_toggled), NULL, NULL, - gst_mixer_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, GST_TYPE_MIXER_TRACK, G_TYPE_BOOLEAN); gst_mixer_signals[SIGNAL_VOLUME_CHANGED] = g_signal_new ("volume-changed", GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMixerClass, volume_changed), NULL, NULL, - gst_mixer_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_POINTER, G_TYPE_NONE, 2, GST_TYPE_MIXER_TRACK, G_TYPE_POINTER); gst_mixer_signals[SIGNAL_OPTION_CHANGED] = g_signal_new ("option-changed", GST_TYPE_MIXER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstMixerClass, option_changed), NULL, NULL, - gst_mixer_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, GST_TYPE_MIXER_OPTIONS, G_TYPE_STRING); initialized = TRUE; diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/interfaces/mixer.h index 85ff107ad0..c9bb7d9aee 100644 --- a/gst-libs/gst/interfaces/mixer.h +++ b/gst-libs/gst/interfaces/mixer.h @@ -23,9 +23,9 @@ #define __GST_MIXER_H__ #include -#include -#include -#include +#include +#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/mixeroptions.h b/gst-libs/gst/interfaces/mixeroptions.h index d0a309ea26..5e39f278ae 100644 --- a/gst-libs/gst/interfaces/mixeroptions.h +++ b/gst-libs/gst/interfaces/mixeroptions.h @@ -25,7 +25,7 @@ #define __GST_MIXER_OPTIONS_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/navigation.c b/gst-libs/gst/interfaces/navigation.c index ac0b9e5c50..cd1f844336 100644 --- a/gst-libs/gst/interfaces/navigation.c +++ b/gst-libs/gst/interfaces/navigation.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include +#include static void gst_navigation_class_init (GstNavigationInterface * iface); diff --git a/gst-libs/gst/interfaces/tuner.c b/gst-libs/gst/interfaces/tuner.c index 5bfe1ae7b1..9b24f62198 100644 --- a/gst-libs/gst/interfaces/tuner.c +++ b/gst-libs/gst/interfaces/tuner.c @@ -24,7 +24,7 @@ #endif #include "tuner.h" -#include "tuner-marshal.h" +#include "interfaces-marshal.h" #include @@ -92,14 +92,14 @@ gst_tuner_class_init (GstTunerClass * klass) GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstTunerClass, frequency_changed), NULL, NULL, - gst_tuner_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_ULONG, G_TYPE_NONE, 2, GST_TYPE_TUNER_CHANNEL, G_TYPE_ULONG); gst_tuner_signals[SIGNAL_CHANGED] = g_signal_new ("signal-changed", GST_TYPE_TUNER, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstTunerClass, signal_changed), NULL, NULL, - gst_tuner_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2, + gst_interfaces_marshal_VOID__OBJECT_INT, G_TYPE_NONE, 2, GST_TYPE_TUNER_CHANNEL, G_TYPE_INT); initialized = TRUE; diff --git a/gst-libs/gst/interfaces/tuner.h b/gst-libs/gst/interfaces/tuner.h index 8c935389c9..35321922b8 100644 --- a/gst-libs/gst/interfaces/tuner.h +++ b/gst-libs/gst/interfaces/tuner.h @@ -23,9 +23,9 @@ #define __GST_TUNER_H__ #include -#include -#include -#include +#include +#include +#include G_BEGIN_DECLS diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am index 2440ccf567..82721bbf2b 100644 --- a/gst/volume/Makefile.am +++ b/gst/volume/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstvolume.la libgstvolume_la_SOURCES = gstvolume.c libgstvolume_la_CFLAGS = $(GST_CFLAGS) libgstvolume_la_LIBADD = $(GST_LIBS) $(GST_CONTROL_LIBS) \ - $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(GST_BASE_LIBS) libgstvolume_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index a2af211a1f..af3dce10f3 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "gstvolume.h" /* some defines for audio processing */ diff --git a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in index 732e0c2c76..1abfeb907b 100644 --- a/pkgconfig/gstreamer-interfaces-uninstalled.pc.in +++ b/pkgconfig/gstreamer-interfaces-uninstalled.pc.in @@ -1,6 +1,6 @@ prefix= exec_prefix= -libdir=${pcfiledir}/../gst-libs/gst +libdir=${pcfiledir}/../gst-libs/gst/interfaces includedir=${pcfiledir}/../gst-libs Name: GStreamer Interfaces library, uninstalled diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am index 79ca3305a3..d0a3beb141 100644 --- a/sys/ximage/Makefile.am +++ b/sys/ximage/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstximagesink.la libgstximagesink_la_SOURCES = ximagesink.c libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) libgstximagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) \ - $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index bf6babdcff..0983a53d90 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -22,8 +22,8 @@ #endif /* Our interfaces */ -#include -#include +#include +#include /* Object header */ #include "ximagesink.h" diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am index 3ee55ace10..0706a71d8e 100644 --- a/sys/xvimage/Makefile.am +++ b/sys/xvimage/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstxvimagesink.la libgstxvimagesink_la_SOURCES = xvimagesink.c libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) \ - $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la \ + $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 96d73c5719..4dace527c5 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -22,9 +22,9 @@ #endif /* Our interfaces */ -#include -#include -#include +#include +#include +#include /* Object header */ #include "xvimagesink.h"