[banshee] [build] Update gstreamer minimum required version to 0.10.12



commit 608b42ae8e72f7fc967d2e33452fd0d58b8c2b15
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sun Nov 29 16:51:55 2009 +0100

    [build] Update gstreamer minimum required version to 0.10.12
    
    This is needed because GST_TAG_BEATS_PER_MINUTE was introduced in
    GStreamer 0.10.12. This also allows us to get rid of the
    HAVE_GST_PBUTILS conditional. Fixes BGO#603315.

 NEWS                                         |    2 +-
 build/m4/banshee/gstreamer.m4                |   15 ++-------------
 libbanshee/banshee-gst.c                     |    7 +------
 libbanshee/banshee-player-missing-elements.c |   11 -----------
 libbanshee/banshee-player-private.h          |    7 +------
 libbanshee/libbanshee.vcproj                 |    4 ++--
 6 files changed, 7 insertions(+), 39 deletions(-)
---
diff --git a/NEWS b/NEWS
index 55ab0b4..4a3393a 100644
--- a/NEWS
+++ b/NEWS
@@ -104,7 +104,7 @@ DEPENDENCIES
     * Mono 1.9.1 (.NET 2.0 Profile / gmcs)
     * SQlite 3.4
     * Gtk# 2.12
-    * GStreamer 0.10.3
+    * GStreamer 0.10.12
 
     * 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 566da10..a9b9130 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.3
+	GSTREAMER_REQUIRED_VERSION=0.10.12
 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
 
 	PKG_CHECK_MODULES(GST,
@@ -11,19 +11,8 @@ AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
 		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
 		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
 
-	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10"
+	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10"
 
-	PKG_CHECK_MODULES(GST_PBUTILS, gstreamer-plugins-base-0.10 >= 0.10.12, 
-		gst_pbutils=yes, gst_pbutils=no)
-
-	if test "x$gst_pbutils" = "xyes"; then
-		GST_LIBS="$GST_LIBS -lgstpbutils-0.10"
-		AC_DEFINE(HAVE_GST_PBUTILS, 1, 
-			[Define if GSTreamer PB Utils is available])
-	else
-		AC_MSG_RESULT([no])
-	fi
-	
 	AC_SUBST(GST_CFLAGS)
 	AC_SUBST(GST_LIBS)
 
diff --git a/libbanshee/banshee-gst.c b/libbanshee/banshee-gst.c
index dd7c209..48d8b0a 100644
--- a/libbanshee/banshee-gst.c
+++ b/libbanshee/banshee-gst.c
@@ -36,13 +36,10 @@
 #include <stdarg.h>
 
 #include <gst/gst.h>
+#include <gst/pbutils/pbutils.h>
 
 #include "banshee-gst.h"
 
-#ifdef HAVE_GST_PBUTILS
-#  include <gst/pbutils/pbutils.h>
-#endif
-
 static gboolean gstreamer_initialized = FALSE;
 static gboolean banshee_debugging;
 static BansheeLogHandler banshee_log_handler = NULL;
@@ -60,9 +57,7 @@ gstreamer_initialize (gboolean debugging, BansheeLogHandler log_handler)
 
     gst_init (NULL, NULL);
     
-    #ifdef HAVE_GST_PBUTILS
     gst_pb_utils_init ();
-    #endif
     
     gstreamer_initialized = TRUE;
 }
diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
index 38bb6cb..59f43d2 100644
--- a/libbanshee/banshee-player-missing-elements.c
+++ b/libbanshee/banshee-player-missing-elements.c
@@ -62,8 +62,6 @@ bp_slist_destroy (GSList *list)
     g_slist_free (list);
 }
 
-#ifdef HAVE_GST_PBUTILS
-
 static void
 bp_missing_elements_handle_install_failed (BansheePlayer *player)
 {
@@ -98,8 +96,6 @@ bp_missing_elements_handle_install_result (GstInstallPluginsReturn result, gpoin
     player->install_plugins_context = NULL;
 }
 
-#endif
-
 // ---------------------------------------------------------------------------
 // Internal Functions
 // ---------------------------------------------------------------------------
@@ -111,17 +107,14 @@ void _bp_missing_elements_destroy (BansheePlayer *player)
     bp_slist_destroy (player->missing_element_details);
     bp_slist_destroy (player->missing_element_details_handled);
     
-    #ifdef HAVE_GST_PBUTILS
     if (player->install_plugins_context != NULL) {
         gst_install_plugins_context_free (player->install_plugins_context);
     }
-    #endif
 }
 
 void
 _bp_missing_elements_process_message (BansheePlayer *player, GstMessage *message)
 {
-    #ifdef HAVE_GST_PBUTILS
     g_return_if_fail (IS_BANSHEE_PLAYER (player));
     g_return_if_fail (message != NULL);
     
@@ -142,13 +135,11 @@ _bp_missing_elements_process_message (BansheePlayer *player, GstMessage *message
         bp_debug ("Saving missing element details ('%s')", detail);
         player->missing_element_details = g_slist_append (player->missing_element_details, detail);  
     }
-    #endif
 }
 
 void
 _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old, GstState new)
 {
-    #ifdef HAVE_GST_PBUTILS
     GstInstallPluginsReturn install_return;
     gchar **details;
     GSList *node;
@@ -201,6 +192,4 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
     g_slist_free (player->missing_element_details);
     player->missing_element_details = NULL;
     player->handle_missing_elements = FALSE;
-    
-    #endif
 }
diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
index 5cbaa40..6528060 100644
--- a/libbanshee/banshee-player-private.h
+++ b/libbanshee/banshee-player-private.h
@@ -38,10 +38,7 @@
 #include <gst/base/gstadapter.h>
 #include <gdk/gdk.h>
 #include <gst/fft/gstfftf32.h>
-
-#ifdef HAVE_GST_PBUTILS
-#  include <gst/pbutils/pbutils.h>
-#endif
+#include <gst/pbutils/pbutils.h>
 
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
@@ -135,9 +132,7 @@ struct BansheePlayer {
     GSList *missing_element_details;
     GSList *missing_element_details_handled;
     gboolean handle_missing_elements;
-    #ifdef HAVE_GST_PBUTILS
     GstInstallPluginsContext *install_plugins_context;
-    #endif
     
     // ReplayGain State
     gboolean replaygain_enabled;
diff --git a/libbanshee/libbanshee.vcproj b/libbanshee/libbanshee.vcproj
index fafc95d..8af0323 100644
--- a/libbanshee/libbanshee.vcproj
+++ b/libbanshee/libbanshee.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gtk+-dev_2.16.0-2_win32\lib\gtk-2.0\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\pango-dev_1.24.0-1_win32\include\pango-1.0&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\cairo\include\cairo&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gettext\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gtk+-dev_2.16.0-2_win32\include\gtk-2.0&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\glib\lib\glib-2.0\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gst-plugins-base\include\gstreamer-0.10&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gstreamer\include\gstreamer-0.10&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\glib\include\glib-2.0&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBANSHEE_EXPORTS;HAVE_CONFIG_H;HAVE_GST_PBUTILS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBANSHEE_EXPORTS;HAVE_CONFIG_H"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
 				BufferSecurityCheck="false"
@@ -123,7 +123,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gtk+-dev_2.16.0-2_win32\lib\gtk-2.0\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\pango-dev_1.24.0-1_win32\include\pango-1.0&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\cairo\include\cairo&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gettext\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gtk+-dev_2.16.0-2_win32\include\gtk-2.0&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\glib\lib\glib-2.0\include&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gst-plugins-base\include\gstreamer-0.10&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\gstreamer\include\gstreamer-0.10&quot;;&quot;C:\Documents and Settings\Administrator\Desktop\Code\deps\glib\include\glib-2.0&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBANSHEE_EXPORTS;HAVE_CONFIG_H;HAVE_GST_PBUTILS;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBBANSHEE_EXPORTS;HAVE_CONFIG_H"
 				ExceptionHandling="0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]