diff options
author | Gabriel Burt <gabriel.burt@gmail.com> | 2011-04-26 21:04:44 -0500 |
---|---|---|
committer | Gabriel Burt <gabriel.burt@gmail.com> | 2011-04-27 15:03:20 -0500 |
commit | 79b5e69171fd8cd8eeb53d9c290edb946907b359 (patch) | |
tree | f474bb080d24d32c8cbff6913909d66ab3f87918 | |
parent | a837ee0de4ea0a53572b81986e5442a466007d31 (diff) |
cleanup: Remove #if for old GStreamer support
Bump GStreamer dep to 0.10.26 from 0.10.23
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | build/m4/banshee/gstreamer.m4 | 8 | ||||
-rw-r--r-- | libbanshee/banshee-player.c | 4 |
3 files changed, 2 insertions, 12 deletions
@@ -21,7 +21,7 @@ DEPENDENCIES * Mono 1.9.1 (.NET 2.0 Profile / gmcs) * SQlite 3.4 * Gtk# 2.12 - * GStreamer 0.10.23 + * GStreamer 0.10.26 * NDesk DBus (ndesk-dbus) 0.5 * NDesk DBus GLib (ndesk-dbus-glib) 0.3 diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4 index f0d5dc18a..6267cce32 100644 --- a/build/m4/banshee/gstreamer.m4 +++ b/build/m4/banshee/gstreamer.m4 @@ -1,6 +1,6 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER], [ - GSTREAMER_REQUIRED_VERSION=0.10.23 + GSTREAMER_REQUIRED_VERSION=0.10.26 AC_SUBST(GSTREAMER_REQUIRED_VERSION) PKG_CHECK_MODULES(GST, @@ -15,10 +15,4 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER], AC_SUBST(GST_CFLAGS) AC_SUBST(GST_LIBS) - - PKG_CHECK_MODULES(GST_0_10_26, - gstreamer-plugins-base-0.10 >= 0.10.26, - has_gst_0_10_26=yes, has_gst_0_10_26=no) - AM_CONDITIONAL(HAVE_GST_0_10_26, test "x$has_gst_0_10_26" = "xyes") ]) - diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c index 6b23826f0..8d8eaccdc 100644 --- a/libbanshee/banshee-player.c +++ b/libbanshee/banshee-player.c @@ -494,12 +494,8 @@ bp_get_subtitle_description (BansheePlayer *player, int i) return NULL; } bp_debug ("[subtitle]: iso 639-2 subtitle code %s", code); -#ifdef HAVE_GST_0_10_26 desc = (gchar *) gst_tag_get_language_name ((const gchar *)&code); bp_debug ("[subtitle]: subtitle language: %s", desc); -#else - desc = g_strdup (code); -#endif g_free (code); } |