diff --git a/configure.ac b/configure.ac index 90d6bcbfae..d198f2732a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,13 +23,6 @@ dnl we override it here if we need to for the release candidate of new series GST_MAJORMINOR=0.9 AC_SUBST(GST_MAJORMINOR) -dnl CURRENT, REVISION, AGE -dnl - library source changed -> increment REVISION -dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 -dnl - interfaces added -> increment AGE -dnl - interfaces removed -> AGE = 0 -dnl for 0.8.3 release, gst_play_get_all_by_interface was added, so update -AS_LIBTOOL(GST_PLUGINS_UGLY, 0, 0, 0) AS_LIBTOOL_TAGS([CXX]) AM_PROG_LIBTOOL 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 - * - * 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 -#include -#include - -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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -