diff options
author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-11-27 15:34:00 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-11-27 15:34:00 +0000 |
commit | 03f5cf36aeaffe2a1531c808a40093737ed1051a (patch) | |
tree | f1bc7e85d99a8ab82387b7be5deb1bb8dcc7c050 /gst-libs | |
parent | 0d8f0ab923a0e3c32823782bf4f6768f02b2712b (diff) |
no need for an AS_LIBTOOL call
Original commit message from CVS:
no need for an AS_LIBTOOL call
Diffstat (limited to 'gst-libs')
-rw-r--r-- | gst-libs/Makefile.am | 6 | ||||
-rw-r--r-- | gst-libs/README | 1 | ||||
-rw-r--r-- | gst-libs/ext/.gitignore | 1 | ||||
-rw-r--r-- | gst-libs/gst/media-info/.gitignore | 1 | ||||
-rw-r--r-- | gst-libs/gst/play/.gitignore | 3 | ||||
-rw-r--r-- | gst-libs/gst/play/play.h | 104 | ||||
-rw-r--r-- | gst-libs/gst/play/play.vcproj | 144 |
7 files changed, 1 insertions, 259 deletions
diff --git a/gst-libs/Makefile.am b/gst-libs/Makefile.am index 6ac3e24a4b..58ceccf6cc 100644 --- a/gst-libs/Makefile.am +++ b/gst-libs/Makefile.am @@ -1,5 +1 @@ -SUBDIRS = \ - gst - -DIST_SUBDIRS = \ - gst +SUBDIRS = gst diff --git a/gst-libs/README b/gst-libs/README deleted file mode 100644 index 1a7c92f325..0000000000 --- a/gst-libs/README +++ /dev/null @@ -1 +0,0 @@ -Everything that used to be here is now in gst-plugins-base module diff --git a/gst-libs/ext/.gitignore b/gst-libs/ext/.gitignore deleted file mode 100644 index 20645e6412..0000000000 --- a/gst-libs/ext/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ffmpeg diff --git a/gst-libs/gst/media-info/.gitignore b/gst-libs/gst/media-info/.gitignore deleted file mode 100644 index 1ac8f85ab5..0000000000 --- a/gst-libs/gst/media-info/.gitignore +++ /dev/null @@ -1 +0,0 @@ -media-info-test diff --git a/gst-libs/gst/play/.gitignore b/gst-libs/gst/play/.gitignore deleted file mode 100644 index b7f5a7eb66..0000000000 --- a/gst-libs/gst/play/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -play-enumtypes.[ch] -play-marshal.[ch] -play-marshal.list diff --git a/gst-libs/gst/play/play.h b/gst-libs/gst/play/play.h deleted file mode 100644 index a5ca4142a1..0000000000 --- a/gst-libs/gst/play/play.h +++ /dev/null @@ -1,104 +0,0 @@ -/* GStreamer - * Copyright (C) 2003 Julien Moutte <julien@moutte.net> - * - * 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_PLAY_H__ -#define __GST_PLAY_H__ - -#include <gst/gst.h> -#include <gst/xoverlay/xoverlay.h> -#include <gst/play/play-enumtypes.h> - -G_BEGIN_DECLS - -/* GError stuff */ - -#define GST_PLAY_ERROR gst_play_error_quark () -/* GObject stuff */ - -#define GST_TYPE_PLAY (gst_play_get_type()) -#define GST_PLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_PLAY, GstPlay)) -#define GST_PLAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLAY, GstPlayClass)) -#define GST_IS_PLAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_PLAY)) -#define GST_IS_PLAY_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_PLAY)) -#define GST_PLAY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLAY, GstPlayClass)) - -typedef enum -{ - GST_PLAY_SINK_TYPE_AUDIO, - GST_PLAY_SINK_TYPE_VIDEO, - GST_PLAY_SINK_TYPE_ANY, -} GstPlaySinkType; - -typedef struct _GstPlay GstPlay; -typedef struct _GstPlayClass GstPlayClass; -typedef struct _GstPlayPrivate GstPlayPrivate; - -struct _GstPlay -{ - GstPipeline pipeline; - - GstPlayPrivate *priv; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstPlayClass -{ - GstPipelineClass parent_class; - - void (*time_tick) (GstPlay *play, gint64 time_nanos); - void (*stream_length) (GstPlay *play, gint64 length_nanos); - void (*have_video_size) (GstPlay *play, gint width, gint height); - - gpointer _gst_reserved[GST_PADDING]; -}; - -GType gst_play_get_type (void); -GstPlay * gst_play_new (GError **error); - -gboolean gst_play_set_data_src (GstPlay *play, - GstElement *data_src); -gboolean gst_play_set_video_sink (GstPlay *play, - GstElement *video_sink); -gboolean gst_play_set_audio_sink (GstPlay *play, - GstElement *audio_sink); - -gboolean gst_play_set_visualization (GstPlay *play, - GstElement *element); -gboolean gst_play_connect_visualization (GstPlay *play, - gboolean connect); - -gboolean gst_play_set_location (GstPlay *play, - const char *location); -char * gst_play_get_location (GstPlay *play); - -gboolean gst_play_seek_to_time (GstPlay *play, - gint64 time_nanos); - -GstElement * gst_play_get_sink_element (GstPlay *play, - GstElement *element, - GstPlaySinkType sink_type); -GList * gst_play_get_all_by_interface (GstPlay *play, - GType interface); - -gdouble gst_play_get_framerate (GstPlay *play); - -G_END_DECLS - -#endif /* __GST_PLAY_H__ */ diff --git a/gst-libs/gst/play/play.vcproj b/gst-libs/gst/play/play.vcproj deleted file mode 100644 index d55cb3a579..0000000000 --- a/gst-libs/gst/play/play.vcproj +++ /dev/null @@ -1,144 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="7.10" - Name="play" - ProjectGUID="{979C216F-0ACF-4956-AE00-055A42D67899}" - RootNamespace="play" - 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)/gstplay.dll" - LinkIncremental="2" - AdditionalLibraryDirectories="../../../../gstreamer/win32/Debug;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib" - ModuleDefinitionFile="play.def" - GenerateDebugInformation="TRUE" - ProgramDatabaseFile="$(OutDir)/play.pdb" - SubSystem="2" - OptimizeReferences="2" - ImportLibrary="$(OutDir)/gstplay.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)/gstplay.dll" - LinkIncremental="1" - AdditionalLibraryDirectories="../../../../gstreamer/win32/Release;../../../../glib/glib;../../../../glib/gmodule;../../../../glib/gthread;../../../../glib/gobject;../../../../gettext/lib;../../../../libiconv/lib" - ModuleDefinitionFile="play.def" - GenerateDebugInformation="TRUE" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - ImportLibrary="$(OutDir)/gstplay.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=".\play.c"> - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> - <File - RelativePath=".\play.h"> - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |