[frogr] Added new dependency: GStreamer 0.10



commit c33c224d0730c672008a1762d319d6121354d451
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Sat Nov 3 13:31:20 2012 +0100

    Added new dependency: GStreamer 0.10
    
    Also initialize it in a non-fatal way in main.c

 configure.ac |    5 +++++
 src/main.c   |    9 +++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cab3c94..791c0e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,11 @@ PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_MIN_VERSION)
 FROGR_CFLAGS="$FROGR_CFLAGS $LIBXML2_CFLAGS"
 FROGR_LIBS="$FROGR_LIBS $LIBXML2_LIBS"
 
+GSTREAMER_MIN_VERSION=0.10
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= $GSTREAMER_MIN_VERSION)
+FROGR_CFLAGS="$FROGR_CFLAGS $GSTREAMER_CFLAGS"
+FROGR_LIBS="$FROGR_LIBS $GSTREAMER_LIBS"
+
 # libgcrypt does not provide a .pc file
 AM_PATH_LIBGCRYPT(,HAVE_GCRYPT=yes, HAVE_GCRYPT=no)
 if test "x$HAVE_GCRYPT" = "xno"; then
diff --git a/src/main.c b/src/main.c
index 1277fdd..6f79484 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,7 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+#include <gst/gst.h>
 #include <libxml/parser.h>
 
 #ifdef MAC_INTEGRATION
@@ -83,11 +84,19 @@ main (int argc, char **argv)
 {
   FrogrController *fcontroller = NULL;
   GSList *fileuris = NULL;
+  GError *error = NULL;
 
   /* Check optional command line parameters */
   if (argc > 1)
     fileuris = _get_uris_list_from_array (&argv[1], argc - 1);
 
+  gst_init_check (&argc, &argv, &error);
+  if (error)
+    {
+      /* TODO: Disable video support when this happens */
+      DEBUG ("Gstreamer could not be initialized: %s", error->message);
+      g_error_free (error);
+    }
   gtk_init (&argc, &argv);
 
   g_set_application_name(APP_SHORTNAME);



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