[girl] Add girl 0.5 DTD, 4 new Internet radio stations and compile script.
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] Add girl 0.5 DTD, 4 new Internet radio stations and compile script.
- Date: Thu, 27 Nov 2014 16:41:31 +0000 (UTC)
commit a06253dc8f10d305354eadfe28b0584180ff960c
Author: Ole Aamot <oka oka no>
Date: Thu Nov 27 17:39:32 2014 +0100
Add girl 0.5 DTD, 4 new Internet radio stations and compile script.
ChangeLog | 14 +-
INSTALL | 4 +-
Makefile.in | 17 +-
NEWS | 13 +
aclocal.m4 | 1906 ----------------------------------------
compile | 347 ++++++++
config.h.in | 86 --
configure | 122 +++-
configure.ac | 2 +-
data/Makefile.in | 2 +-
data/icons/16x16/Makefile.in | 2 +-
data/icons/22x22/Makefile.in | 2 +-
data/icons/24x24/Makefile.in | 2 +-
data/icons/256x256/Makefile.in | 2 +-
data/icons/32x32/Makefile.in | 2 +-
data/icons/48x48/Makefile.in | 2 +-
data/icons/Makefile.in | 2 +-
data/pixmaps/Makefile.in | 2 +-
depcomp | 791 -----------------
install-sh | 527 -----------
missing | 215 -----
po/Makefile.in.in | 222 -----
src/Makefile.am | 4 +-
src/Makefile.in | 10 +-
src/girl-0.5.dtd | 17 +
src/stations.xml | 94 ++-
26 files changed, 584 insertions(+), 3825 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 301ac22..087be3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,16 @@
2014-11-27 Ole Aamot <oka oka no>
- * AUTHORS: Add Marek Černocký (Czech translation)
- * po/cs.po: Czech translation by Marek Černocký
-
+ * AUTHORS: Add Marek Černocký (Czech translation).
+ * AUTHORS: Add Rafael Ferreira (Brazilian Portuguese translation).
+ * NEWS: girl 0.4.1 released.
+ * po/cs.po: Czech translation by Marek Černocký.
+ * po/pt_BR.po: Brazilian Portuguese translation by Rafael Ferreira.
+ * src/girl-0.5.dtd: Add station type property.
+ * src/stations.xml: Add Cam FM (www.camfm.co.uk).
+ * src/stations.xml: Add Oxford Student Radio (oxideradio.co.uk).
+ * src/stations.xml: Add Pulse LSE (pulselse.co.uk).
+ * src/stations.xml: Add Radio UNAM (www.radiounam.unam.mx).
+
2014-11-22 Ole Aamot <oka oka no>
* NEWS: girl 0.4.0 released.
diff --git a/INSTALL b/INSTALL
index 007e939..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
+ Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
diff --git a/Makefile.in b/Makefile.in
index 6a11450..4b8dac7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -80,7 +80,7 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in $(srcdir)/girl.spec.in ABOUT-NLS COPYING \
- THANKS TODO config.rpath depcomp install-sh missing
+ THANKS TODO compile config.rpath depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/configure.ac
@@ -386,8 +386,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+ @test -f $@ || rm -f stamp-h1
+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
@@ -588,10 +588,16 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -633,9 +639,10 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
diff --git a/NEWS b/NEWS
index 105ea6c..a374cca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+2014-11-27 Ole Aamot <oka oka no>
+
+ * girl version 0.4.1 release
+ * AUTHORS: Add Marek Černocký (Czech translation)
+ * AUTHORS: Add Rafael Ferreira (Brazilian Portuguese translation)
+ * po/cs.po: Czech translation by Marek Černocký
+ * po/pt_BR.po: Brazilian Portuguese translation by Rafael Ferreira
+ * src/girl-0.5.dtd: Add station type property.
+ * src/stations.xml: Add Cam FM (www.camfm.co.uk).
+ * src/stations.xml: Add Oxford Student Radio (oxideradio.co.uk).
+ * src/stations.xml: Add Pulse LSE (pulselse.co.uk).
+ * src/stations.xml: Add Radio UNAM (www.radiounam.unam.mx).
+
2014-11-22 Ole Aamot <oka oka no>
* girl version 0.4.0 release
diff --git a/compile b/compile
new file mode 100755
index 0000000..531136b
--- /dev/null
+++ b/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey cygnus com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake gnu org> or send patches to
+# <automake-patches gnu org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake gnu org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/configure b/configure
index 406635c..4047068 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.4.0.
+# Generated by GNU Autoconf 2.69 for girl 0.4.1.
#
#
# 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.4.0'
-PACKAGE_STRING='girl 0.4.0'
+PACKAGE_VERSION='0.4.1'
+PACKAGE_STRING='girl 0.4.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1324,7 +1324,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.4.0 to adapt to many kinds of systems.
+\`configure' configures girl 0.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1390,7 +1390,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 0.4.0:";;
+ short | recursive ) echo "Configuration of girl 0.4.1:";;
esac
cat <<\_ACEOF
@@ -1489,7 +1489,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 0.4.0
+girl configure 0.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,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.4.0, which was
+It was created by girl $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2202,7 +2202,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.13'
+am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2717,7 +2717,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='0.4.0'
+ VERSION='0.4.1'
cat >>confdefs.h <<_ACEOF
@@ -2768,6 +2768,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes. So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+ cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present. This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake gnu org about your system, including the value
+of your $PATH and any error possibly output before this message. This
+can help us improve future automake versions.
+
+END
+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+ echo 'Configuration will proceed anyway, since you have set the' >&2
+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+ echo >&2
+ else
+ cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+ fi
+fi
ac_config_headers="$ac_config_headers config.h"
@@ -3561,6 +3602,65 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ # Make sure it works both with $CC and with simple cc.
+ # Following AC_PROG_CC_C_O, we do the test twice because some
+ # compilers refuse to overwrite an existing .o file with -o,
+ # though they will create one.
+ am_cv_prog_cc_c_o=yes
+ for am_i in 1 2; do
+ if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+ ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } \
+ && test -f conftest2.$ac_objext; then
+ : OK
+ else
+ am_cv_prog_cc_c_o=no
+ break
+ fi
+ done
+ rm -f core conftest*
+ unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__CC in this case,
+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+ CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -6450,7 +6550,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.4.0, which was
+This file was extended by girl $as_me 0.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6516,7 +6616,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.4.0
+girl config.status 0.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2c9aa9c..88c5ab5 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.4.0)
+AC_INIT(girl, 0.4.1)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
diff --git a/data/Makefile.in b/data/Makefile.in
index cc3acd4..9e68e3f 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index 1d4cfcc..a6ab746 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index 4dbc05d..cc8aa62 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index 74b358e..52a3a10 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/256x256/Makefile.in b/data/icons/256x256/Makefile.in
index a46d7c8..2776e08 100644
--- a/data/icons/256x256/Makefile.in
+++ b/data/icons/256x256/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index 3fc396e..92558b3 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/48x48/Makefile.in b/data/icons/48x48/Makefile.in
index 0438095..dfe2def 100644
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 7984001..0ae7e7a 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index 2d12b9d..2b6173e 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cb6296..4af4704 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,6 @@ bin_PROGRAMS = girl
girl_SOURCES = girl.c girl-gui.c girl-listener.c girl-station.c girl-canvas.c
girldir = $(datadir)/girl
-girl_DATA = listeners.xml stations.xml girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd listener-1.0.dtd
girl-logo.png girl.png
+girl_DATA = listeners.xml stations.xml girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd girl-0.5.dtd
listener-1.0.dtd girl-logo.png girl.png
-EXTRA_DIST = girl.h girl-gui.h girl-listener.h girl-station.h girl-canvas.h listeners.xml stations.xml
girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd listener-1.0.dtd girl-logo.png girl.png
+EXTRA_DIST = girl.h girl-gui.h girl-listener.h girl-station.h girl-canvas.h listeners.xml stations.xml
girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd girl-0.5.dtd listener-1.0.dtd girl-logo.png girl.png
diff --git a/src/Makefile.in b/src/Makefile.in
index 2f4973b..12a9213 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -309,8 +309,8 @@ AM_CFLAGS = $(GOAL_CFLAGS)
AM_LDFLAGS = $(GOAL_LIBS)
girl_SOURCES = girl.c girl-gui.c girl-listener.c girl-station.c girl-canvas.c
girldir = $(datadir)/girl
-girl_DATA = listeners.xml stations.xml girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd listener-1.0.dtd
girl-logo.png girl.png
-EXTRA_DIST = girl.h girl-gui.h girl-listener.h girl-station.h girl-canvas.h listeners.xml stations.xml
girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd listener-1.0.dtd girl-logo.png girl.png
+girl_DATA = listeners.xml stations.xml girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd girl-0.5.dtd
listener-1.0.dtd girl-logo.png girl.png
+EXTRA_DIST = girl.h girl-gui.h girl-listener.h girl-station.h girl-canvas.h listeners.xml stations.xml
girl-0.1.dtd girl-0.2.dtd girl-0.3.dtd girl-0.4.dtd girl-0.5.dtd listener-1.0.dtd girl-logo.png girl.png
all: all-am
.SUFFIXES:
@@ -409,14 +409,14 @@ distclean-compile:
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(COMPILE) -c $<
+ am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ am__fastdepCC_FALSE@ $(AM_V_CC am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
install-girlDATA: $(girl_DATA)
@$(NORMAL_INSTALL)
@list='$(girl_DATA)'; test -n "$(girldir)" || list=; \
diff --git a/src/girl-0.5.dtd b/src/girl-0.5.dtd
new file mode 100644
index 0000000..0a76228
--- /dev/null
+++ b/src/girl-0.5.dtd
@@ -0,0 +1,17 @@
+<!ELEMENT description ( #PCDATA ) >
+<!ELEMENT frequency ( #PCDATA ) >
+<!ATTLIST frequency uri CDATA #REQUIRED >
+<!ELEMENT location ( lat | lon )* >
+<!ELEMENT girl ( station+ ) >
+<!ATTLIST girl version NMTOKEN #REQUIRED >
+<!ELEMENT station ( description | frequency | location | stream | uri | rank | type)* >
+<!ATTLIST station id NMTOKEN #REQUIRED >
+<!ATTLIST station name CDATA #REQUIRED >
+<!ELEMENT stream EMPTY >
+<!ATTLIST stream bitrate NMTOKEN #REQUIRED >
+<!ATTLIST stream channels NMTOKEN #IMPLIED >
+<!ATTLIST stream mime CDATA #REQUIRED >
+<!ATTLIST stream samplerate NMTOKEN #REQUIRED >
+<!ATTLIST stream uri CDATA #REQUIRED >
+<!ATTLIST stream codec CDATA #REQUIRED >
+<!ELEMENT uri ( #PCDATA ) >
diff --git a/src/stations.xml b/src/stations.xml
index d50eebc..5f6079a 100644
--- a/src/stations.xml
+++ b/src/stations.xml
@@ -1,126 +1,140 @@
<?xml version="1.0"?>
-
-<!DOCTYPE girl SYSTEM "girl-0.4.dtd">
-
-<girl version="0.4">
-
- <station id="wxyc" name="WXYC" rank="1.0">
+<!DOCTYPE girl SYSTEM "girl-0.5.dtd">
+<girl version="0.5">
+ <station id="pulse" name="Pulse LSE" rank="1.0" type="edu">
+ <frequency uri="http://pulselse.co.uk/";>87.7 MHz FM in London, United Kingdom</frequency>
+ <location>London, United Kingdom</location>
+ <description>Pulse Radio is the official radio station of the London School of Economics and Political
Science Students’ Union. We are totally student run and are committed to bringing great radio broadcasting to
LSE students and beyond. We hope you tune in and enjoy!</description>
+ <stream mime="audio/mpeg" uri="http://s3.radioboss.fm:8223/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://pulselse.co.uk/</uri>
+ </station>
+ <station id="oxide" name="Oxford Student Radio" rank="1.0" type="edu">
+ <frequency uri="http://oxideradio.co.uk/";>107.9 MHz FM in Oxford, United Kingdom</frequency>
+ <location>Oxford, United Kingdom</location>
+ <description>Oxide Radio is a student radio station run by members of Oxford University in Oxford,
England.</description>
+ <stream mime="audio/mpeg" uri="http://listen.oxideradio.co.uk:8000/oxide-radio.m3u"; codec="MPEG 1 Audio,
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://oxideradio.co.uk/</uri>
+ </station>
+ <station id="camfm" name="Cam FM" rank="1.0" type="edu">
+ <frequency uri="http://www.camfm.co.uk/";>97.2 MHz FM in Cambridge, United Kingdom</frequency>
+ <location>Cambridge, United Kingdom</location>
+ <description>Originally founded in 1979, the award-winning Cam FM is now one of the most heavily
listened to student radio stations in the UK, as well as one of the largest student-run media organisations
in Cambridge, covering students at both Cambridge and Anglia Ruskin Universities. We know students because we
are students; every aspect of the station is professionally run by students, staff, and alumni of the
Universities - presenting, producing, or running the committee. Our content is primarily geared towards
engaging with the student community in Cambridge.</description>
+ <stream mime="audio/mpeg" uri="http://stream.camfm.co.uk/camfm"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://www.camfm.co.uk/</uri>
+ </station>
+ <station id="radiounam" name="Radio UNAM" rank="1.0" type="edu">
+ <frequency uri="http://www.radiounam.unam.mx/";>96.1 MHz FM in México City, México</frequency>
+ <location>México City, México</location>
+ <description>Radio Universidad Nacional Autónoma de México</description>
+ <stream mime="audio/mpeg"
uri="http://www.radiounam.unam.mx/templates/player/reproductor/CREA_FM/listen.m3u"; codec="MPEG 1 Audio, Layer
3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://www.radiounam.unam.mx/</uri>
+ </station>
+ <station id="wxyc" name="WXYC" rank="1.0" type="edu">
<frequency uri="http://www.wxyc.org/";>89.3 MHz FM in Chapel Hill, NC</frequency>
<location>Chapel Hill, NC</location>
<description>WXYC went on the air on March 17, 1977 with Joni Mitchell's "You Turn Me on I'm a Radio."
- WXYC was preceded by WCAR, a carrier current station that reached dorms on the UNC-Chapel Hill campus
through electrical wiring. The station's alumni include top 40 radio host Rick Dees.
+ WXYC was preceded by WCAR, a carrier current station that reached dorms on the UNC-Chapel Hill campus
through electrical wiring. The station's alumni include top 40 radio host Rick Dees.
+
+ When WCAR wanted to upgrade in the early 1970s, it decided to pursue an FM license and begin
broadcastin over the air rather than update the carrier current system. Funding for the change to FM was
provided by a student referendum passed in 1973. The physical conversion cost $35,000 and took two years to
complete.
- When WCAR wanted to upgrade in the early 1970s, it decided to pursue an FM license and begin broadcastin
over the air rather than update the carrier current system. Funding for the change to FM was provided by a
student referendum passed in 1973. The physical conversion cost $35,000 and took two years to complete.
+ The non-profit Student Educational Broadcasting, Inc. was established to serve as the official owner
of WXYC's broadcast license, and in 1977 WCAR became WXYC. The station was originally scheduled to begin
broadcasting in January 1977, but winter freezes prevented the installation of an antenna on UNC's water
tower delaying the broadcast until March.
- The non-profit Student Educational Broadcasting, Inc. was established to serve as the official owner of
WXYC's broadcast license, and in 1977 WCAR became WXYC. The station was originally scheduled to begin
broadcasting in January 1977, but winter freezes prevented the installation of an antenna on UNC's water
tower delaying the broadcast until March.
- From its earliest days in the late 70s, WXYC has been a leader in diverse and interesting programming,
adopting changing forms of popular music long before they became popular in the mainstream without losing
touch with the past. This coalesced in 1980 with the decision to achieve a delicate balance, avoiding the
extremes of both typical commercial (dull, repetitive, narrow) and typical college (difficult, elitist and
irritating) radio, by making the effort to find and broadcast the best and brightest of new music that was
inexplicably being ignored by commercial radio, while not forgetting the roots of that music in blues, jazz,
pop and other genres of music of the past half century. At the same time, WXYC became a 24 hour a day/ 365
day a year radio station with a commitment to be consistent in quality and reliable enough to set your clock
radio to.WXYC won many accolades and awards during the 80's and 90's from local as well as national sources,
including Rolling Ston
e Magazine, the New York Times and the Independent Weekly.
+ From its earliest days in the late 70s, WXYC has been a leader in diverse and interesting programming,
adopting changing forms of popular music long before they became popular in the mainstream without losing
touch with the past. This coalesced in 1980 with the decision to achieve a delicate balance, avoiding the
extremes of both typical commercial (dull, repetitive, narrow) and typical college (difficult, elitist and
irritating) radio, by making the effort to find and broadcast the best and brightest of new music that was
inexplicably being ignored by commercial radio, while not forgetting the roots of that music in blues, jazz,
pop and other types of music of the past half century. At the same time, WXYC became a 24 hour a day/ 365 day
a year radio station with a commitment to be consistent in quality and reliable enough to set your clock
radio to.WXYC won many accolades and awards during the 80's and 90's from local as well as national sources,
including Rolling Sto
ne Magazine, the New York Times and the Independent Weekly.
- In the early 90s, with the advent of the CD, many more international and independent releases became
easily available, as well as re-issues of albums that had been impossible to find on vinyl for decades. This
enabled WXYC to broaden its programming even more, and to this day the staff of WXYC is committed to seeking
out new and interesting sounds from all over the world and presenting them in a coherent, accessible and
interesting way.
+ In the early 90s, with the advent of the CD, many more international and independent releases became
easily available, as well as re-issues of albums that had been impossible to find on vinyl for decades. This
enabled WXYC to broaden its programming even more, and to this day the staff of WXYC is committed to seeking
out new and interesting sounds from all over the world and presenting them in a coherent, accessible and
interesting way.
- In 1994, the staff of UNC's SunSITE, the first Web site in North America, helped WXYC become the first
radio station in the world to stream its on-air signal live over the Internet. We're proud to have been at
the forefront of the Internet radio medium. We now have loyal listeners all over the world who contact us
with comments and requests by email and IM.
+ In 1994, the staff of UNC's SunSITE, the first Web site in North America, helped WXYC become the first
radio station in the world to stream its on-air signal live over the Internet. We're proud to have been at
the forefront of the Internet radio medium. We now have loyal listeners all over the world who contact us
with comments and requests by email and IM.
- WXYC alumni include ESPN anchor Stuart Scott, former Squirrel Nut Zipper Tom Maxwell, former Polvo
guitarist Dave Brylawski, Newsweek reporter Colin Soloway, film director Peyton Reed, as well as scores of
doctors, lawyers, writers, executives, and successful professionals of all kinds.</description>
+ WXYC alumni include ESPN anchor Stuart Scott, former Squirrel Nut Zipper Tom Maxwell, former Polvo
guitarist Dave Brylawski, Newsweek reporter Colin Soloway, film director Peyton Reed, as well as scores of
doctors, lawyers, writers, executives, and successful professionals of all kinds.</description>
<stream mime="audio/ogg" uri="http://www.wxyc.org/files/streams/wxyc-ogg.pls"; codec="Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
<stream mime="audio/mpeg" uri="http://wxyc.org/files/streams/wxyc-mp3.m3u"; codec="MPEG 1 Audio, Layer 3
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://www.wxyc.org/</uri>
</station>
-
- <station id="kalx" name="KALX" rank="1.0">
+ <station id="kalx" name="KALX" rank="1.0" type="edu">
<frequency uri="http://kalx.berkeley.edu/";>90.7 MHz FM in Berkeley, CA</frequency>
<location>Berkeley, CA</location>
<description>KALX 90.7 FM broadcasts freeform radio 24 hours a day to a large portion of the San
Francisco Bay Area. You can catch all stripes of underground music accented with news, sports and alternative
informational programming.
- KALX has a wonderfully dedicated staff of student and community volunteers who are willing to explore
with and educate their listeners. KALX is regular folks doing wild, unpredictable, extraordinary radio. All
of our programs are homespun, we don't depend on satellite feeds. Rather we create programs from, and for our
community (a community that includes both the University of California, Berkeley student population AND the
surrounding area).
+ KALX has a wonderfully dedicated staff of student and community volunteers who are willing to explore
with and educate their listeners. KALX is regular folks doing wild, unpredictable, extraordinary radio. All
of our programs are homespun, we don't depend on satellite feeds. Rather we create programs from, and for our
community (a community that includes both the University of California, Berkeley student population AND the
surrounding area).
- As part of our mission to educate, every KALX DJ is encouraged to play a variety of musical styles and
genres. Rather than segregating music into limited boxes, this philosophy is an attempt to entertain the
listener while broadening their musical experience. A pretty fun way to be educated, don't ya
think!</description>
+ As part of our mission to educate, every KALX DJ is encouraged to play a variety of musical styles and
types. Rather than segregating music into limited boxes, this philosophy is an attempt to entertain the
listener while broadening their musical experience. A pretty fun way to be educated, don't ya
think!</description>
<stream mime="audio/ogg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.ogg.m3u"; codec="Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<stream mime="audio/mpeg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.mp3.m3u"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://kalx.berkeley.edu/</uri>
</station>
-
- <station id="whrb" name="WHRB" rank="1.0">
+ <station id="whrb" name="WHRB" rank="1.0" type="edu">
<frequency uri="http://www.whrb.org/";>95.3 MHz FM in Boston, MA</frequency>
<location>Boston, MA</location>
<description>For seventy years, 95.3FM has been Boston's first source for exciting, entertaining, and
enlightening music broadcasts. Harvard Radio's daily broadcast of Classical music, Jazz, and underground Rock
explore a great repertoire of music left largely untouched by other commercial stations.</description>
<stream mime="audio/mpeg" uri="http://www.whrb.org/streams/whrb.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
<uri>http://www.whrb.org/</uri>
</station>
-
- <station id="nova" name="Radio NOVA" rank="1.0">
+ <station id="nova" name="Radio NOVA" rank="1.0" type="edu">
<frequency uri="http://radionova.no/";>99.3 MHz FM in Oslo, Norway</frequency>
<location>Oslo, Norway</location>
<description>Radio NOVA is the student radio of University of Oslo.</description>
<stream mime="audio/mpeg" uri="http://stream.radionova.no/mp3.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
<uri>http://radionova.no/</uri>
</station>
-
- <station id="wwno" name="WWNO" rank="1.0">
+ <station id="wwno" name="WWNO" rank="1.0" type="edu">
<frequency uri="http://wwno.org/";>89.9 MHz FM in New Orleans, LA</frequency>
<location>New Orleans, LA</location>
<description>WWNO is the NPR member station for New Orleans and the 13 parishes of southeast Louisiana,
broadcasting on 89.9 FM — and on KTLN 90.5 FM in the Houma-Thibodaux area — as a public service of the
University of New Orleans.</description>
<stream mime="audio/mpeg" uri="http://www.publicbroadcasting.net/wwno/ppr/wwno_128.m3u"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://wwno.org/</uri>
</station>
-
- <station id="ktru" name="KTRU" rank="1.0">
+ <station id="ktru" name="KTRU" rank="1.0" type="edu">
<frequency uri="http://ktru.org/";>99.1 MHz FM in Houston, TX</frequency>
<location>Houston, TX</location>
<description>KTRU Houston is Rice University's student-run radio station.</description>
<stream mime="audio/mpeg" uri="http://ktru.org/audiometa/listen3.m3u"; codec="MPEG 1 Audio, Layer 3
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://ktru.org/</uri>
</station>
-
- <station id="bbcworldservice" name="BBC World Service" rank="1.0">
+ <station id="bbcworldservice" name="BBC World Service" rank="1.0" type="gov">
<frequency uri="http://www.bbc.co.uk/worldservice/schedules/frequencies/";>Internet</frequency>
<location>London, United Kingdom</location>
<description>BBC World Service is an international news service available on radio, television and
online. It provides impartial news reports and analysis in English and 27 other languages. BBC World Service
aims to inspire and illuminate the lives of its audience by bringing the world together, making connections
and helping listeners to make sense of the world.</description>
<stream mime="audio/mpeg" uri="http://www.bbc.co.uk/worldservice/meta/live/mp3/eneuk.pls"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
<uri>http://www.bbc.co.uk/worldserviceradio</uri>
</station>
-
- <station id="nrkradioalltidnyheter" name="NRK Radio Alltid Nyheter" rank="1.0">
+ <station id="nrkradioalltidnyheter" name="NRK Radio Alltid Nyheter" rank="1.0" type="gov">
<frequency>93.0 MHz FM in Oslo, Norway</frequency>
<location>Oslo, Norway</location>
<description>The Norwegian Broadcasting Corporation (NRK) offers the Norwegian public a wide range of
content with three national TV-channels, 13 national radio-channels and the website nrk.no.</description>
<stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_alltid_nyheter_aac_h"; codec="AAC, v4 LC"
samplerate="48000 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://www.nrk.no/alltid_nyheter</uri>
</station>
-
- <station id="wkcr" name="WKCR" rank="1.0">
+ <station id="wkcr" name="WKCR" rank="1.0" type="edu">
<frequency>89.9 MHz FM in New York, NY</frequency>
<location>New York City, NY</location>
<description>WKCR-FM, Columbia University’s non-commercial student-run radio station, is dedicated to
presenting a spectrum of alternative programming—traditional and art music, spoken arts, and original
journalism. Granted its FCC license in 1941, WKCR is both steeped in tradition and committed to innovation.
In the New York area, the station can be heard at 89.9 megacycles in FM; worldwide, it streams
online.</description>
<stream mime="audio/mpeg" uri="http://kanga.college.columbia.edu:8000/listen.pls"; codec="MPEG 1 Audio,
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
<uri>http://www.studentaffairs.columbia.edu/wkcr/</uri>
</station>
-
- <station id="kzsu" name="KZSU" rank="1.0">
+ <station id="kzsu" name="KZSU" rank="1.0" type="edu">
<frequency>90.1 MHz FM in Stanford, CA</frequency>
<location>San Francisco, CA</location>
<description>KZSU is Stanford University's FM radio station, broadcasting across the Bay Area on 90.1 FM
and across the world at kzsulive.stanford.edu. We exist to serve the Stanford community with quality radio
broadcasts, including music, sports, news, and public affairs programming.
-The station is owned by the Board of Trustees of Stanford University and is governed by a Board of Directors
appointed by the President. We got our FM license in 1964, and upgraded from 10 to 500 watts in 1978. Before
1964, KZSU broadcast as an AM carrier current station (through the University's power supply) on 880 kHz,
starting in 1947 as a part of the Department of Communication.
+ The station is owned by the Board of Trustees of Stanford University and is governed by a Board of
Directors appointed by the President. We got our FM license in 1964, and upgraded from 10 to 500 watts in
1978. Before 1964, KZSU broadcast as an AM carrier current station (through the University's power supply) on
880 kHz, starting in 1947 as a part of the Department of Communication.
-KZSU is a non-commercial station funded mainly by Stanford student fees, in addition to underwriting and
listener donations. KZSU's staff is all volunteer, made up of Stanford students, staff, alumni, and community
affiliates.</description>
+ KZSU is a non-commercial station funded mainly by Stanford student fees, in addition to underwriting
and listener donations. KZSU's staff is all volunteer, made up of Stanford students, staff, alumni, and
community affiliates.</description>
<stream mime="audio/mpeg" uri="http://kzsulive.stanford.edu/audio/kzsu-1-128.m3u"; codec="MPEG 1 Audio,
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://kzsulive.stanford.edu/</uri>
</station>
-
- <station id="wmbr" name="WMBR" rank="1.0">
+ <station id="wmbr" name="WMBR" rank="1.0" type="edu">
<frequency>88.1 MHz FM in Cambridge, MA</frequency>
<location>Boston, MA</location>
<description>WMBR is the MIT campus radio station. We broadcast on 88.1 FM between 20 and 24 hours per
day, 365 days a year. We transmit at 720 watts, effective radiated power from the top of the Eastgate
Building in Kendall Square in Cambridge, Massachusetts. Our programming includes a wide range of music shows,
public affairs programs and eclectic audio entertainment.</description>
<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 id="kexp" name="KEXP" rank="1.0">
+ <station id="kexp" name="KEXP" rank="1.0" type="edu">
<frequency>90.9 MHz FM in Seattle, WA</frequency>
<location>Seattle, WA</location>
<description>KEXP is a service of the University of Washington, who holds the station’s FCC license. As
a 501(c)3 non-profit arts organization, KEXP relies on investments from individual, foundation, business, and
government supporters.</description>
<stream mime="audio/mpeg" uri="http://live-mp3-128.kexp.org:8000/listen.pls"; codec="MPEG 1 Audio, Layer
3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://kexp.org/</uri>
</station>
-
</girl>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
