[girl] GNOME Internet Radio Locator 9.9.6

[ole <ole src gnome org>]

commit a8f5fab6ddfd701d8170a449747e807871e87d67
Author: Ole Aamot <oka oka no>
Date:   Mon Apr 17 22:36:58 2017 +0200

    GNOME Internet Radio Locator 9.9.6

 NEWS              |    2 ++
 README            |    9 ++++++++-
 man/girl.1        |   11 +++++------
 src/GIRL-PLAYER.c |    2 +-
 src/GIRL.c        |   26 +++++++++++++++-----------
 src/Makefile.am   |    4 ++--
 6 files changed, 33 insertions(+), 21 deletions(-)
---
diff --git a/NEWS b/NEWS
index 482d8dc..d0a06f5 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ Version 9.9.6
 =============
 
        * po/fur.po: Friulian translation by Fabio Tomat
+       * src/GIRL-PLAYER.c: Add audio playback code based on gst-player
+       * src/GIRL.c: Add audio playback code based on gst-player
 
 =============
 Version 9.9.5
diff --git a/README b/README
index 9a095b5..7623706 100644
--- a/README
+++ b/README
@@ -2,7 +2,14 @@
 GIRL 9.9.6 notes
 ================
 
-Audio playback (click "Listen") based on gst-player code now essentially works.
+Audio playback (click "Listen") based on gst-player code now essentially works
+in the binary ${prefix}/bin/gnome-internet-radio-locator
+
+Audio playback of BBC World Service works as GIRL-PLAYER.c calls
+gst-player functions gst_player_set_uri() and gst_player_stop().
+
+Exiting the GTK+ 3 application gnome-internet-radio-locator also
+works without any problems.
 
 ================
 GIRL 9.9.5 notes
diff --git a/man/girl.1 b/man/girl.1
index 3060dfa..4fda618 100644
--- a/man/girl.1
+++ b/man/girl.1
@@ -1,21 +1,21 @@
 .\" Man Page for gPhoto by scott... :)
 .\" groff -man -Tascii foo.1
 .\"
-.TH GIRL 1 "JANUARY 2015" GNOME "User Manuals"
+.TH GIRL 1 "APRIL 2017" GNOME "User Manuals"
 .SH NAME
 girl \- GNOME Internet Radio Locator
 .SH SYNOPSIS
 .B girl
 .br
 .SH DESCRIPTION
-.B girl,
-the GNOME Internet Radio Locator program, allows users to easily listen to and record from live radio 
programs on radio broadcasters on the Internet.
+.B GNOME Internet Radio Locator
+allows users to easily listen to live radio programs on radio broadcasters on the Internet.
 .SH MOTIVATION
 The motivation behind this program is to support the user with easy access to independent, free Internet 
radio stations around the world. Enjoy Internet Radio.
 .SH PLATFORM
-.B girl
+.B GNOME Internet Radio Locator
 is developed for the GNOME desktop and requires gstreamer to be installed for
-playback and recording live radio streams of supported radio stations.
+playback for live radio streams of supported radio stations.
 .SH USAGE
 .IP girl
 .I "\--help"
@@ -37,4 +37,3 @@ https://git.gnome.org/girl
 Ole Aamot <ole src gnome org>
 .SH "SEE ALSO"
 .BR gstreamer
-
diff --git a/src/GIRL-PLAYER.c b/src/GIRL-PLAYER.c
index 16fafaa..43cb9c4 100644
--- a/src/GIRL-PLAYER.c
+++ b/src/GIRL-PLAYER.c
@@ -652,7 +652,7 @@ girl_player_new (GstPlayer * player, const gchar * next_uri)
 }
 
 void
-girl_player_quit (GstPlayer *player)
+girl_player_stop (GstPlayer *player)
 {
   gst_player_stop(player);
 }
diff --git a/src/GIRL.c b/src/GIRL.c
index bab600d..7deae8e 100644
--- a/src/GIRL.c
+++ b/src/GIRL.c
@@ -82,6 +82,12 @@ listen_station(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
 }
 
 static void
+stop_station(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
+  girl_player_stop(player);
+  return;
+}
+
+static void
 pause_station(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
   /* FIXME: Removing Pause.  Can't quit after gst_player_pause is called. */
 #if 0
@@ -123,7 +129,7 @@ about_program_cb(GSimpleAction *simple, GVariant *parameter, gpointer user_data)
 
 static void
 quit_program(GSimpleAction *simple, GVariant *parameter, gpointer user_data) {
-  girl_player_quit(player);
+  girl_player_stop(player);
   g_application_quit(app);
   gst_deinit();
   return;
@@ -224,7 +230,7 @@ static void
 girl_window_cb (GtkApplication *app,
                gpointer user_data)
 {
-  GtkWidget *widget, *grid, *toolbar, *new, *search, *listen, *pause, *prev, *stations, *next, *station, 
*program, *quit;
+  GtkWidget *widget, *grid, *toolbar, *new, *search, *listen, *stop, *prev, *stations, *next, *station, 
*program, *quit;
        
        window = gtk_application_window_new (app);
        widget = gtk_champlain_embed_new();
@@ -251,15 +257,13 @@ girl_window_cb (GtkApplication *app,
        gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM(listen), "Listen Internet Radio Station");
        g_signal_connect(listen, "clicked", G_CALLBACK (listen_station), GTK_WINDOW (window));
 
-       /* FIXME: Removing Pause feature.  Can't quit after Pause is called. */
-#if 0
-       pause = gtk_tool_button_new(gtk_image_new_from_icon_name(NULL, GTK_ICON_SIZE_BUTTON), "Pause");
-       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(pause), TRUE);
-       gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(pause), 3);
-       gtk_widget_show (GTK_WIDGET(pause));
-       gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM(pause), "Pause Internet Radio Station");
-       g_signal_connect(pause, "clicked", G_CALLBACK (pause_station), GTK_WINDOW (window));
-#endif
+       stop = gtk_tool_button_new(gtk_image_new_from_icon_name(NULL, GTK_ICON_SIZE_BUTTON), "Stop");
+       gtk_tool_item_set_is_important(GTK_TOOL_ITEM(stop), TRUE);
+       gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(stop), 3);
+       gtk_widget_show (GTK_WIDGET(stop));
+       gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM(stop), "Stop Internet Radio Station");
+       g_signal_connect(stop, "clicked", G_CALLBACK (stop_station), GTK_WINDOW (window));
+
        prev = gtk_tool_button_new(gtk_image_new_from_icon_name(NULL, GTK_ICON_SIZE_BUTTON), "Prev");
        gtk_tool_item_set_is_important(GTK_TOOL_ITEM(prev), TRUE);
        gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM(prev), 4);
diff --git a/src/Makefile.am b/src/Makefile.am
index cf4cd4a..6e11bda 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,14 +55,14 @@ gnome_internet_radio_locator_SOURCES = \
 girl_CFLAGS  = $(GIRL_CFLAGS) \
               -DGIRL_DATADIR=\"$(datadir)/girl\" \
               -DDATADIR=\"$(datadir)\" \
-              -DGIRL_DEBUG=0 \
+              -DGIRL_DEBUG=1 \
               -DGIRL_CFG \
               -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 gnome_internet_radio_locator_CFLAGS  = $(GNOME_INTERNET_RADIO_LOCATOR_CFLAGS) \
               -DGIRL_DATADIR=\"$(datadir)/girl\" \
               -DDATADIR=\"$(datadir)\" \
-              -DGIRL_DEBUG=0 \
+              -DGIRL_DEBUG=1 \
               -DGIRL_CFG \
               -DGNOMELOCALEDIR=\"$(datadir)/locale\"