[girl] Prepare version 9.9.6 of GNOME Internet Radio Locator



commit f8cc9779c0b5b169e45329fef29fed18635236bc
Author: Ole Aamot <oka oka no>
Date:   Wed Apr 12 15:05:29 2017 +0200

    Prepare version 9.9.6 of GNOME Internet Radio Locator

 girl.spec.in      |    3 +++
 src/GIRL-PLAYER.c |   16 ++++++++--------
 src/GIRL-PLAYER.h |    4 ++--
 src/GIRL.c        |    3 ++-
 4 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/girl.spec.in b/girl.spec.in
index 19edacd..20f2b33 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -75,6 +75,9 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Wed Apr 12 2017 Ole Aamot - 9.9.6-1.fc25
+- GIRL 9.9.6 build on Fedora Linux 25
+
 * Wed Mar 22 2017 Ole Aamot - 9.9.2-1.fc25
 - GIRL 9.9.2 build on Fedora Linux 25
 
diff --git a/src/GIRL-PLAYER.c b/src/GIRL-PLAYER.c
index 2b0fac9..097143c 100644
--- a/src/GIRL-PLAYER.c
+++ b/src/GIRL-PLAYER.c
@@ -426,7 +426,7 @@ play_set_relative_volume (GstPlay * play, gdouble volume_step)
 }
 
 static gchar *
-play_uri_get_display_name (GstPlay * play, const gchar * uri)
+play_uri_get_display_name (GstPlayer * player, const gchar * uri)
 {
   gchar *loc;
 
@@ -442,19 +442,19 @@ play_uri_get_display_name (GstPlay * play, const gchar * uri)
   return loc;
 }
 
-static void
-play_uri (GstPlay * play, const gchar * next_uri)
+void
+play_uri (GstPlayer *player, const gchar * next_uri)
 {
   gchar *loc;
 
-  play_reset (play);
+  play_reset (player);
 
-  loc = play_uri_get_display_name (play, next_uri);
+  loc = play_uri_get_display_name (player, next_uri);
   g_print ("Now playing %s\n", loc);
   g_free (loc);
 
-  g_object_set (play->player, "uri", next_uri, NULL);
-  gst_player_play (play->player);
+  g_object_set (player, "uri", next_uri, NULL);
+  gst_player_play (player);
 }
 
 /* returns FALSE if we have reached the end of the playlist */
@@ -646,7 +646,7 @@ keyboard_cb (const gchar * key_input, gpointer user_data)
 }
 
 void
-girl_player_new (GstPlay * play, const gchar * next_uri)
+girl_player_new (GstPlayer * player, const gchar * next_uri)
 {
 }
 
diff --git a/src/GIRL-PLAYER.h b/src/GIRL-PLAYER.h
index 7ddfc00..3529ca8 100644
--- a/src/GIRL-PLAYER.h
+++ b/src/GIRL-PLAYER.h
@@ -41,8 +41,8 @@ typedef struct
   GMainLoop *loop;
 } GstPlay;
 
-static void play_uri (GstPlay * play, const gchar * next_uri);
+static void play_uri (GstPlayer * player, const gchar * next_uri);
 
-void girl_player_new (GstPlay * play, const gchar * next_uri);
+void girl_player_new (GstPlayer * player, const gchar * next_uri);
 
 #endif /* GIRL_PLAYER_H */
diff --git a/src/GIRL.c b/src/GIRL.c
index f451941..0394216 100644
--- a/src/GIRL.c
+++ b/src/GIRL.c
@@ -74,8 +74,9 @@ listen_station(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
   GstPlayer *player = gst_player_new (NULL, gst_player_g_main_context_signal_dispatcher_new
                                      (NULL));
   girl_player_new(player, "http://bbcwssc.ic.llnwd.net/stream/bbcwssc_mp1_ws-eieuk";);
-  gst_player_play(player);
   g_print("Listening to BBC World Service\n");
+  gst_player_play(player);
+  g_print("%s\n", __FUNCTION__);
   return;
 }
 


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