configure.ac: Remove idct and resample libs

Original commit message from CVS:
* configure.ac: Remove idct and resample libs
* gst-libs/gst/Makefile.am: same
Remove usage of gst_library_load():
* ext/alsa/gstalsaplugin.c: (plugin_init):
* ext/libvisual/visual.c: (plugin_init):
* ext/ogg/gstogg.c: (plugin_init):
* ext/theora/theora.c: (plugin_init):
* ext/vorbis/vorbis.c: (plugin_init):
* gst-libs/gst/audio/gstaudiofiltertemplate.c: (plugin_init):
* gst/audioscale/gstaudioscale.c:
* gst/adder/gstadder.c: (plugin_init):
* gst/audioconvert/plugin.c: (plugin_init):
* sys/ximage/ximagesink.c: (plugin_init):
* sys/xvimage/xvimagesink.c: (plugin_init):
* gst/tcp/gsttcpplugin.c: (plugin_init):
Link plugins against libraries:
* ext/ogg/Makefile.am:
* ext/theora/Makefile.am:
* ext/vorbis/Makefile.am:
* gst/audioconvert/Makefile.am:
Create proper libraries:
* gst-libs/gst/riff/Makefile.am:
* gst-libs/gst/audio/Makefile.am:
* gst-libs/gst/video/Makefile.am:
Move resample library to audioscale plugin directory:
* gst-libs/gst/resample/Makefile.am:
* gst-libs/gst/resample/README:
* gst-libs/gst/resample/dtof.c:
* gst-libs/gst/resample/dtos.c:
* gst-libs/gst/resample/functable.c:
* gst-libs/gst/resample/private.h:
* gst-libs/gst/resample/resample.c:
* gst-libs/gst/resample/resample.h:
* gst-libs/gst/resample/resample.vcproj:
* gst-libs/gst/resample/test.c:
* gst/audioscale/Makefile.am:
* gst/audioscale/README:
* gst/audioscale/dtof.c:
* gst/audioscale/dtos.c:
* gst/audioscale/functable.c:
* gst/audioscale/private.h:
* gst/audioscale/resample.c:
* gst/audioscale/resample.h:
* gst/audioscale/test.c:
Move tagedit library to gst-libs:
* gst-libs/gst/tag/Makefile.am:
* gst-libs/gst/tag/gstid3tag.c:
* gst-libs/gst/tag/gsttagediting.c:
* gst-libs/gst/tag/gsttageditingprivate.h:
* gst-libs/gst/tag/gstvorbistag.c:
* gst/tags/Makefile.am:
* gst/tags/gstid3tag.c:
* gst/tags/gstvorbistag.c:
Fix for core changes:
* gst/sine/gstsinesrc.c: (gst_sinesrc_class_init),
(gst_sinesrc_init), (gst_sinesrc_src_fixate), (gst_sinesrc_link),
(gst_sinesrc_getrange):
This commit is contained in:
David Schleef 2005-04-25 00:23:06 +00:00
parent f6e65158b0
commit 129c7e8af1
40 changed files with 244 additions and 274 deletions

View file

@ -1,3 +1,69 @@
2005-04-24 David Schleef <ds@schleef.org>
* configure.ac: Remove idct and resample libs
* gst-libs/gst/Makefile.am: same
Remove usage of gst_library_load():
* ext/alsa/gstalsaplugin.c: (plugin_init):
* ext/libvisual/visual.c: (plugin_init):
* ext/ogg/gstogg.c: (plugin_init):
* ext/theora/theora.c: (plugin_init):
* ext/vorbis/vorbis.c: (plugin_init):
* gst-libs/gst/audio/gstaudiofiltertemplate.c: (plugin_init):
* gst/audioscale/gstaudioscale.c:
* gst/adder/gstadder.c: (plugin_init):
* gst/audioconvert/plugin.c: (plugin_init):
* sys/ximage/ximagesink.c: (plugin_init):
* sys/xvimage/xvimagesink.c: (plugin_init):
* gst/tcp/gsttcpplugin.c: (plugin_init):
Link plugins against libraries:
* ext/ogg/Makefile.am:
* ext/theora/Makefile.am:
* ext/vorbis/Makefile.am:
* gst/audioconvert/Makefile.am:
Create proper libraries:
* gst-libs/gst/riff/Makefile.am:
* gst-libs/gst/audio/Makefile.am:
* gst-libs/gst/video/Makefile.am:
Move resample library to audioscale plugin directory:
* gst-libs/gst/resample/Makefile.am:
* gst-libs/gst/resample/README:
* gst-libs/gst/resample/dtof.c:
* gst-libs/gst/resample/dtos.c:
* gst-libs/gst/resample/functable.c:
* gst-libs/gst/resample/private.h:
* gst-libs/gst/resample/resample.c:
* gst-libs/gst/resample/resample.h:
* gst-libs/gst/resample/resample.vcproj:
* gst-libs/gst/resample/test.c:
* gst/audioscale/Makefile.am:
* gst/audioscale/README:
* gst/audioscale/dtof.c:
* gst/audioscale/dtos.c:
* gst/audioscale/functable.c:
* gst/audioscale/private.h:
* gst/audioscale/resample.c:
* gst/audioscale/resample.h:
* gst/audioscale/test.c:
Move tagedit library to gst-libs:
* gst-libs/gst/tag/Makefile.am:
* gst-libs/gst/tag/gstid3tag.c:
* gst-libs/gst/tag/gsttagediting.c:
* gst-libs/gst/tag/gsttageditingprivate.h:
* gst-libs/gst/tag/gstvorbistag.c:
* gst/tags/Makefile.am:
* gst/tags/gstid3tag.c:
* gst/tags/gstvorbistag.c:
Fix for core changes:
* gst/sine/gstsinesrc.c: (gst_sinesrc_class_init),
(gst_sinesrc_init), (gst_sinesrc_src_fixate), (gst_sinesrc_link),
(gst_sinesrc_getrange):
2005-04-23 David Schleef <ds@schleef.org>
* gst-libs/gst/Makefile.am: Remove idct. It hasn't been used

View file

@ -902,13 +902,11 @@ gst-libs/gst/audio/Makefile
gst-libs/gst/colorbalance/Makefile
gst-libs/gst/floatcast/Makefile
gst-libs/gst/gconf/Makefile
gst-libs/gst/idct/Makefile
gst-libs/gst/media-info/Makefile
gst-libs/gst/mixer/Makefile
gst-libs/gst/navigation/Makefile
gst-libs/gst/play/Makefile
gst-libs/gst/propertyprobe/Makefile
gst-libs/gst/resample/Makefile
gst-libs/gst/riff/Makefile
gst-libs/gst/tag/Makefile
gst-libs/gst/tuner/Makefile

View file

@ -56,9 +56,6 @@ plugin_init (GstPlugin * plugin)
{
int err;
if (!gst_library_load ("gstaudio"))
return FALSE;
if (!gst_element_register (plugin, "alsamixer", GST_RANK_NONE,
GST_TYPE_ALSA_MIXER))
return FALSE;

View file

@ -405,9 +405,6 @@ plugin_init (GstPlugin * plugin)
guint i;
VisList *list;
if (!gst_library_load ("gstbytestream"))
return FALSE;
if (!visual_is_initialized ())
if (visual_init (NULL, NULL) != 0)
return FALSE;

View file

@ -9,5 +9,7 @@ libgstogg_la_SOURCES = \
gstogmparse.c
libgstogg_la_CFLAGS = $(GST_CFLAGS) $(OGG_CFLAGS)
libgstogg_la_LIBADD = $(OGG_LIBS) $(top_builddir)/gst-libs/gst/riff/libgstriff.la
libgstogg_la_LIBADD = $(OGG_LIBS) \
$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_MAJORMINOR@.la
libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -32,9 +32,6 @@ GST_DEBUG_CATEGORY (vorbisdec_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("riff"))
return FALSE;
gst_ogg_demux_plugin_init (plugin);
gst_ogg_mux_plugin_init (plugin);
gst_ogm_parse_plugin_init (plugin);

View file

@ -2,6 +2,7 @@ plugin_LTLIBRARIES = libgsttheora.la
libgsttheora_la_SOURCES = theora.c theoraenc.c theoradec.c
libgsttheora_la_CFLAGS = $(GST_CFLAGS) $(THEORA_CFLAGS)
libgsttheora_la_LIBADD = $(THEORA_LIBS) $(top_builddir)/gst/tags/libgsttagedit.la
libgsttheora_la_LIBADD = $(THEORA_LIBS) \
$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la
libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -29,9 +29,6 @@ extern GType gst_theora_enc_get_type (void);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gsttags"))
return FALSE;
if (!gst_element_register (plugin, "theoradec", GST_RANK_PRIMARY,
gst_theora_dec_get_type ()))
return FALSE;

View file

@ -5,7 +5,8 @@ libgstvorbis_la_SOURCES = vorbis.c \
libgstvorbis_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS)
## AM_PATH_VORBIS also sets VORBISENC_LIBS
libgstvorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS) $(VORBISFILE_LIBS) \
$(top_builddir)/gst/tags/libgsttagedit.la
$(top_builddir)/gst-libs/gst/tag/libgsttagedit-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = vorbisenc.h vorbisdec.h vorbisparse.h

View file

@ -32,9 +32,6 @@ GST_DEBUG_CATEGORY (vorbisparse_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstaudio") || !gst_library_load ("gsttags"))
return FALSE;
if (!gst_element_register (plugin, "vorbisenc", GST_RANK_NONE,
GST_TYPE_VORBISENC))
return FALSE;

View file

@ -19,7 +19,6 @@ SUBDIRS = \
mixer \
navigation \
propertyprobe \
resample \
riff \
tag \
tuner \
@ -39,7 +38,6 @@ DIST_SUBDIRS = \
navigation \
play \
propertyprobe \
resample \
riff \
tag \
tuner \

View file

@ -7,24 +7,23 @@ built_sources = multichannel-enumtypes.c
built_headers = multichannel-enumtypes.h
BUILT_SOURCES = $(built_sources) $(built_headers)
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstaudio.la libgstaudiofilter.la
lib_LTLIBRARIES = libgstaudio-@GST_MAJORMINOR@.la libgstaudiofilter-@GST_MAJORMINOR@.la
noinst_LTLIBRARIES = libgstaudiofilterexample.la
EXTRA_DIST = gstaudiofiltertemplate.c make_filter
CLEANFILES = gstaudiofilterexample.c \
$(BUILT_SOURCES)
libgstaudio_la_SOURCES = audio.c audioclock.c \
libgstaudio_@GST_MAJORMINOR@_la_SOURCES = audio.c audioclock.c \
multichannel.c \
gstaudiosink.c \
gstbaseaudiosink.c \
gstringbuffer.c
gstringbuffer.c \
multichannel-enumtypes.c
nodist_libgstaudio_la_SOURCES = $(built_sources)
libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
libgstaudioinclude_HEADERS = \
libgstaudio_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
audio.h \
audioclock.h \
gstaudiofilter.h \
@ -34,13 +33,13 @@ libgstaudioinclude_HEADERS = \
multichannel.h \
multichannel-enumtypes.h
libgstaudio_la_LIBADD =
libgstaudio_la_CFLAGS = $(GST_CFLAGS)
libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
libgstaudio_@GST_MAJORMINOR@_la_LIBADD =
libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
libgstaudiofilter_la_SOURCES = gstaudiofilter.c gstaudiofilter.h
libgstaudiofilter_la_CFLAGS = $(GST_CFLAGS)
libgstaudiofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaudiofilter_@GST_MAJORMINOR@_la_SOURCES = gstaudiofilter.c gstaudiofilter.h
libgstaudiofilter_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstaudiofilter_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaudiofilterexample_la_SOURCES = gstaudiofilterexample.c
libgstaudiofilterexample_la_CFLAGS = $(GST_CFLAGS)

View file

@ -210,9 +210,6 @@ gst_audiofilter_template_get_property (GObject * object, guint prop_id,
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstaudiofilter"))
return FALSE;
return gst_element_register (plugin, "audiofiltertemplate", GST_RANK_NONE,
GST_TYPE_AUDIOFILTER_TEMPLATE);
}

View file

@ -1,14 +0,0 @@
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstresample.la
libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h
libgstresample_la_LIBADD =
libgstresample_la_CFLAGS = $(GST_CFLAGS)
libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample
libgstresampleinclude_HEADERS = resample.h
noinst_HEADERS = private.h

View file

@ -1,156 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="resample"
ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D6789B}"
RootNamespace="resample"
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;&quot;../../../gst-libs&quot;;../../../../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)/gstresample.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="../../../../gstreamer/win32/Debug;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib"
ModuleDefinitionFile="resample.def"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/resample.pdb"
SubSystem="2"
OptimizeReferences="2"
ImportLibrary="$(OutDir)/gstresample.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;&quot;../../../gst-libs&quot;;../../../../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)/gstresample.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="../../../../gstreamer/win32/Release;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib"
ModuleDefinitionFile="resample.def"
GenerateDebugInformation="TRUE"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/gstresample.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=".\resample.c">
</File>
<File
RelativePath=".\dtos.c">
</File>
<File
RelativePath=".\dtof.c">
</File>
<File
RelativePath=".\functable.c">
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath=".\resample.h">
</File>
<File
RelativePath=".\private.h">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View file

@ -1,16 +1,16 @@
plugin_LTLIBRARIES = libgstriff.la
lib_LTLIBRARIES = libgstriff-@GST_MAJORMINOR@.la
libgstriff_la_SOURCES = \
libgstriff_@GST_MAJORMINOR@_la_SOURCES = \
riff.c \
riff-media.c \
riff-read.c
libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff
libgstriffinclude_HEADERS = \
libgstriff_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff
libgstriff_@GST_MAJORMINOR@include_HEADERS = \
riff-ids.h \
riff-media.h \
riff-read.h
libgstriff_la_LIBADD =
libgstriff_la_CFLAGS = $(GST_CFLAGS)
libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstriff_@GST_MAJORMINOR@_la_LIBADD =
libgstriff_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstriff_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -3,3 +3,13 @@ libgsttagincludedir = \
libgsttaginclude_HEADERS = \
tag.h
lib_LTLIBRARIES = libgsttagedit-@GST_MAJORMINOR@.la
libgsttagedit_@GST_MAJORMINOR@_la_SOURCES = gstvorbistag.c gsttagediting.c gstid3tag.c
libgsttagedit_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
libgsttagedit_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS)
libgsttagedit_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsttageditingprivate.h

View file

@ -0,0 +1,44 @@
/* GStreamer
* Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
*
* gsttagediting.c: tag editing plugin
*
* 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 "gsttageditingprivate.h"
#include <gst/gst.h>
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "vorbistag",
GST_RANK_PRIMARY, gst_vorbis_tag_get_type ())) {
return FALSE;
}
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"gsttags",
"elements for manipulating data from ogg streams",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)

View file

@ -0,0 +1,41 @@
/* GStreamer
* Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
*
* 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_TAG_EDIT_PRIVATE_H__
#define __GST_TAG_EDIT_PRIVATE_H__
#include <gst/tag/tag.h>
G_BEGIN_DECLS
typedef struct _GstTagEntryMatch GstTagEntryMatch;
struct _GstTagEntryMatch {
gchar * gstreamer_tag;
gchar * original_tag;
};
GType gst_vorbis_tag_get_type (void);
G_END_DECLS
#endif /* __GST_TAG_EDIT_PRIVATE_H__ */

View file

@ -1,12 +1,11 @@
librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
library_LTLIBRARIES = libgstvideo.la
lib_LTLIBRARIES = libgstvideo-@GST_MAJORMINOR@.la
libgstvideo_la_SOURCES = video.c gstvideosink.c
libgstvideo_@GST_MAJORMINOR@_la_SOURCES = video.c gstvideosink.c
libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
libgstvideoinclude_HEADERS = video.h videosink.h
libgstvideo_la_LIBADD =
libgstvideo_la_CFLAGS = $(GST_CFLAGS)
libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
libgstvideo_@GST_MAJORMINOR@_la_LIBADD =
libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS)
libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)

View file

@ -517,9 +517,6 @@ gst_adder_change_state (GstElement * element)
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstbytestream"))
return FALSE;
if (!gst_element_register (plugin, "adder", GST_RANK_NONE, GST_TYPE_ADDER)) {
return FALSE;
}

View file

@ -8,15 +8,17 @@ libgstaudioconvert_la_SOURCES = \
libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS)
libgstaudioconvert_la_LIBADD =
libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(top_builddir)/gst-libs/gst/audio/libgstaudio.la
libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
noinst_HEADERS = \
gstchannelmix.h \
plugin.h
TESTS = channelmixtest
noinst_PROGRAMS = channelmixtest
#TESTS = channelmixtest
#noinst_PROGRAMS = channelmixtest
channelmixtest_CFLAGS = $(GST_CFLAGS)
channelmixtest_LDADD = libgstaudioconvert.la $(top_builddir)/gst-libs/gst/audio/libgstaudio.la
channelmixtest_LDADD = libgstaudioconvert.la \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
channelmixtest_LDFLAGS = $(GST_LIBS)

View file

@ -28,9 +28,6 @@
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstaudio"))
return FALSE;
if (!gst_element_register (plugin, "audioconvert",
GST_RANK_PRIMARY, gst_audio_convert_get_type ()) ||
!gst_element_register (plugin, "buffer-frames-convert",

View file

@ -1,9 +1,17 @@
plugin_LTLIBRARIES = libgstaudioscale.la
#plugin_LTLIBRARIES = libgstaudioscale.la
noinst_LTLIBRARIES = libgstresample.la
libgstaudioscale_la_SOURCES = gstaudioscale.c
libgstaudioscale_la_CFLAGS = $(GST_CFLAGS)
libgstaudioscale_la_LIBADD =
libgstaudioscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstaudioscale.h
noinst_HEADERS = gstaudioscale.h private.h
libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h
libgstresample_la_LIBADD =
libgstresample_la_CFLAGS = $(GST_CFLAGS)
libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -726,10 +726,6 @@ gst_audioscale_get_property (GObject * object, guint prop_id,
static gboolean
plugin_init (GstPlugin * plugin)
{
/* load support library */
if (!gst_library_load ("gstresample"))
return FALSE;
if (!gst_element_register (plugin, "audioscale", GST_RANK_SECONDARY,
GST_TYPE_AUDIOSCALE)) {
return FALSE;

View file

@ -268,8 +268,7 @@ gst_resample_nearest_s16 (gst_resample_t * r)
SCALE_LOOP (o_ptr[0] = i_ptr[0], 1);
break;
case 2:
SCALE_LOOP (o_ptr[0] = i_ptr[0];
o_ptr[1] = i_ptr[1], 2);
SCALE_LOOP (o_ptr[0] = i_ptr[0]; o_ptr[1] = i_ptr[1], 2);
break;
default:
{
@ -630,8 +629,7 @@ gst_resample_nearest_float (gst_resample_t * r)
SCALE_LOOP (o_ptr[0] = i_ptr[0], 1);
break;
case 2:
SCALE_LOOP (o_ptr[0] = i_ptr[0];
o_ptr[1] = i_ptr[1], 2);
SCALE_LOOP (o_ptr[0] = i_ptr[0]; o_ptr[1] = i_ptr[1], 2);
break;
default:
{

View file

@ -76,7 +76,7 @@ static void gst_sinesrc_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec);
static void gst_sinesrc_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec);
static GstPadLinkReturn gst_sinesrc_link (GstPad * pad, const GstCaps * caps);
static GstPadLinkReturn gst_sinesrc_link (GstPad * pad, GstPad * peerpad);
static GstElementStateReturn gst_sinesrc_change_state (GstElement * element);
static void gst_sinesrc_set_clock (GstElement * element, GstClock * clock);
@ -88,8 +88,9 @@ static const GstQueryType *gst_sinesrc_get_query_types (GstPad * pad);
static gboolean gst_sinesrc_src_query (GstPad * pad,
GstQueryType type, GstFormat * format, gint64 * value);
static GstData *gst_sinesrc_get (GstPad * pad);
static GstCaps *gst_sinesrc_src_fixate (GstPad * pad, const GstCaps * caps);
static GstFlowReturn gst_sinesrc_getrange (GstPad * pad, guint64 offset,
guint length, GstBuffer ** buffer);
static GstCaps *gst_sinesrc_src_fixate (GstPad * pad, GstCaps * caps);
static GstElementClass *parent_class = NULL;
@ -136,7 +137,11 @@ gst_sinesrc_class_init (GstSineSrcClass * klass)
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TABLESIZE,
gobject_class->set_property = gst_sinesrc_set_property;
gobject_class->get_property = gst_sinesrc_get_property;
gobject_class->dispose = gst_sinesrc_dispose;
g_object_class_install_property (gobject_class, ARG_TABLESIZE,
g_param_spec_int ("tablesize", "tablesize", "tablesize",
1, G_MAXINT, 1024, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass),
@ -144,20 +149,16 @@ gst_sinesrc_class_init (GstSineSrcClass * klass)
g_param_spec_int ("samplesperbuffer", "Samples per buffer",
"Number of samples in each outgoing buffer",
1, G_MAXINT, 1024, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FREQ,
g_object_class_install_property (gobject_class, ARG_FREQ,
g_param_spec_double ("freq", "Frequency", "Frequency of sine source",
0.0, 20000.0, 440.0, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_VOLUME,
g_object_class_install_property (gobject_class, ARG_VOLUME,
g_param_spec_double ("volume", "Volume", "Volume",
0.0, 1.0, 0.8, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC,
g_object_class_install_property (gobject_class, ARG_SYNC,
g_param_spec_boolean ("sync", "Sync", "Synchronize to clock",
FALSE, G_PARAM_READWRITE));
gobject_class->set_property = gst_sinesrc_set_property;
gobject_class->get_property = gst_sinesrc_get_property;
gobject_class->dispose = gst_sinesrc_dispose;
gstelement_class->change_state = gst_sinesrc_change_state;
gstelement_class->set_clock = gst_sinesrc_set_clock;
}
@ -169,8 +170,8 @@ gst_sinesrc_init (GstSineSrc * src)
gst_pad_new_from_template (gst_static_pad_template_get
(&gst_sinesrc_src_template), "src");
gst_pad_set_link_function (src->srcpad, gst_sinesrc_link);
gst_pad_set_fixate_function (src->srcpad, gst_sinesrc_src_fixate);
gst_pad_set_get_function (src->srcpad, gst_sinesrc_get);
gst_pad_set_fixatecaps_function (src->srcpad, gst_sinesrc_src_fixate);
gst_pad_set_getrange_function (src->srcpad, gst_sinesrc_getrange);
gst_pad_set_query_function (src->srcpad, gst_sinesrc_src_query);
gst_pad_set_query_type_function (src->srcpad, gst_sinesrc_get_query_types);
gst_element_add_pad (GST_ELEMENT (src), src->srcpad);
@ -227,7 +228,7 @@ gst_sinesrc_set_clock (GstElement * element, GstClock * clock)
}
static GstCaps *
gst_sinesrc_src_fixate (GstPad * pad, const GstCaps * caps)
gst_sinesrc_src_fixate (GstPad * pad, GstCaps * caps)
{
GstStructure *structure;
GstCaps *newcaps;
@ -242,13 +243,14 @@ gst_sinesrc_src_fixate (GstPad * pad, const GstCaps * caps)
return newcaps;
}
gst_caps_free (newcaps);
gst_caps_unref (newcaps);
return NULL;
}
static GstPadLinkReturn
gst_sinesrc_link (GstPad * pad, const GstCaps * caps)
gst_sinesrc_link (GstPad * pad, GstPad * peerpad)
{
GstCaps *caps;
GstSineSrc *sinesrc;
const GstStructure *structure;
gboolean ret;
@ -256,6 +258,7 @@ gst_sinesrc_link (GstPad * pad, const GstCaps * caps)
GST_DEBUG ("gst_sinesrc_src_link");
sinesrc = GST_SINESRC (gst_pad_get_parent (pad));
caps = gst_pad_get_caps (pad);
structure = gst_caps_get_structure (caps, 0);
ret = gst_structure_get_int (structure, "rate", &sinesrc->samplerate);
@ -312,8 +315,9 @@ gst_sinesrc_src_query (GstPad * pad,
return res;
}
static GstData *
gst_sinesrc_get (GstPad * pad)
static GstFlowReturn
gst_sinesrc_getrange (GstPad * pad, guint64 offset,
guint length, GstBuffer ** buffer)
{
GstSineSrc *src;
GstBuffer *buf;
@ -322,7 +326,7 @@ gst_sinesrc_get (GstPad * pad)
gint16 *samples;
gint i = 0;
g_return_val_if_fail (pad != NULL, NULL);
g_return_val_if_fail (pad != NULL, GST_FLOW_ERROR);
src = GST_SINESRC (gst_pad_get_parent (pad));
if (!src->tags_pushed) {
@ -334,10 +338,13 @@ gst_sinesrc_get (GstPad * pad)
gst_tag_list_add (taglist, GST_TAG_MERGE_APPEND,
GST_TAG_DESCRIPTION, "sine wave", NULL);
#if 0
gst_element_found_tags (GST_ELEMENT (src), taglist);
#endif
event = gst_event_new_tag (taglist);
src->tags_pushed = TRUE;
return GST_DATA (event);
*buffer = GST_BUFFER (event);
return GST_FLOW_OK;
}
tdiff = src->samples_per_buffer * GST_SECOND / src->samplerate;
@ -348,7 +355,9 @@ gst_sinesrc_get (GstPad * pad)
GST_BUFFER_TIMESTAMP (buf) = src->timestamp;
if (src->sync) {
if (src->clock) {
#if 0
gst_element_wait (GST_ELEMENT (src), GST_BUFFER_TIMESTAMP (buf));
#endif
}
}
/* offset is the number of samples */
@ -400,6 +409,7 @@ gst_sinesrc_get (GstPad * pad)
i++;
}
#if 0
if (!GST_PAD_CAPS (src->srcpad)) {
if (gst_sinesrc_link (src->srcpad,
gst_pad_get_allowed_caps (src->srcpad)) <= 0) {
@ -407,8 +417,10 @@ gst_sinesrc_get (GstPad * pad)
return NULL;
}
}
#endif
return GST_DATA (buf);
*buffer = buf;
return GST_FLOW_OK;
}
static void

View file

@ -1,7 +1,7 @@
plugin_LTLIBRARIES = libgsttagedit.la
libgsttagedit_la_SOURCES = gstvorbistag.c gsttagediting.c gstid3tag.c
libgsttagedit_la_SOURCES = gsttagediting.c
libgsttagedit_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
libgsttagedit_la_LIBADD = $(GST_LIBS)
libgsttagedit_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

View file

@ -34,9 +34,6 @@ GST_DEBUG_CATEGORY (tcp_debug);
static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_library_load ("gstdataprotocol"))
return FALSE;
if (!gst_element_register (plugin, "tcpsink", GST_RANK_NONE,
GST_TYPE_TCPSINK))
return FALSE;

View file

@ -1767,10 +1767,6 @@ gst_ximagesink_get_type (void)
static gboolean
plugin_init (GstPlugin * plugin)
{
/* Loading the library containing GstVideoSink, our parent object */
if (!gst_library_load ("gstvideo"))
return FALSE;
if (!gst_element_register (plugin, "ximagesink",
GST_RANK_SECONDARY, GST_TYPE_XIMAGESINK))
return FALSE;

View file

@ -2166,10 +2166,6 @@ gst_xvimagesink_get_type (void)
static gboolean
plugin_init (GstPlugin * plugin)
{
/* Loading the library containing GstVideoSink, our parent object */
if (!gst_library_load ("gstvideo"))
return FALSE;
if (!gst_element_register (plugin, "xvimagesink",
GST_RANK_PRIMARY, GST_TYPE_XVIMAGESINK))
return FALSE;