From 7172a58563c50e31939fb47914ce38bd3bcd86b1 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 25 Apr 2005 09:33:35 +0000 Subject: [PATCH] Remove libgstplay, playbin is now the official successor. Original commit message from CVS: * configure.ac: * examples/Makefile.am: * examples/gstplay/.cvsignore: * examples/gstplay/Makefile.am: * examples/gstplay/player.c: * gst-libs/gst/Makefile.am: * gst-libs/gst/play/.cvsignore: * gst-libs/gst/play/Makefile.am: * gst-libs/gst/play/play.c: * gst-libs/gst/play/play.h: * gst-libs/gst/play/play.vcproj: * pkgconfig/Makefile.am: * pkgconfig/gstreamer-play-uninstalled.pc.in: * pkgconfig/gstreamer-play.pc.in: Remove libgstplay, playbin is now the official successor. --- ChangeLog | 18 + configure.ac | 4 - examples/Makefile.am | 10 +- examples/gstplay/.gitignore | 1 - examples/gstplay/Makefile.am | 11 - examples/gstplay/player.c | 176 ------- gst-libs/gst/Makefile.am | 4 +- gst-libs/gst/play/.gitignore | 3 - gst-libs/gst/play/Makefile.am | 37 -- gst-libs/gst/play/play.c | 770 ----------------------------- gst-libs/gst/play/play.h | 104 ---- gst-libs/gst/play/play.vcproj | 144 ------ pkgconfig/Makefile.am | 3 - pkgconfig/gstreamer-play-uninstalled.pc.in | 14 - pkgconfig/gstreamer-play.pc.in | 12 - tests/old/examples/Makefile.am | 10 +- tests/old/examples/gstplay/.gitignore | 1 - tests/old/examples/gstplay/Makefile.am | 11 - tests/old/examples/gstplay/player.c | 176 ------- 19 files changed, 23 insertions(+), 1486 deletions(-) delete mode 100644 examples/gstplay/.gitignore delete mode 100644 examples/gstplay/Makefile.am delete mode 100644 examples/gstplay/player.c delete mode 100644 gst-libs/gst/play/.gitignore delete mode 100644 gst-libs/gst/play/Makefile.am delete mode 100644 gst-libs/gst/play/play.c delete mode 100644 gst-libs/gst/play/play.h delete mode 100644 gst-libs/gst/play/play.vcproj delete mode 100644 pkgconfig/gstreamer-play-uninstalled.pc.in delete mode 100644 pkgconfig/gstreamer-play.pc.in delete mode 100644 tests/old/examples/gstplay/.gitignore delete mode 100644 tests/old/examples/gstplay/Makefile.am delete mode 100644 tests/old/examples/gstplay/player.c diff --git a/ChangeLog b/ChangeLog index 51cce56..0832146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,24 @@ 2005-04-25 Ronald S. Bultje * configure.ac: + * examples/Makefile.am: + * examples/gstplay/.cvsignore: + * examples/gstplay/Makefile.am: + * examples/gstplay/player.c: + * gst-libs/gst/Makefile.am: + * gst-libs/gst/play/.cvsignore: + * gst-libs/gst/play/Makefile.am: + * gst-libs/gst/play/play.c: + * gst-libs/gst/play/play.h: + * gst-libs/gst/play/play.vcproj: + * pkgconfig/Makefile.am: + * pkgconfig/gstreamer-play-uninstalled.pc.in: + * pkgconfig/gstreamer-play.pc.in: + Remove libgstplay, playbin is now the official successor. + +2005-04-25 Ronald S. Bultje + + * configure.ac: * gst-libs/gst/Makefile.am: * gst-libs/gst/xwindowlistener/Makefile.am: * gst-libs/gst/xwindowlistener/xwindowlistener.c: diff --git a/configure.ac b/configure.ac index 5f55a24..0198411 100644 --- a/configure.ac +++ b/configure.ac @@ -905,7 +905,6 @@ gst-libs/gst/gconf/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/riff/Makefile gst-libs/gst/tag/Makefile @@ -917,7 +916,6 @@ examples/dynparams/Makefile examples/capsfilter/Makefile examples/seeking/Makefile examples/indexing/Makefile -examples/gstplay/Makefile examples/switch/Makefile examples/Makefile testsuite/embed/Makefile @@ -935,8 +933,6 @@ pkgconfig/gstreamer-libs.pc pkgconfig/gstreamer-libs-uninstalled.pc pkgconfig/gstreamer-media-info.pc pkgconfig/gstreamer-media-info-uninstalled.pc -pkgconfig/gstreamer-play.pc -pkgconfig/gstreamer-play-uninstalled.pc pkgconfig/gstreamer-plugins.pc pkgconfig/gstreamer-plugins-uninstalled.pc po/Makefile.in diff --git a/examples/Makefile.am b/examples/Makefile.am index 0c8190c..46957b3 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -10,11 +10,5 @@ else GTK_SUBDIRS= endif -if USE_GCONF -GCONF_SUBDIRS=gstplay -else -GCONF_SUBDIRS= -endif - -SUBDIRS=$(GTK_SUBDIRS) $(GCONF_SUBDIRS) switch -DIST_SUBDIRS=capsfilter dynparams seeking indexing gstplay switch +SUBDIRS=$(GTK_SUBDIRS) switch +DIST_SUBDIRS=capsfilter dynparams seeking indexing switch diff --git a/examples/gstplay/.gitignore b/examples/gstplay/.gitignore deleted file mode 100644 index a1eb1c4..0000000 --- a/examples/gstplay/.gitignore +++ /dev/null @@ -1 +0,0 @@ -player diff --git a/examples/gstplay/Makefile.am b/examples/gstplay/Makefile.am deleted file mode 100644 index cbae9cb..0000000 --- a/examples/gstplay/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ - -noinst_PROGRAMS = player - -player_SOURCES = player.c -player_CFLAGS = $(GST_CFLAGS) $(GCONF_CFLAGS) -player_LDFLAGS = \ - $(GST_LIBS) \ - $(top_builddir)/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la - diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c deleted file mode 100644 index e0bdd41..0000000 --- a/examples/gstplay/player.c +++ /dev/null @@ -1,176 +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. - */ - -#include -#include - -static GMainLoop *loop = NULL; -static gint64 length = 0; - -static void -print_tag (const GstTagList * list, const gchar * tag, gpointer unused) -{ - gint i, count; - - count = gst_tag_list_get_tag_size (list, tag); - - for (i = 0; i < count; i++) { - gchar *str; - - if (gst_tag_get_type (tag) == G_TYPE_STRING) { - if (!gst_tag_list_get_string_index (list, tag, i, &str)) - g_assert_not_reached (); - } else { - str = - g_strdup_value_contents (gst_tag_list_get_value_index (list, tag, i)); - } - - if (i == 0) { - g_print ("%15s: %s\n", gst_tag_get_nick (tag), str); - } else { - g_print (" : %s\n", str); - } - - g_free (str); - } -} - -static void -got_found_tag (GstPlay * play, GstElement * source, GstTagList * tag_list) -{ - gst_tag_list_foreach (tag_list, print_tag, NULL); -} - -static void -got_time_tick (GstPlay * play, gint64 time_nanos) -{ - g_print ("time tick %f\n", time_nanos / (float) GST_SECOND); -} - -static void -got_stream_length (GstPlay * play, gint64 length_nanos) -{ - g_print ("got length %" G_GUINT64_FORMAT "\n", length_nanos); - length = length_nanos; -} - -static void -got_video_size (GstPlay * play, gint width, gint height) -{ - g_print ("got video size %d, %d\n", width, height); -} - -static void -got_eos (GstPlay * play) -{ - g_print ("End Of Stream\n"); - g_main_loop_quit (loop); -} - -static gboolean -seek_timer (GstPlay * play) -{ - gst_play_seek_to_time (play, length / 2); - return FALSE; -} - -int -main (int argc, char *argv[]) -{ - GstPlay *play; - GstElement *data_src, *video_sink, *audio_sink, *vis_element; - GError *error = NULL; - - /* Initing GStreamer library */ - gst_init (&argc, &argv); - - if (argc != 2) { - g_print ("usage: %s