[girl] GNOME Internet Radio Locator 9.2.0

[Ole Aamot <ole src gnome org>]

commit 6aec11472a2127cee980664f5ea3958a81fcf39f
Author: Ole Aamot <oka oka no>
Date:   Sat Jun 11 14:06:47 2016 +0200

    GNOME Internet Radio Locator 9.2.0

 configure          |   20 ++++++++++----------
 configure.ac       |    2 +-
 girl.spec.in       |    3 +++
 src/girl-station.c |   10 +++++-----
 src/girl.c         |   48 ++++++++++++++++++++----------------------------
 5 files changed, 39 insertions(+), 44 deletions(-)
---
diff --git a/configure b/configure
index 99d1423..2321d9b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 9.1.0.
+# Generated by GNU Autoconf 2.69 for girl 9.2.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='girl'
 PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='9.1.0'
-PACKAGE_STRING='girl 9.1.0'
+PACKAGE_VERSION='9.2.0'
+PACKAGE_STRING='girl 9.2.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures girl 9.1.0 to adapt to many kinds of systems.
+\`configure' configures girl 9.2.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1430,7 +1430,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 9.1.0:";;
+     short | recursive ) echo "Configuration of girl 9.2.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1545,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 9.1.0
+girl configure 9.2.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by girl $as_me 9.1.0, which was
+It was created by girl $as_me 9.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2773,7 +2773,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='9.1.0'
+ VERSION='9.2.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7457,7 +7457,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by girl $as_me 9.1.0, which was
+This file was extended by girl $as_me 9.2.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7523,7 +7523,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-girl config.status 9.1.0
+girl config.status 9.2.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 5f01a26..f66db80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(girl, 9.1.0)
+AC_INIT(girl, 9.2.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/girl.spec.in b/girl.spec.in
index ee1d40d..b502830 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -70,6 +70,9 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Sat Jun 11 2016 Ole Aamot - 9.2.0-1.fc23
+- Girl 9.2.0 build on Fedora Linux 23
+
 * Tue Jun 07 2016 Ole Aamot - 9.1.0-1.fc23
 - Girl 9.1.0 build on Fedora Linux 23
 
diff --git a/src/girl-station.c b/src/girl-station.c
index 5d088f0..d0149a4 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -749,8 +749,8 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
        new_station->stream = g_new0(GirlStreamInfo, 1);
        new_station->stream->uri = g_strdup(station_uri);
        new_station->uri = g_strdup(station_website);
-       fp = fopen(stations, "w+");
-       fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE girl SYSTEM 'girl-8.0.dtd'>\n<girl 
version='8.0'>\n");
+       fp = g_fopen(stations, "w+");
+       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE girl SYSTEM 'girl-9.1.dtd'>\n<girl 
version='9.1'>\n");
        // stationinfo-> = l->data;
        while (stationinfo != NULL) {
                local_station_uri = g_strdup(stationinfo->stream->uri);
@@ -760,12 +760,12 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
                local_station_description = g_strdup(stationinfo->description);
                local_station_website = g_strdup(stationinfo->uri);
                /* FIXME: Save mime='audio/mp3' uri='%s' codec='MPEG 1 Audio, Layer 3 (MP3)' 
samplerate='24000 Hz' channels='Mono' bitrate='32 kbps' */
-               fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" 
type=\"org\">\n    <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
local_station_band, local_station_name, local_station_name, local_station_website, local_station_band, 
local_station_location, local_station_location, local_station_description, local_station_uri, 
local_station_website);
+               g_fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" 
type=\"org\">\n    <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
local_station_band, local_station_name, local_station_name, local_station_website, local_station_band, 
local_station_location, local_station_location, local_station_description, local_station_uri, 
local_station_website);
                stationinfo = stationinfo->next;
 
        }
-       fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" type=\"org\">\n    
<frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
new_station->band, new_station->name, new_station->name, new_station->uri, new_station->band, 
new_station->location, new_station->location, new_station->description, new_station->stream->uri, 
new_station->uri);
-       fprintf(fp, "</girl>\n");
+       g_fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" type=\"org\">\n  
  <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
new_station->band, new_station->name, new_station->name, new_station->uri, new_station->band, 
new_station->location, new_station->location, new_station->description, new_station->stream->uri, 
new_station->uri);
+       g_fprintf(fp, "</girl>\n");
        fclose(fp);
        girl_stations = g_list_append(girl_stations, (GirlStationInfo *)new_station);
        g_free(stations);
diff --git a/src/girl.c b/src/girl.c
index ffc99d7..7155de7 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -879,46 +879,38 @@ void on_stop_button_clicked(GtkWidget *a, gpointer user_data)
                
                /* Close pid */
 
+               GIRL_DEBUG_MSG("Recording stopped.\n");
                g_subprocess_force_exit(girl->record_subprocess);
-
                // g_spawn_close_pid( girl->record_pid);
-
                appbar_send_msg(_("Finished saving recording from the radio station %s in %s from %s to %s"),
                                girl->selected_station_name,
                                girl->selected_station_location,
                                girl->selected_station_uri,
                                girl->selected_archive_file);
-
                girl->record_status = GIRL_RECORD_FALSE;
                
-       } else {
-
-               if (girl->player_status == GIRL_PLAYER_TRUE) {
-
-                       g_subprocess_force_exit(girl->player_subprocess);
+       }
 
-                       // g_spawn_close_pid( girl->player_pid);
-                       
-                       appbar_send_msg(_("To finish playing from the radio station %s in %s, exit the 
application Videos."),
-                                       girl->selected_station_name,
-                                       girl->selected_station_location,
-                                       girl->selected_station_uri,
-                                       girl->selected_station_band);
-                       
-                       girl->player_status = GIRL_PLAYER_FALSE;
+       if (girl->player_status == GIRL_PLAYER_TRUE) {
 
-               } else {
-                       
-                       appbar_send_msg(_("Stop what?  You can \"Search\" by location, select a radio station 
from \"Stations\", or click on \"Listen\" and/or \"Record\".  Or go to \"Prev\" or \"Next\" radio station."),
-                                       girl->selected_station_name,
-                                       girl->selected_station_location,
-                                       girl->selected_station_uri,
-                                       girl->selected_station_band);
-                       
-               }
+               GIRL_DEBUG_MSG("Playback stopped.\n");
+               g_subprocess_force_exit(girl->player_subprocess);
+               // g_spawn_close_pid( girl->player_pid);
+               appbar_send_msg(_("Stopped playing the radio station %s in %s, exit the application Videos."),
+                               girl->selected_station_name,
+                               girl->selected_station_location,
+                               girl->selected_station_uri,
+                               girl->selected_station_band);
+               girl->player_status = GIRL_PLAYER_FALSE;
        }
-       
-       
+       /* if (girl->player_status != GIRL_RECORD_TRUE) { */
+       /* appbar_send_msg(_("Stop what?  You can \"Search\" by location, select a radio station from 
\"Stations\", or click on \"Listen\" and/or \"Record\".  Or go to \"Prev\" or \"Next\" radio station."), */
+       /*                              girl->selected_station_name, */
+       /*                              girl->selected_station_location, */
+       /*                              girl->selected_station_uri, */
+       /*                              girl->selected_station_band); */
+       /*      } */
+       /* } */
 }
 
 GnomeVFSFileSize get_size(GnomeVFSURI * uri)