GNOME.org
 

[girl] GNOME Internet Radio Locator version 8.0.0

commit 716f46e20479a897d486c445b8780c913e8afce4
Author: Ole Aamot <oka oka no>
Date:   Sun Jan 17 00:40:11 2016 +0100

    GNOME Internet Radio Locator version 8.0.0

 BROADCAST       |    2 +-
 NEWS            |    9 +++++++++
 configure       |   21 +++++++++++----------
 configure.ac    |    5 +++--
 girl.spec.in    |    3 +++
 src/Makefile.am |    4 ++--
 src/Makefile.in |    4 ++--
 src/girl-gui.c  |   28 ++++++++++++++++++++++++++--
 src/girl.xml    |    9 +++++++++
 9 files changed, 66 insertions(+), 19 deletions(-)
---
diff --git a/BROADCAST b/BROADCAST
index faeb759..7458bea 100644
--- a/BROADCAST
+++ b/BROADCAST
@@ -33,4 +33,4 @@ Publishers (ASCAP), Broadcast Music, Inc. (BMI), and Society of
 European Stage Authors and Composers (SESAC).
 
 Enjoy Internet radio,
-Ole Aamot, Oslo, January 3nd, 2016
+Ole Aamot, Oslo, January 16th, 2016
diff --git a/NEWS b/NEWS
index a6597e4..853a317 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
 =============
+Version 8.0.0
+=============
+
+Stations
+
+       * src/girl.xml: Add WNYC (New York City, NY)
+       * src/girl-gui.c: New default station: New York Public Radio (WNYC)
+
+=============
 Version 7.0.0
 =============
 
diff --git a/configure b/configure
index 89a34bb..054fe1e 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 7.0.0.
+# Generated by GNU Autoconf 2.69 for girl 8.0.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='7.0.0'
-PACKAGE_STRING='girl 7.0.0'
+PACKAGE_VERSION='8.0.0'
+PACKAGE_STRING='girl 8.0.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 7.0.0 to adapt to many kinds of systems.
+\`configure' configures girl 8.0.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 7.0.0:";;
+     short | recursive ) echo "Configuration of girl 8.0.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 7.0.0
+girl configure 8.0.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 7.0.0, which was
+It was created by girl $as_me 8.0.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='7.0.0'
+ VERSION='8.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4458,6 +4458,7 @@ else
 $as_echo "yes" >&6; }
 
 fi
+
 GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
 
 
@@ -7456,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 7.0.0, which was
+This file was extended by girl $as_me 8.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7522,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 7.0.0
+girl config.status 8.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ffd74b2..f71bd3e 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, 7.0.0)
+AC_INIT(girl, 8.0.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
@@ -49,12 +49,13 @@ AC_SUBST([HAVE_GIRL_RECORD])
 AC_CHECK_LIB(m, pow, [], [], [])
 
 PKG_CHECK_MODULES(GIRL,
-                  gtk+-2.0 >= 2.0 \
+                 gtk+-2.0 >= 2.0 \
                  glib-2.0 >= 2.0 \
                  libgnome-2.0 >= 2.0 \
                  libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
                  gnome-vfs-2.0 >= 2.0)
+
 GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0"
 
 GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
diff --git a/girl.spec.in b/girl.spec.in
index 105d30d..9bf1237 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -68,6 +68,9 @@ fi
 %{_datadir}/help/*/%{name}/*
 
 %changelog
+* Sat Jan 16 2016 Ole Aamot - 8.0.0-1.fc23
+- Girl 8.0.0 build on Fedora Linux 23
+
 * Sun Jan 03 2016 Ole Aamot - 7.0.0-1.fc23
 - Girl 7.0.0 build on Fedora Linux 23
 
diff --git a/src/Makefile.am b/src/Makefile.am
index d6478b0..23cdd00 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,9 @@ girl_CFLAGS  = $(GIRL_CFLAGS) \
 girl_LDADD = $(GIRL_LIBS)
 
 girldir = $(datadir)/girl
-girl_DATA = girl-7.0.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-8.0.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-program.h 
girl-runners.h girl-streams.h girl-7.0.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-program.h 
girl-runners.h girl-streams.h girl-8.0.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 b172b8c..762a076 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -400,8 +400,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
 
 girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
-girl_DATA = girl-7.0.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-program.h 
girl-runners.h girl-streams.h girl-7.0.dtd girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-8.0.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-program.h 
girl-runners.h girl-streams.h girl-8.0.dtd girl-map.png girl-logo.png girl.png girl.xml
 all: all-am
 
 .SUFFIXES:
diff --git a/src/girl-gui.c b/src/girl-gui.c
index 2321824..86b7ffe 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -2,7 +2,7 @@
  *
  * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015  Ole Aamot Software
+ * Copyright (C) 2014, 2015, 2016  Ole Aamot Software
  *
  * Author: Ole Aamot <oka oka no>
  *
@@ -41,7 +41,6 @@
 /* #include <libgnome/gnome-desktop-item.h> */
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-
 #include "girl.h"
 #include "girl-gui.h"
 #include "girl-program.h"
@@ -1003,6 +1002,15 @@ GtkWidget *create_girl_app()
        girl->selected_station_description =
            gnome_config_get_string("selected_station_description=");
 
+       girl->selected_station_name =
+           gnome_config_get_string("selected_station_name=");
+       girl->selected_station_location =
+           gnome_config_get_string("selected_station_location=");
+       girl->selected_station_band =
+           gnome_config_get_string("selected_station_band=");
+       girl->selected_station_description =
+           gnome_config_get_string("selected_station_description=");
+
        GIRL_DEBUG_MSG("girl->selected_station_uri: %s\n",
               girl->selected_station_uri);
        GIRL_DEBUG_MSG("girl->selected_station_name: %s\n",
@@ -1014,6 +1022,22 @@ GtkWidget *create_girl_app()
        GIRL_DEBUG_MSG("girl->selected_station_description: %s\n",
               girl->selected_station_description);
 
+       if (strcmp(girl->selected_station_uri,"")==0) {
+               girl->selected_station_uri = g_strdup("http://www.wnyc.org/stream/wnyc-fm939/mp3.pls";);
+       }
+       if (strcmp(girl->selected_station_name,"")==0) {
+               girl->selected_station_name = g_strdup("WNYC");
+       }
+       if (strcmp(girl->selected_station_location,"")==0) {
+               girl->selected_station_location = g_strdup("New York City, NY");
+       }
+       if (strcmp(girl->selected_station_band,"")==0) {
+               girl->selected_station_band = g_strdup("ONLINE");
+       }
+       if (strcmp(girl->selected_station_description,"")==0) {
+               girl->selected_station_description = g_strdup("WNYC 93.9 FM and AM 820 are New York's 
flagship public radio stations, broadcasting the finest programs from NPR, American Public Media, Public 
Radio International and the BBC World Service, as well as a wide range of award-winning local programming.");
+       }
+
        girl->selected_streams_uri =
                gnome_config_get_string("selected_streams_uri=");
        girl->selected_streams_mime =
diff --git a/src/girl.xml b/src/girl.xml
index c4afe45..5fc79d4 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -651,4 +651,13 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <stream mime="audio/mpeg" uri="http://wmbr.org/WMBR_live_128.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://wmbr.org/</uri>
   </station>
+  <station band="93.9FM" id="wnyc" lang="en" name="WNYC" rank="1.0" type="org">
+    <frequency uri="http://www.wnyc.org/";>93.9 FM in New York City, NY</frequency>
+    <location>New York City, NY</location>
+    <description lang="en">
+      WNYC 93.9 FM and AM 820 are New York's flagship public radio stations, broadcasting the finest 
programs from NPR, American Public Media, Public Radio International and the BBC World Service, as well as a 
wide range of award-winning local programming.
+    </description>
+    <stream mime="audio/mpeg" uri="http://www.wnyc.org/stream/wnyc-fm939/mp3.pls"; codec="MPEG 1 Audio, Layer 
3 (MP3)" samplerate="24000 Hz" channels="Mono" bitrate="32 kbps" />
+    <uri>http://www.wnyc.org/</uri>
+  </station>
 </girl>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]