GNOME.org
 

[girl] girl version 0.7.3

commit 06108e15f1be2c0192413f305933cc7470c9ae8d
Author: Ole Aamot <oka oka no>
Date:   Sun Dec 14 18:58:33 2014 +0100

    girl version 0.7.3

 ChangeLog          |    6 ++++++
 NEWS               |    6 ++++++
 NEWS-0.7           |    9 +++++++++
 README             |   25 ++++++++++++++++++-------
 configure          |   20 ++++++++++----------
 configure.ac       |    2 +-
 girl.spec.in       |   12 ++++++++----
 man/Makefile       |   26 +++++++++++++-------------
 src/girl-station.c |    5 ++++-
 src/stations.xml   |   18 ++++++++++++++++++
 10 files changed, 93 insertions(+), 36 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ac4cb95..f900188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-12-14  Ole Aamot  <oka oka no>
 
+       * NEWS: girl version 0.7.3 release
+       * src/stations.xml: Add CJSW (cjsw.com)
+       * src/stations.xml: Add Caper Radio (caperradio.ca)
+
+2014-12-14  Ole Aamot  <oka oka no>
+
        * NEWS: girl version 0.7.2 "Don't shoot" release
        * po/pl.po: Updated Polish translation by Piotr Drąg
        * src/stations.xml: Add WAMU (wamu.org)
diff --git a/NEWS b/NEWS
index d92be8c..b2a5f0b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 2014-12-14  Ole Aamot  <oka oka no>
 
+       * NEWS: girl version 0.7.3 release
+       * src/stations.xml: Add CJSW (cjsw.com)
+       * src/stations.xml: Add Caper Radio (caperradio.ca)
+
+2014-12-14  Ole Aamot  <oka oka no>
+
        * NEWS: girl version 0.7.2 "Don't shoot" release
        * po/pl.po: Updated Polish translation by Piotr Drąg
        * src/stations.xml: Add WAMU (wamu.org)
diff --git a/NEWS-0.7 b/NEWS-0.7
index 4aab14f..c4abe56 100644
--- a/NEWS-0.7
+++ b/NEWS-0.7
@@ -1,4 +1,13 @@
 =============
+Version 0.7.3
+=============
+
+Stations (src/stations.xml):
+
+       * src/stations.xml: Add CJSW (cjsw.com)
+       * src/stations.xml: Add Caper Radio (caperradio.ca)
+
+=============
 Version 0.7.2
 =============
 
diff --git a/README b/README
index 8c8fe7d..8a90f39 100644
--- a/README
+++ b/README
@@ -1,14 +1,25 @@
-GIRL 0.2 notes
 ==============
+GIRL 0.7 notes
+==============
+
+GIRL is a GNOME Internet Radio Locator program that allows the user
+to easily find and record live radio programs on radio broadcasters
+on the Internet.
+
+GIRL is developed for the GNOME desktop and requires one audio helper
+such as Totem (https://developer.gnome.org/totem/) to be installed for
+playback and streamripper (http://streamripper.sourceforge.net/) to be
+installed for recording live radio streams of supported radio stations
+(http://girl.software/stations.xml)
 
-GIRL is a GNOME Internet Radio Locator program that allow users
-to easily find live radio programs on radio broadcasters on the
-Internet.
+A user without root on a GNOME desktop can add his or her personal
+Stations in $HOME/.girl/stations.xml
 
-GIRL is developed on the new GNOME 2.0 platform and it requires
-at least one audio helper to be installed.
+If a user starts the program and exits the program, then the last radio
+station that the user was listening to, appears selected in the Stations
+list.  The default girl Stations setting is stored in $HOME/.gnome2/girl
 
 Enjoy Internet Radio.
 
 Cheers,
-Ole Aamot <ole gnu org>
+Ole Aamot <ole src gnome org>
diff --git a/configure b/configure
index 3aa05fc..7dff109 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 0.7.2.
+# Generated by GNU Autoconf 2.69 for girl 0.7.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='0.7.2'
-PACKAGE_STRING='girl 0.7.2'
+PACKAGE_VERSION='0.7.3'
+PACKAGE_STRING='girl 0.7.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 0.7.2 to adapt to many kinds of systems.
+\`configure' configures girl 0.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1395,7 +1395,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 0.7.2:";;
+     short | recursive ) echo "Configuration of girl 0.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1499,7 +1499,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 0.7.2
+girl configure 0.7.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1864,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 0.7.2, which was
+It was created by girl $as_me 0.7.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2727,7 +2727,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='0.7.2'
+ VERSION='0.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6707,7 +6707,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 0.7.2, which was
+This file was extended by girl $as_me 0.7.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6773,7 +6773,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 0.7.2
+girl config.status 0.7.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a66c303..cd3e4a6 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, 0.7.2)
+AC_INIT(girl, 0.7.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 2147f18..928c61f 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -16,12 +16,13 @@ Requires: streamripper >= 1.64.6
 BuildRequires: gtk2-devel libgnome-devel libxml2-devel gnome-vfs2-devel libgnomeui-devel intltool
 
 %description
-Girl is a GNOME Internet Radio Locator program that allows users
-to easily find live radio programs on radio broadcasters on the
-Internet.
+Girl is a GNOME Internet Radio Locator program that allows the user
+to easily find and record live radio programs on radio broadcasters
+on the Internet.
 
 Girl is developed on the GNOME platform and it requires at least
-one audio helper such as Totem to be installed.
+one audio player such as Totem to be installed for playback and
+streamripper for recording.
 
 Enjoy Internet Radio.
 
@@ -72,6 +73,9 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man1/girl.1.gz
 
 %changelog
+* Sun Dec 14 2014 Ole Aamot - 0.7.3-1
+- Girl 0.7.3 build on Fedora Linux 21
+
 * Sun Dec 14 2014 Ole Aamot - 0.7.2-1
 - Girl 0.7.2 build on Fedora Linux 21
 
diff --git a/man/Makefile b/man/Makefile
index 7e524e6..22338b7 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -138,13 +138,13 @@ NROFF = nroff
 MANS = $(man_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/oka/girl/missing aclocal-1.14
+ACLOCAL = ${SHELL} /home/oka/git/gnome/girl/missing aclocal-1.14
 ALL_LINGUAS = 
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
-AUTOCONF = ${SHELL} /home/oka/girl/missing autoconf
-AUTOHEADER = ${SHELL} /home/oka/girl/missing autoheader
-AUTOMAKE = ${SHELL} /home/oka/girl/missing automake-1.14
+AUTOCONF = ${SHELL} /home/oka/git/gnome/girl/missing autoconf
+AUTOHEADER = ${SHELL} /home/oka/git/gnome/girl/missing autoheader
+AUTOMAKE = ${SHELL} /home/oka/git/gnome/girl/missing automake-1.14
 AWK = gawk
 CATALOGS = 
 CATOBJEXT = .gmo
@@ -191,7 +191,7 @@ LDFLAGS =
 LIBOBJS = 
 LIBS = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/oka/girl/missing makeinfo
+MAKEINFO = ${SHELL} /home/oka/git/gnome/girl/missing makeinfo
 MKDIR_P = /usr/bin/mkdir -p
 MKINSTALLDIRS = ./mkinstalldirs
 MSGFMT = /usr/bin/msgfmt
@@ -201,10 +201,10 @@ OBJEXT = o
 PACKAGE = girl
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = girl
-PACKAGE_STRING = girl 0.7.2
+PACKAGE_STRING = girl 0.7.3
 PACKAGE_TARNAME = girl
 PACKAGE_URL = 
-PACKAGE_VERSION = 0.7.2
+PACKAGE_VERSION = 0.7.3
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
@@ -217,12 +217,12 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = 
 USE_NLS = yes
-VERSION = 0.7.2
+VERSION = 0.7.3
 XGETTEXT = /usr/bin/xgettext
-abs_builddir = /home/oka/girl/man
-abs_srcdir = /home/oka/girl/man
-abs_top_builddir = /home/oka/girl
-abs_top_srcdir = /home/oka/girl
+abs_builddir = /home/oka/git/gnome/girl/man
+abs_srcdir = /home/oka/git/gnome/girl/man
+abs_top_builddir = /home/oka/git/gnome/girl
+abs_top_srcdir = /home/oka/git/gnome/girl
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -241,7 +241,7 @@ host_alias =
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/oka/girl/install-sh
+install_sh = ${SHELL} /home/oka/git/gnome/girl/install-sh
 intltool__v_merge_options_ = $(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))
 intltool__v_merge_options_0 = -q
 libdir = ${exec_prefix}/lib
diff --git a/src/girl-station.c b/src/girl-station.c
index c94ac67..a4c6087 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -348,7 +348,7 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
                            xmlNodeListGetString(doc, sub->xmlChildrenNode,
                                                 1);
                        MSG("station->location = %s\n", station->location);
-                       fprintf(stdout, "%s (%s), ", station->name, station->location); 
+
                }
 
                if ((!xmlStrcmp
@@ -364,6 +364,7 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
                            xmlNodeListGetString(doc, sub->xmlChildrenNode,
                                                 1);
                        MSG("station->uri = %s\n", station->uri);
+                       /* fprintf(stdout, "%s (%s)\n%s\n\n", station->name, station->location, 
station->uri); */
                }
 
                if ((!xmlStrcmp(sub->name, (const xmlChar *) "stream"))) {
@@ -393,6 +394,8 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
                        MSG("station->stream->uri = %s\n",
                            station->stream->uri);
 
+                       /* fprintf(stdout, "%s (%s)\n%s\n\n, ", station->name, station->location, 
station->stream->uri); */
+                       
                        chans = xmlGetProp(sub, "channels");
 
                        if (chans != NULL) {
diff --git a/src/stations.xml b/src/stations.xml
index efa8aa4..10486b5 100644
--- a/src/stations.xml
+++ b/src/stations.xml
@@ -1,6 +1,24 @@
 <?xml version="1.0"?>
 <!DOCTYPE girl SYSTEM "girl-0.7.dtd">
 <girl version="0.7">
+  <station id="cjsw" name="CJSW" rank="1.0" type="edu" release="90.9" lang="en">
+    <frequency uri="http://cjsw.com/";></frequency>
+    <location>Calgary, Canada</location>
+    <description>CJSW 90.9 FM will be celebrating 30 years of on air radio programming at the beginning of 
2015. Our goal is to provide an alternative to commercial media by recognizing and promoting the diverse 
musical styles, points of view and cultures that exist within our city. CJSW strives to provide programming 
to an audience and by programmers that are varied in their ethnicity, culture, gender, sexual orientation, 
age, and physical and mental ability. Our diverse programming includes music, arts, spoken word and 
multicultural programs.</description>
+    <stream mime="audio/mpeg" uri="http://stream.cjsw.com/cjsw.mp3.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+  </station>
+  <station id="caper" name="Caper Radio" rank="1.0" type="edu" release="pending" lang="en">
+    <frequency uri="http://caperradio.ca/";>Pending FM license in Sydney, Nova Scotia, Canada</frequency>
+    <location>Sydney, Nova Scotia, Canada</location>
+    <description>Caper Radio Incorporated is CBU's campus radio station!
+
+    Located in the Students' Union building we are equipped with an ever-growing music collection of over 
6000 CDs on a digital library. We offer some of the best independent music in Canada. Caper Radio is also a 
prime resource for information on events taking place both on and off campus.
+
+    Being involved with Caper Radio, Inc. helps students gain new skills (in communication, as well as 
working with the equipment), build confidence, and make new friends. Taking part in shaping the university 
community, and building valuable job skills – It's a lot of fun too!
+
+    Caper Radio broadcasts from 9:30am until 4:30pm Monday - Friday. Repeat broadcasts can be heard by 
visiting our website.</description>
+    <stream mime="audio/mpeg" uri="http://142.12.32.15:8000/stream.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+  </station>
   <station id="wxou" name="WXOU" rank="1.0" type="edu" release="88.3" lang="en">
     <frequency uri="http://wxou.org/";>88.3 FM in Rochester, MI</frequency>
     <location>Rochester, MI</location>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]