+2005-06-30 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * 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 <rbultje@ronald.bitfreak.net>
* ext/ogg/gstogmparse.c: (gst_ogm_parse_chain):
-Subproject commit 2826306411790bf8aa9298922aa59b126897431f
+Subproject commit 4ca96aedcf2be0b3dcf31fce732aed1da21b8850
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
# $(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.
#include <gst/gst.h>
-#include <gst/colorbalance/colorbalance.h>
+#include <gst/interfaces/colorbalance.h>
#include <gst/audio/gstringbuffer.h>
gst_ringbuffer_get_type
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 = \
#include "gstalsa.h"
#include "gstalsamixeroptions.h"
#include "gstalsamixertrack.h"
-#include <gst/mixer/mixer.h>
+#include <gst/interfaces/mixer.h>
G_BEGIN_DECLS
#define __GST_ALSA_MIXER_OPTIONS_H__
#include "gstalsa.h"
-#include <gst/mixer/mixeroptions.h>
+#include <gst/interfaces/mixeroptions.h>
G_BEGIN_DECLS
#define __GST_ALSA_MIXER_TRACK_H__
#include "gstalsa.h"
-#include <gst/mixer/mixertrack.h>
+#include <gst/interfaces/mixertrack.h>
G_BEGIN_DECLS
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
+++ /dev/null
-colorbalance-enumtypes.[ch]
-colorbalance-marshal.[ch]
+++ /dev/null
-# 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
+++ /dev/null
-VOID:OBJECT,INT
+++ /dev/null
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * 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);
-}
+++ /dev/null
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * 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 <gst/gst.h>
-#include <gst/colorbalance/colorbalancechannel.h>
-#include <gst/colorbalance/colorbalance-enumtypes.h>
-
-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__ */
+++ /dev/null
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="colorbalance"
- ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D67894}"
- RootNamespace="colorbalance"
- Keyword="Win32Proj">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="../../../win32/Debug"
- IntermediateDirectory="../../../win32/Debug"
- ConfigurationType="2"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="../../../../gstreamer/win32;../../../../gstreamer;../../../../gstreamer/libs;../../../../glib;../../../../glib/glib;../../../../glib/gmodule;"../../../gst-libs";../../../../popt/include;../../../../libxml2/include/libxml2"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;_USE_MATH_DEFINES"
- MinimalRebuild="TRUE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
- OutputFile="$(OutDir)/gstcolorbalance.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="../../../../gstreamer/win32/Debug;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib"
- ModuleDefinitionFile="colorbalance.def"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile="$(OutDir)/colorbalance.pdb"
- SubSystem="2"
- OptimizeReferences="2"
- ImportLibrary="$(OutDir)/gstcolorbalance.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="../../../win32/Release"
- IntermediateDirectory="../../../win32/Release"
- ConfigurationType="2"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../../../gstreamer/win32;../../../../gstreamer;../../../../gstreamer/libs;../../../../glib;../../../../glib/glib;../../../../glib/gmodule;"../../../gst-libs";../../../../popt/include;../../../../libxml2/include/libxml2"
- PreprocessorDefinitions="WIN32;NDEBUG;GST_DISABLE_GST_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;_USE_MATH_DEFINES"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="3"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="glib-2.0.lib gmodule-2.0.lib gthread-2.0.lib gobject-2.0.lib libgstreamer.lib gstbytestream.lib iconv.lib intl.lib"
- OutputFile="$(OutDir)/gstcolorbalance.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="../../../../gstreamer/win32/Release;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib"
- ModuleDefinitionFile="colorbalance.def"
- GenerateDebugInformation="TRUE"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- ImportLibrary="$(OutDir)/gstcolorbalance.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy /Y $(TargetPath) c:\gstreamer\plugins"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
- <File
- RelativePath=".\colorbalance.c">
- </File>
- <File
- RelativePath=".\colorbalancechannel.c">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
- <File
- RelativePath=".\colorbalance.h">
- </File>
- <File
- RelativePath=".\colorbalancechannel.h">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
+++ /dev/null
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * 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);
-}
+++ /dev/null
-/* GStreamer Color Balance
- * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
- *
- * 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 <gst/gst.h>
-
-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__ */
--- /dev/null
+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
#endif
#include "colorbalance.h"
-#include "colorbalance-marshal.h"
+#include "interfaces-marshal.h"
enum
{
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;
#define __GST_COLOR_BALANCE_H__
#include <gst/gst.h>
-#include <gst/colorbalance/colorbalancechannel.h>
-#include <gst/colorbalance/colorbalance-enumtypes.h>
+#include <gst/interfaces/colorbalancechannel.h>
+#include <gst/interfaces/interfaces-enumtypes.h>
G_BEGIN_DECLS
--- /dev/null
+VOID:OBJECT,BOOLEAN
+VOID:OBJECT,POINTER
+VOID:OBJECT,STRING
+VOID:OBJECT,ULONG
+VOID:OBJECT,INT
#endif
#include "mixer.h"
-#include "mixer-marshal.h"
+#include "interfaces-marshal.h"
enum
{
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;
#define __GST_MIXER_H__
#include <gst/gst.h>
-#include <gst/mixer/mixeroptions.h>
-#include <gst/mixer/mixertrack.h>
-#include <gst/mixer/mixer-enumtypes.h>
+#include <gst/interfaces/mixeroptions.h>
+#include <gst/interfaces/mixertrack.h>
+#include <gst/interfaces/interfaces-enumtypes.h>
G_BEGIN_DECLS
#define __GST_MIXER_OPTIONS_H__
#include <gst/gst.h>
-#include <gst/mixer/mixertrack.h>
+#include <gst/interfaces/mixertrack.h>
G_BEGIN_DECLS
#include "config.h"
#endif
-#include <gst/navigation/navigation.h>
+#include <gst/interfaces/navigation.h>
static void gst_navigation_class_init (GstNavigationInterface * iface);
#endif
#include "tuner.h"
-#include "tuner-marshal.h"
+#include "interfaces-marshal.h"
#include <string.h>
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;
#define __GST_TUNER_H__
#include <gst/gst.h>
-#include <gst/tuner/tunernorm.h>
-#include <gst/tuner/tunerchannel.h>
-#include <gst/tuner/tuner-enumtypes.h>
+#include <gst/interfaces/tunernorm.h>
+#include <gst/interfaces/tunerchannel.h>
+#include <gst/interfaces/interfaces-enumtypes.h>
G_BEGIN_DECLS
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)
#include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h>
#include <gst/control/control.h>
-#include <gst/mixer/mixer.h>
+#include <gst/interfaces/mixer.h>
#include "gstvolume.h"
/* some defines for audio processing */
prefix=
exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
+libdir=${pcfiledir}/../gst-libs/gst/interfaces
includedir=${pcfiledir}/../gst-libs
Name: GStreamer Interfaces library, uninstalled
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)
#endif
/* Our interfaces */
-#include <gst/navigation/navigation.h>
-#include <gst/xoverlay/xoverlay.h>
+#include <gst/interfaces/navigation.h>
+#include <gst/interfaces/xoverlay.h>
/* Object header */
#include "ximagesink.h"
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)
#endif
/* Our interfaces */
-#include <gst/navigation/navigation.h>
-#include <gst/xoverlay/xoverlay.h>
-#include <gst/colorbalance/colorbalance.h>
+#include <gst/interfaces/navigation.h>
+#include <gst/interfaces/xoverlay.h>
+#include <gst/interfaces/colorbalance.h>
/* Object header */
#include "xvimagesink.h"
projects / platform / upstream / gst-plugins-base.git / commitdiff