[girl] Pause station in player backend when the player window is closed



commit 793ee9ae063db5fd4fd464e914f26e54c960d983
Author: Ole Aamot <oka oka no>
Date:   Sat Sep 24 21:50:35 2016 +0200

    Pause station in player backend when the player window is closed

 configure                  |   20 ++++++++++----------
 configure.ac               |    2 +-
 girl.spec.in               |    6 ++++++
 src/Makefile.am            |    2 +-
 src/Makefile.in            |    2 +-
 src/girl-player-frontend.c |    1 +
 src/girl.xml               |    2 +-
 7 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/configure b/configure
index ae07ec2..190348c 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.5.2.
+# Generated by GNU Autoconf 2.69 for girl 9.5.3.
 #
 #
 # 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.5.2'
-PACKAGE_STRING='girl 9.5.2'
+PACKAGE_VERSION='9.5.3'
+PACKAGE_STRING='girl 9.5.3'
 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.5.2 to adapt to many kinds of systems.
+\`configure' configures girl 9.5.3 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.5.2:";;
+     short | recursive ) echo "Configuration of girl 9.5.3:";;
    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.5.2
+girl configure 9.5.3
 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.5.2, which was
+It was created by girl $as_me 9.5.3, 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.5.2'
+ VERSION='9.5.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7475,7 +7475,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.5.2, which was
+This file was extended by girl $as_me 9.5.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7541,7 +7541,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.5.2
+girl config.status 9.5.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 2b7bd50..80cc7ed 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.5.2)
+AC_INIT(girl, 9.5.3)
 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 049b918..1ec2519 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -16,8 +16,10 @@ BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
+BuildRequires:  gstreamer-devel
 Requires:       totem >= 3.10.1
 Requires:       streamripper >= 1.64.6
+Requires:       gstreamer >= 0.10.36
 
 %description
 GNOME Internet Radio Locator (GIRL) is a program that allows the user
@@ -70,6 +72,10 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+
+* Sat Sep 24 2016 Ole Aamot - 9.5.3-1.fc23
+- Girl 9.5.3 build on Fedora Linux 23
+
 * Fri Sep 23 2016 Ole Aamot - 9.5.2-1.fc23
 - Girl 9.5.2 build on Fedora Linux 23
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e583dec..1540534 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
 girl_DATA = girl-9.5.dtd girl-logo.png girl.png girl.xml
 
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-program.h girl-runners.h 
girl-streams.h girl-9.5.dtd girl-map.png girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-program.h girl-runners.h 
girl-streams.h girl-9.5.dtd girl-map.png girl-logo.png girl.png girl.xml
 
 all-local: check-local
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 2e7a081..0da72dd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -406,7 +406,7 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
 girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
 girl_DATA = girl-9.5.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-program.h girl-runners.h 
girl-streams.h girl-9.5.dtd girl-map.png girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-program.h girl-runners.h 
girl-streams.h girl-9.5.dtd girl-map.png girl-logo.png girl.png girl.xml
 all: all-am
 
 .SUFFIXES:
diff --git a/src/girl-player-frontend.c b/src/girl-player-frontend.c
index eb9d4de..98b57b2 100644
--- a/src/girl-player-frontend.c
+++ b/src/girl-player-frontend.c
@@ -58,6 +58,7 @@ delete_event (GtkWidget *window,
               gpointer data)
 {
        g_message ("delete event occurred");
+       girl_player_backend_pause();
        return FALSE;
 }
 
diff --git a/src/girl.xml b/src/girl.xml
index 7d9adff..7fe707f 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -354,7 +354,7 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
     RadiOrakel is located at the Blitz House on Pilestredet 30E in Oslo. They broadcast daily from 1:00 p.m. 
to 7:00 p.m., and on Friday’s and Saturday’s from 9:00 a.m. to 7:00 p.m. on FM 99.3 in Oslo and surrounding 
areas.
 <!--    Since 1982 RadiOrakel has produced experimental journalism with the aim of educating women in 
radio-journalism and audio engineering. RadiOrakel has a minimum of 2 / 3 female members. RadiOrakel actively 
prioritizes and promotes women as both interviewers and interviewees, and also has a profile with at least 
50% of all music being performed by female performers / musicians. RadiOrakel also seeks to combat 
discrimination based on gender, race, religion and sexual orientation.-->
 <!--      Broadcasts are streamed over the Internet.--></description>
-    <stream mime="audio/mpeg" uri="http://stream.radionova.no/fm993.mp3"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <stream mime="audio/mpeg" uri="http://stream.radionova.no:80/mp3"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://radiorakel.no/</uri>
   </station>
   <station band="1560AM" id="kxsc" lang="en" name="KXSC" rank="1.0" type="edu">


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