[rhythmbox] player backends: just use autoaudiosink

[Jonathan Matthew <jmatthew src gnome org>]

commit 3357d7b09f9a4e8d68f6b1ff541ee8221c82917b
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Oct 29 20:20:34 2016 +1000

    player backends: just use autoaudiosink
    
    The gsettings and gconf configurable sinks have been removed from
    the gstreamer plugin packages so there's not much point trying them.

 backends/gstreamer/rb-player-gst-xfade.c |    9 +--------
 backends/gstreamer/rb-player-gst.c       |   13 ++-----------
 2 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/backends/gstreamer/rb-player-gst-xfade.c b/backends/gstreamer/rb-player-gst-xfade.c
index 066963a..20e69a7 100644
--- a/backends/gstreamer/rb-player-gst-xfade.c
+++ b/backends/gstreamer/rb-player-gst-xfade.c
@@ -3230,7 +3230,6 @@ silencesrc_need_data_cb (GstElement *appsrc, guint size, RBPlayerGstXFade *playe
 static gboolean
 create_sink (RBPlayerGstXFade *player, GError **error)
 {
-       const char *try_sinks[] = { "gsettingsaudiosink", "gconfaudiosink", "autoaudiosink" };
        GstElement *audioconvert;
        GstElement *audioresample;
        GstElement *capsfilter;
@@ -3243,7 +3242,6 @@ create_sink (RBPlayerGstXFade *player, GError **error)
        GstPad *addersrcpad;
        GstPadLinkReturn plr;
        GList *l;
-       int i;
 
        if (player->priv->sink_state != SINK_NULL)
                return TRUE;
@@ -3297,12 +3295,7 @@ create_sink (RBPlayerGstXFade *player, GError **error)
                return FALSE;
        }
 
-       for (i = 0; i < G_N_ELEMENTS (try_sinks); i++) {
-               player->priv->sink = rb_player_gst_try_audio_sink (try_sinks[i], NULL);
-               if (player->priv->sink != NULL) {
-                       break;
-               }
-       }
+       player->priv->sink = rb_player_gst_try_audio_sink ("autoaudiosink", NULL);
        if (player->priv->sink == NULL) {
                g_set_error (error,
                             RB_PLAYER_ERROR,
diff --git a/backends/gstreamer/rb-player-gst.c b/backends/gstreamer/rb-player-gst.c
index a439c32..1590b70 100644
--- a/backends/gstreamer/rb-player-gst.c
+++ b/backends/gstreamer/rb-player-gst.c
@@ -690,19 +690,9 @@ construct_pipeline (RBPlayerGst *mp, GError **error)
        g_object_notify (G_OBJECT (mp), "playbin");
        g_object_notify (G_OBJECT (mp), "bus");
 
-       /* Use gsettingsaudiosink for audio if there's no audio sink yet */
        g_object_get (mp->priv->playbin, "audio-sink", &mp->priv->audio_sink, NULL);
        if (mp->priv->audio_sink == NULL) {
-               const char *try_sinks[] = { "gsettingsaudiosink", "gconfaudiosink", "autoaudiosink" };
-               int i;
-
-               for (i = 0; i < G_N_ELEMENTS (try_sinks); i++) {
-                       mp->priv->audio_sink = rb_player_gst_try_audio_sink (try_sinks[i], NULL);
-                       if (mp->priv->audio_sink != NULL) {
-                               g_object_set (mp->priv->playbin, "audio-sink", mp->priv->audio_sink, NULL);
-                               break;
-                       }
-               }
+               mp->priv->audio_sink = rb_player_gst_try_audio_sink ("autoaudiosink", NULL);
                if (mp->priv->audio_sink == NULL) {
                        g_set_error (error,
                                     RB_PLAYER_ERROR,
@@ -711,6 +701,7 @@ construct_pipeline (RBPlayerGst *mp, GError **error)
                                     "autoaudiosink");
                        return FALSE;
                }
+               g_object_set (mp->priv->playbin, "audio-sink", mp->priv->audio_sink, NULL);
        } else {
                rb_debug ("existing audio sink found");
                g_object_unref (mp->priv->audio_sink);