[totem] Bump gstreamer version to 1.6.0



commit 8298b27b00633edea6ea0a5ee5985c221eec4d16
Author: Kalev Lember <klember redhat com>
Date:   Tue Dec 8 14:44:50 2015 +0100

    Bump gstreamer version to 1.6.0
    
    This bumps the gstreamer minimum version to 1.6.0 and drops ifdefs for
    supporting older versions.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=759178

 configure.ac                                       |    4 ++--
 .../bacon-video-widget-gst-missing-plugins.c       |   10 ----------
 src/backend/bacon-video-widget.c                   |    2 --
 src/totem-audio-preview.c                          |    2 --
 src/totem-video-thumbnailer.c                      |    4 ----
 5 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7df12ec..50f031b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,8 +88,8 @@ AC_SUBST(PLUGINDIR)
 dnl the two versions here implicate the gstreamer core and gst-plugins
 dnl release versions.
 GST_MAJORMINOR=1.0
-GST_REQS=1.3.1
-GST_PLUG_BASE_REQS=1.4.2
+GST_REQS=1.6.0
+GST_PLUG_BASE_REQS=1.6.0
 GSTPLUG_REQS=0.11.93
 CLUTTER_REQS=1.17.3
 CLUTTER_GST_REQS=2.99.2
diff --git a/src/backend/bacon-video-widget-gst-missing-plugins.c 
b/src/backend/bacon-video-widget-gst-missing-plugins.c
index db083a8..ccff294 100644
--- a/src/backend/bacon-video-widget-gst-missing-plugins.c
+++ b/src/backend/bacon-video-widget-gst-missing-plugins.c
@@ -239,7 +239,6 @@ on_plugin_installation_done (GstInstallPluginsReturn res, gpointer user_data)
 }
 
 #ifdef GDK_WINDOWING_X11
-#if GST_CHECK_VERSION (1, 5, 0)
 static void
 set_startup_notification_id (GstInstallPluginsContext *install_ctx)
 {
@@ -252,7 +251,6 @@ set_startup_notification_id (GstInstallPluginsContext *install_ctx)
        g_free (startup_id);
 }
 #endif
-#endif
 
 static gboolean
 bacon_video_widget_start_plugin_installation (TotemCodecInstallContext *ctx,
@@ -265,10 +263,8 @@ bacon_video_widget_start_plugin_installation (TotemCodecInstallContext *ctx,
 #endif
 
        install_ctx = gst_install_plugins_context_new ();
-#if GST_CHECK_VERSION (1, 5, 0)
        gst_install_plugins_context_set_desktop_id (install_ctx, "org.gnome.Totem.desktop");
        gst_install_plugins_context_set_confirm_search (install_ctx, confirm_search);
-#endif
 
 #ifdef GDK_WINDOWING_X11
        display = gdk_display_get_default ();
@@ -279,9 +275,7 @@ bacon_video_widget_start_plugin_installation (TotemCodecInstallContext *ctx,
        {
                gulong xid = 0;
 
-#if GST_CHECK_VERSION (1, 5, 0)
                set_startup_notification_id (install_ctx);
-#endif
 
                xid = bacon_video_widget_gst_get_toplevel (GTK_WIDGET (ctx->bvw));
                gst_install_plugins_context_set_xid (install_ctx, xid);
@@ -313,7 +307,6 @@ bacon_video_widget_start_plugin_installation (TotemCodecInstallContext *ctx,
        return TRUE;
 }
 
-#if GST_CHECK_VERSION (1, 5, 0)
 static void
 codec_confirmation_dialog_response_cb (GtkDialog       *dialog,
                                        GtkResponseType  response_type,
@@ -380,7 +373,6 @@ show_codec_confirmation_dialog (TotemCodecInstallContext *ctx,
        g_free (descriptions_text);
        g_free (message_text);
 }
-#endif
 
 static void
 on_packagekit_proxy_ready (GObject      *source_object,
@@ -398,7 +390,6 @@ on_packagekit_proxy_ready (GObject      *source_object,
                goto out;
        }
 
-#if GST_CHECK_VERSION (1, 5, 0)
        if (packagekit_proxy != NULL) {
                property = g_dbus_proxy_get_cached_property (packagekit_proxy, "DisplayName");
                if (property != NULL) {
@@ -411,7 +402,6 @@ on_packagekit_proxy_ready (GObject      *source_object,
                        }
                }
        }
-#endif
 
        /* If the above failed, fall back to immediately starting the codec installation */
        bacon_video_widget_start_plugin_installation (ctx, TRUE);
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 914ac2f..59a9c20 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -2524,10 +2524,8 @@ bvw_bus_message_cb (GstBus * bus, GstMessage * message, BaconVideoWidget *bvw)
     case GST_MESSAGE_ANY:
     case GST_MESSAGE_RESET_TIME:
     case GST_MESSAGE_STREAM_START:
-#if GST_CHECK_VERSION (1, 1, 3)
     case GST_MESSAGE_NEED_CONTEXT:
     case GST_MESSAGE_HAVE_CONTEXT:
-#endif
     default:
       GST_LOG ("Unhandled message: %" GST_PTR_FORMAT, message);
       break;
diff --git a/src/totem-audio-preview.c b/src/totem-audio-preview.c
index 858b471..b7de1b8 100644
--- a/src/totem-audio-preview.c
+++ b/src/totem-audio-preview.c
@@ -118,10 +118,8 @@ error_handler (GstBus *bus,
        case GST_MESSAGE_RESET_TIME:
        case GST_MESSAGE_STREAM_START:
        case GST_MESSAGE_ANY:
-#if GST_CHECK_VERSION (1, 1, 3)
        case GST_MESSAGE_NEED_CONTEXT:
        case GST_MESSAGE_HAVE_CONTEXT:
-#endif
        default:
                /* Ignored */
                ;;
diff --git a/src/totem-video-thumbnailer.c b/src/totem-video-thumbnailer.c
index d706434..758d800 100644
--- a/src/totem-video-thumbnailer.c
+++ b/src/totem-video-thumbnailer.c
@@ -212,10 +212,8 @@ error_handler (GstBus *bus,
        case GST_MESSAGE_RESET_TIME:
        case GST_MESSAGE_STREAM_START:
        case GST_MESSAGE_ANY:
-#if GST_CHECK_VERSION (1, 1, 3)
        case GST_MESSAGE_NEED_CONTEXT:
        case GST_MESSAGE_HAVE_CONTEXT:
-#endif
        default:
                /* Ignored */
                ;;
@@ -367,10 +365,8 @@ thumb_app_start (ThumbApp *app)
                case GST_MESSAGE_RESET_TIME:
                case GST_MESSAGE_STREAM_START:
                case GST_MESSAGE_ANY:
-#if GST_CHECK_VERSION (1, 1, 3)
                case GST_MESSAGE_NEED_CONTEXT:
                case GST_MESSAGE_HAVE_CONTEXT:
-#endif
                default:
                        /* Ignore */
                        ;;


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