[gnome-internet-radio-locator] gnome-internet-radio-locator version 1.7.0

From: Ole Aamot <ole src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-internet-radio-locator] gnome-internet-radio-locator version 1.7.0
Date: Mon, 28 Jan 2019 02:12:51 +0000 (UTC)
commit 309ad5b6e7a974be769d7fd1ea625c3ff26c0d3f
Author: Ole Aamot <ole gnome org>
Date:   Mon Jan 28 03:12:01 2019 +0100

    gnome-internet-radio-locator version 1.7.0

 BROADCAST                                       | 22 ++++++------
 DEBIAN                                          | 11 +++---
 FEDORA                                          | 30 ++++------------
 HACKING                                         | 12 +++----
 Makefile.am                                     |  2 ++
 NEWS                                            | 48 +++++++++++++++++++++++++
 README                                          | 16 +++++----
 TODO                                            | 10 +++++-
 UBUNTU                                          |  7 ++++
 compile                                         | 11 +++---
 configure.ac                                    |  2 +-
 gnome-internet-radio-locator.doap               |  4 +--
 gnome-internet-radio-locator.spec.in            | 15 ++++----
 src/gnome-internet-radio-locator-gui.c          |  6 ++--
 src/gnome-internet-radio-locator-keys.h         |  4 +--
 src/gnome-internet-radio-locator-listener.h     |  4 +--
 src/gnome-internet-radio-locator-markers.c      | 24 +++++++++++--
 src/gnome-internet-radio-locator-markers.h      | 22 ++++++++++++
 src/gnome-internet-radio-locator-player.h       |  4 +--
 src/gnome-internet-radio-locator-program.h      |  4 +--
 src/gnome-internet-radio-locator-radius.c       |  4 +--
 src/gnome-internet-radio-locator-radius.h       |  4 +--
 src/gnome-internet-radio-locator-runners.h      |  4 +--
 src/gnome-internet-radio-locator-station.c      |  4 +--
 src/gnome-internet-radio-locator-station.h      |  4 +--
 src/gnome-internet-radio-locator-stations-map.h |  4 +--
 src/gnome-internet-radio-locator-streams.h      |  4 +--
 src/gnome-internet-radio-locator-tz.c           |  4 +--
 src/gnome-internet-radio-locator-tz.h           |  4 +--
 src/gnome-internet-radio-locator.c              |  8 ++---
 src/gnome-internet-radio-locator.h              |  4 +--
 src/gnome-internet-radio-locator.xml            |  8 ++---
 32 files changed, 204 insertions(+), 110 deletions(-)
---
diff --git a/BROADCAST b/BROADCAST
index d8a5735..f9c0e87 100644
--- a/BROADCAST
+++ b/BROADCAST
@@ -6,8 +6,8 @@ and https://www.dnalounge.com/backstage/webcasting.html).
 
 See http://www.icecast.org/ for a free streaming server by Xiph.org.
 
-The radio stations in GNOME Internet Radio Locator for GNOME 3 are
-non-profit stations serving the public interest.
+The radio stations in GNOME Internet Radio Locator are non-profit
+stations serving the public interest.
 
 The power of the Federal Communications Commission (F.C.C.) reside in
 its authority of granting broadcast licenses to local radio stations,
@@ -23,14 +23,14 @@ Knowledge (ISBN 0-312-37659-6):
   came from its ability to revoke, or refuse to renew, the license of
   a local station -- something that has happened rarely.
 
-With GNOME Internet Radio Locator for GNOME 3, you can listen for
-free to live broadcasts by radio stations from all around the world,
-including the U.S. stations as long as the U.S. radio stations aren't
-revoked by the F.C.C. for failing to pay the royalty fees for the
-music that the radio stations broadcast on the Internet to the royalty
-fee collection agencies such as The American Society of Composers,
-Authors and Publishers (ASCAP), Broadcast Music, Inc. (BMI), and
-Society of European Stage Authors and Composers (SESAC).
+With GNOME Internet Radio Locator, you can listen for free to live
+broadcasts by radio stations from all around the world, including the
+U.S. stations as long as the U.S. radio stations aren't revoked by the
+F.C.C. for failing to pay the royalty fees for the music that the
+radio stations broadcast on the Internet to the royalty fee collection
+agencies such as The American Society of Composers, Authors and
+Publishers (ASCAP), Broadcast Music, Inc. (BMI), and Society of
+European Stage Authors and Composers (SESAC).
 
 Enjoy Free Internet radio,
-Ole Aamot, March 26th 2018
+Ole Aamot, January 28th 2019
diff --git a/DEBIAN b/DEBIAN
index 28ba92c..67cea31 100644
--- a/DEBIAN
+++ b/DEBIAN
@@ -1,6 +1,7 @@
-GNOME Internet Radio Locator for GNOME 3 compiles and runs on Debian
-GNU/Linux (http://www.debian.org/).
+GNOME Internet Radio Locator compiles and runs on Debian GNU/Linux.
 
-If you are packaging GNOME Internet Radio Locator for GNOME 3 for
-Debian GNU/Linux and/or other GNU/Linux distributions, please
-coordinate this with ole gnome org.
+See http://www.gnome.org/~ole/debian/ for i386 packages.
+
+If you are packaging GNOME Internet Radio Locator for Debian
+and/or other GNU/Linux distributions, please coordinate this
+with ole gnome org.
diff --git a/FEDORA b/FEDORA
index 3eb8ee7..2250ec2 100644
--- a/FEDORA
+++ b/FEDORA
@@ -1,23 +1,7 @@
-You can install gnome-internet-radio-locator on Fedora 27 on x86_64 as root:
-dnf update
-dnf install gcc
-dnf install gnome-common
-dnf install gtk3-devel
-dnf install pango
-dnf install libchamplain-devel
-dnf install libxml2-devel
-dnf install intltool
-dnf install itstool
-dnf install libappstream-glib
-dnf install desktop-file-utils
-dnf install geocode-glib-devel
-dnf install gstreamer1-plugins-bad-free-devel gstreamer1-plugins-ugly-free
-dnf install gstreamer1-plugins-base-devel
-dnf install gstreamer1 gstreamer-devel 
-dnf install geocode-glib
-dnf install gsettings-desktop-schemas-devel
-dnf install gtk-doc rpm-build
-./autogen.sh && make distcheck && mkdir -p $HOME/rpmbuild/SOURCES/ && mkdir -p $HOME/rpmbuild/SPECS/
-cp *.tar.xz $HOME/rpmbuild/SOURCES/ && cp gnome-internet-radio-locator.spec $HOME/rpmbuild/SPECS/
-rpmbuild -ba $HOME/rpmbuild/SPECS/gnome-internet-radio-locator.spec
-rpm -Uvh $HOME/rpmbuild/RPMS/x86_64/gnome-internet-radio-locator*.rpm
+GNOME Internet Radio Locator compiles and runs on Fedora.
+
+See http://www.gnome.org/~ole/fedora/ for x86_64 packages.
+
+If you are packaging GNOME Internet Radio Locator for Fedora
+and/or other GNU/Linux distributions, please coordinate this
+with ole gnome org.
diff --git a/HACKING b/HACKING
index 19e0e04..bb4fed6 100644
--- a/HACKING
+++ b/HACKING
@@ -1,6 +1,6 @@
-GNOME Internet Radio Locator for GNOME 3 is currently available as a
-GNOME 3 desktop program with source code released under GNU General
-Public License version 3.
+GNOME Internet Radio Locator is currently available as a GNOME desktop
+program with source code released under GNU General Public License
+version 3.
 
 The initial work on this Free Software program began in March 2017
 and the work continues in 2018.
@@ -17,9 +17,9 @@ The Wiki page is available at
 
     https://wiki.gnome.org/Apps/InternetRadioLocator
 
-You are welcome to contribute to the GNOME Internet Radio Locator for
-GNOME 3 code base either by translating it into your language and
-contributing patches and adding new Internet radio stations in
+You are welcome to contribute to the GNOME Internet Radio Locator code
+base either by translating it into your language and contributing
+patches and adding new Internet radio stations in
 
     src/gnome-internet-radio-locator.xml
 
diff --git a/Makefile.am b/Makefile.am
index 73334e1..184be82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,12 +8,14 @@ EXTRA_DIST = m4/ChangeLog  \
        BROADCAST \
        DEBIAN \
        EFF \
+       FEDORA \
        HACKING \
        Makefile \
        NEWS \
        README \
        THANKS \
        TODO \
+       UBUNTU \
        gnome-internet-radio-locator.spec.in
 
 DISTCLEANFILES =                \
diff --git a/NEWS b/NEWS
index 2aada58..411b2c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,51 @@
+=============
+Version 1.7.0
+=============
+
+Build
+
+       * gnome-internet-radio-locator.spec.in: Remove "for GNOME 3"
+
+DOAP
+
+       * gnome-internet-radio-locator.doap: Update description
+
+Documentation
+
+       * BROADCAST: Remove "for GNOME 3"
+       * DEBIAN: Add i386 package url
+       * FEDORA: Add x86_64 package url
+       * HACKING: Remove "for GNOME 3"
+       * NEWS: Remove "for GNOME 3"
+       * README: Remove "for GNOME 3"
+       * TODO: Remove "for GNOME 3"
+       * UBUNTU: Add amd64 package url
+
+GUI
+
+       * src/gnome-internet-radio-locator-gui.c: Update year and copyright holder
+       * src/gnome-internet-radio-locator-keys.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-listener.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-markers.c: Update marker for Moscow
+       * src/gnome-internet-radio-locator-markers.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-player.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-program.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-radius.c: Update year and copyright holder
+       * src/gnome-internet-radio-locator-radius.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-runners.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-station.c: Update year and copyright holder
+       * src/gnome-internet-radio-locator-station.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-stations-map.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-streams.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator-tz.c: Update year and copyright holder
+       * src/gnome-internet-radio-locator-tz.h: Update year and copyright holder
+       * src/gnome-internet-radio-locator.c: Update year and copyright holder
+       * src/gnome-internet-radio-locator.h: Update year and copyright holder
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Update Echo Moscow (Эхо Москвы)
+
 =============
 Version 1.6.0
 =============
diff --git a/README b/README
index 258370d..a5570a1 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 gnome-internet-radio-locator
 ============================
 
-GNOME Internet Radio Locator for GNOME 3 is a Free Software program
-that allows you to easily locate Free Internet Radio stations by
-broadcasters on the Internet with the help of a map.
+GNOME Internet Radio Locator is a Free Software program that allows
+you to easily locate and listen to Free Internet Radio stations by
+broadcasters on the Internet with the help of map and text search.
 
-GNOME Internet Radio Locator for GNOME 3 is developed on the GNOME 3
+GNOME Internet Radio Locator is developed on the GNOME desktop
 platform with GNOME Maps, libchamplain and geocode-lib and it requires
 gstreamer 1.0 for audio playback.
 
@@ -14,7 +14,7 @@ and enter city names in the GUI search input field in order to locate
 radio stations in the city using the text search with auto-completion
 or click on one of the city marker in the map to listen to a station.
 
-To launch the program, you can click on Activities in GNOME 3 and enter
+To launch the program, you can click on Activities in GNOME and enter
 
    gnome-internet-radio-locator
 
@@ -27,9 +27,11 @@ from gnome-terminal.
 You can download pre-compiled binaries for Debian GNU/Linux i386,
 Fedora Core x86_64 and Ubuntu Linux amd64 from the web site at
 
-   https://www.gnome.org/~ole/gnome-internet-radio-locator/
+   https://www.gnome.org/~ole/debian/
+   https://www.gnome.org/~ole/fedora/
+   https://www.gnome.org/~ole/ubuntu/
 
-You can download the latest release from the official GNOME site:
+You can download latest source release from the official GNOME site:
 
    ftp://ftp.gnome.org/pub/GNOME/sources/gnome-internet-radio-locator/
    https://download.gnome.org/sources/gnome-internet-radio-locator/
diff --git a/TODO b/TODO
index 9edd468..2eb7b17 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,12 @@
-TODO for GNOME Internet Radio Locator for GNOME 3
+TODO for GNOME Internet Radio Locator
+
+==========
+2019-01-28
+==========
+
+GUI
+
+* Update to GNOME 3 design by Christopher Davis
 
 ==========
 2017-11-25
diff --git a/UBUNTU b/UBUNTU
new file mode 100644
index 0000000..858d493
--- /dev/null
+++ b/UBUNTU
@@ -0,0 +1,7 @@
+GNOME Internet Radio Locator compiles and runs on Ubuntu.
+
+See http://www.gnome.org/~ole/ubuntu/ for amd64 packages. 
+
+If you are packaging GNOME Internet Radio Locator for Ubuntu
+and/or other GNU/Linux distributions, please coordinate this
+with ole gnome org.
diff --git a/compile b/compile
index de0005d..a85b723 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
-#!/bin/sh
+#! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey cygnus com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,8 +255,7 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
-  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -343,6 +342,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/configure.ac b/configure.ac
index 4fce822..d4658d7 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(gnome-internet-radio-locator,1.6.0)
+AC_INIT(gnome-internet-radio-locator,1.7.0)
 AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/gnome-internet-radio-locator.c])
diff --git a/gnome-internet-radio-locator.doap b/gnome-internet-radio-locator.doap
index 9663cb5..2ab5e69 100644
--- a/gnome-internet-radio-locator.doap
+++ b/gnome-internet-radio-locator.doap
@@ -3,9 +3,9 @@
          xmlns:foaf="http://xmlns.com/foaf/0.1/";
          xmlns:gnome="http://api.gnome.org/doap-extensions#";
          xmlns="http://usefulinc.com/ns/doap#";>
-  <name xml:lang="en">GNOME Internet Radio Locator for GNOME 3</name>
+  <name xml:lang="en">GNOME Internet Radio Locator</name>
   <shortdesc xml:lang="en">Locate Free Internet Radio Stations</shortdesc>
-  <description>GNOME Internet Radio Locator for GNOME 3 is a Free Software program that allows you to easily 
locate Free Internet Radio stations by broadcasters on the Internet with the help of a map.  GNOME Internet 
Radio Locator for GNOME 3 is developed on the GNOME 3 platform and it requires gstreamer 1.0 for playback.  
Enjoy Free Internet Radio.</description>
+  <description>GNOME Internet Radio Locator is a Free Software program that allows you to easily locate Free 
Internet Radio stations by broadcasters on the Internet with the help of map and text search.  GNOME Internet 
Radio Locator is developed on the GNOME desktop platform and it requires gstreamer 1.0 for playback.  Enjoy 
Free Internet Radio.</description>
   <homepage rdf:resource="https://wiki.gnome.org/Apps/InternetRadioLocator"; />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-internet-radio-locator-list"; />
   <download-page rdf:resource="http://download.gnome.org/sources/gnome-internet-radio-locator/"; />
diff --git a/gnome-internet-radio-locator.spec.in b/gnome-internet-radio-locator.spec.in
index c1bf1cd..525d051 100644
--- a/gnome-internet-radio-locator.spec.in
+++ b/gnome-internet-radio-locator.spec.in
@@ -1,7 +1,7 @@
 Name:           @PACKAGE@
 Version:        @VERSION@
 Release:        1%{?dist}
-Summary:        GNOME Internet Radio Locator for GNOME 3
+Summary:        GNOME Internet Radio Locator
 License:        GPLv3+
 URL:            https://www.gnome.org/~ole/%{name}
 Source:         %{url}/%{name}-%{version}.tar.xz
@@ -23,12 +23,12 @@ Requires:       gstreamer1-plugins-ugly-free >= 1.8.3
 Requires:       geocode-glib >= 3.20.1
 
 %description
-GNOME Internet Radio Locator for GNOME 3 is a Free Software program
-that allows you to easily locate and listen to Free Internet Radio
-stations by broadcasters on the Internet with the help of a map.
+GNOME Internet Radio Locator is a Free Software program that allows
+you to easily locate and listen to Free Internet Radio stations by
+broadcasters on the Internet with the help of map and text search.
 
-GNOME Internet Radio Locator for GNOME 3 is developed on the GNOME
-3 platform and it requires gstreamer 1.0 for playback.
+GNOME Internet Radio Locator is developed on the GNOME desktop
+platform and it requires gstreamer 1.0 for playback.
 
 Enjoy Free Internet Radio.
 
@@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Jan 28 2019 Ole Aamot <ole gnome org> - 1.7.0-0
+- gnome-internet-radio-locator 1.7.0 build on Fedora Linux 29
+
 * Sun Jan 13 2019 Ole Aamot <ole gnome org> - 1.6.0-0
 - gnome-internet-radio-locator 1.6.0 build on Fedora Linux 29
 
diff --git a/src/gnome-internet-radio-locator-gui.c b/src/gnome-internet-radio-locator-gui.c
index 8f3c896..dd81e80 100644
--- a/src/gnome-internet-radio-locator-gui.c
+++ b/src/gnome-internet-radio-locator-gui.c
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2016, 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
@@ -394,7 +394,7 @@ GtkWidget *create_gnome_internet_radio_locator_app(void)
        
        GNOMEInternetRadioLocatorData *gnome_internet_radio_locator_data = 
g_new0(GNOMEInternetRadioLocatorData, 1);
        char *pmf;
-       gtk_window_set_title(GTK_WINDOW(gnome_internet_radio_locator_app), "GNOME Internet Radio Locator for 
GNOME 3");
+       gtk_window_set_title(GTK_WINDOW(gnome_internet_radio_locator_app), "GNOME Internet Radio Locator");
        gnome_internet_radio_locator = gnome_internet_radio_locator_data;
        gnome_internet_radio_locator_data->settings = g_settings_new(GNOME_INTERNET_RADIO_LOCATOR_UI);
        selected_station_uri = g_variant_get_string(g_settings_get_value 
(gnome_internet_radio_locator_data->settings, "selected_station_uri"), &length);
diff --git a/src/gnome-internet-radio-locator-keys.h b/src/gnome-internet-radio-locator-keys.h
index 7123c32..386c4b3 100644
--- a/src/gnome-internet-radio-locator-keys.h
+++ b/src/gnome-internet-radio-locator-keys.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-listener.h b/src/gnome-internet-radio-locator-listener.h
index e411216..1cbaff4 100644
--- a/src/gnome-internet-radio-locator-listener.h
+++ b/src/gnome-internet-radio-locator-listener.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 6fe4f30..b497cc4 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -1,3 +1,25 @@
+/* $id$
+ *
+ * GNOME Internet Radio Locator
+ *
+ * Copyright (C) 2019  Aamot Software
+ *
+ * Author: Ole Aamot <ole gnome org>
+ *
+ * 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 3 of the License, 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/>.
+ */
+
 /*
  * Copyright (C) 2008 Pierre-Luc Beaudoin <pierre-luc pierlux com>
  *
@@ -321,7 +343,6 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
   champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
   /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
   g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
-#if 0 /* Non-streamable as of 2018/03/26 */
   marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
   station = g_strdup("Moscow, Russia\n<span size=\"small\">Echo of Moscow</span>");
   champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
@@ -333,7 +354,6 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
   champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
   /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
   g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
-#endif
   marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
   station = g_strdup("Newcastle, Australia\n<span size=\"small\">2NURFM</span>");
   champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
diff --git a/src/gnome-internet-radio-locator-markers.h b/src/gnome-internet-radio-locator-markers.h
index 9374bd7..3df32b3 100644
--- a/src/gnome-internet-radio-locator-markers.h
+++ b/src/gnome-internet-radio-locator-markers.h
@@ -1,3 +1,25 @@
+/* $id$
+ *
+ * GNOME Internet Radio Locator
+ *
+ * Copyright (C) 2019  Aamot Software
+ *
+ * Author: Ole Aamot <ole gnome org>
+ *
+ * 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 3 of the License, 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/>.
+ */
+
 /*
  * Copyright (C) 2008 Pierre-Luc Beaudoin <pierre-luc pierlux com>
  *
diff --git a/src/gnome-internet-radio-locator-player.h b/src/gnome-internet-radio-locator-player.h
index 9e9ce88..130032b 100644
--- a/src/gnome-internet-radio-locator-player.h
+++ b/src/gnome-internet-radio-locator-player.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-program.h b/src/gnome-internet-radio-locator-program.h
index 20c035d..3f33b53 100644
--- a/src/gnome-internet-radio-locator-program.h
+++ b/src/gnome-internet-radio-locator-program.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-radius.c b/src/gnome-internet-radio-locator-radius.c
index 95bfc65..32ab59f 100644
--- a/src/gnome-internet-radio-locator-radius.c
+++ b/src/gnome-internet-radio-locator-radius.c
@@ -1,8 +1,8 @@
 /* $id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2017-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-radius.h b/src/gnome-internet-radio-locator-radius.h
index 31f4359..04025d9 100644
--- a/src/gnome-internet-radio-locator-radius.h
+++ b/src/gnome-internet-radio-locator-radius.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2017-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-runners.h b/src/gnome-internet-radio-locator-runners.h
index 871489d..c4102f9 100644
--- a/src/gnome-internet-radio-locator-runners.h
+++ b/src/gnome-internet-radio-locator-runners.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-station.c b/src/gnome-internet-radio-locator-station.c
index 4f3780f..8d8f0cb 100644
--- a/src/gnome-internet-radio-locator-station.c
+++ b/src/gnome-internet-radio-locator-station.c
@@ -1,8 +1,8 @@
 /* $id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2016, 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-station.h b/src/gnome-internet-radio-locator-station.h
index 8566ad9..b109ea3 100644
--- a/src/gnome-internet-radio-locator-station.h
+++ b/src/gnome-internet-radio-locator-station.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-stations-map.h b/src/gnome-internet-radio-locator-stations-map.h
index d8f0a88..898eab9 100644
--- a/src/gnome-internet-radio-locator-stations-map.h
+++ b/src/gnome-internet-radio-locator-stations-map.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2015, 2018  Ole Aamot Software
+ * Copyright (C) 2015-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-streams.h b/src/gnome-internet-radio-locator-streams.h
index 8258c48..12e8b62 100644
--- a/src/gnome-internet-radio-locator-streams.h
+++ b/src/gnome-internet-radio-locator-streams.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-tz.c b/src/gnome-internet-radio-locator-tz.c
index bee860f..833888a 100644
--- a/src/gnome-internet-radio-locator-tz.c
+++ b/src/gnome-internet-radio-locator-tz.c
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2015, 2018  Ole Aamot Software
+ * Copyright (C) 2015, 2018, 2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator-tz.h b/src/gnome-internet-radio-locator-tz.h
index d4a9556..bfad80b 100644
--- a/src/gnome-internet-radio-locator-tz.h
+++ b/src/gnome-internet-radio-locator-tz.h
@@ -1,9 +1,9 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2015  Ole Aamot Software
+ * Copyright (C) 2015-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index 22e9187..47e3cc6 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2016, 2017, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
@@ -589,7 +589,7 @@ gnome_internet_radio_locator_window_cb (GtkApplication *app,
        gtk_container_add (GTK_CONTAINER(window), GTK_WIDGET(grid));
        g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 #endif
-       gtk_window_set_title (GTK_WINDOW(window), _("GNOME Internet Radio Locator for GNOME 3"));
+       gtk_window_set_title (GTK_WINDOW(window), _("GNOME Internet Radio Locator"));
        gtk_window_set_default_size (GTK_WINDOW(window), 1440, 720);
 
        gnome_internet_radio_locator_app = create_gnome_internet_radio_locator_app();
@@ -759,7 +759,7 @@ main (int argc,
        /* give the window a 10px wide border */
        gtk_container_set_border_width (GTK_CONTAINER (window), 10);
        /* give it the title */
-       gtk_window_set_title (GTK_WINDOW (window), _("GNOME Internet Radio Locator for GNOME 3"));
+       gtk_window_set_title (GTK_WINDOW (window), _("GNOME Internet Radio Locator"));
        /* Connect the destroy event of the window with our on_destroy function
         * When the window is about to be destroyed we get a notificaiton and
         * stop the main GTK loop
diff --git a/src/gnome-internet-radio-locator.h b/src/gnome-internet-radio-locator.h
index 5f7c6b4..2d93171 100644
--- a/src/gnome-internet-radio-locator.h
+++ b/src/gnome-internet-radio-locator.h
@@ -1,8 +1,8 @@
 /* $Id$
  *
- * GNOME Internet Radio Locator for GNOME 3
+ * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015, 2018  Ole Aamot Software
+ * Copyright (C) 2014-2019  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 566a47b..8387fc3 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" 
href="https://people.gnome.org/~ole/gnome-internet-radio-locator/gnome-internet-radio-locator.xsl"; ?>
 <!DOCTYPE gnome_internet_radio_locator SYSTEM "gnome-internet-radio-locator-0.1.dtd">
-<gnome_internet_radio_locator version="1.4.0">
+<gnome_internet_radio_locator version="1.7.0">
   <station band="ONLINE" id="drnyheder" lang="da" name="Danmarks Radio Nyheder" rank="1.0" type="gov">
     <frequency uri="http://www.dr.dk/nyheder";>FM 93.3 in Aalborg</frequency>
     <location>Copenhagen, Denmark</location>
@@ -1065,7 +1065,6 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <stream mime="audio/mpeg" uri="http://fm939.wnyc.org/wnycfm"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="24000 Hz" channels="Mono" bitrate="32 kbps" />
     <uri>http://www.wnyc.org/</uri>
   </station>
-  <!-- Non-streamable as of 2018/04/20
   <station band="ONLINE" id="echo" lang="ru" name="Эхо Москвы" rank="1.0" type="com">
     <frequency uri="http://echo.msk.ru/";>ONLINE in Moscow, Russia</frequency>
     <location>Moscow, Russia</location>
@@ -1074,10 +1073,9 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
       broadcasting in many Russian cities, some of the former-Soviet
       republics, and via the Internet.  It is owned by Gazprom-Media.
     </description>
-    <stream mime="audio/mpeg" uri="http://81.19.85.197/echo.mp3"; codec="MPEG-1 Layer 3 (MP3)" 
samplerate="48000 Hz" channels="Stereo" bitrate="154 kbps" />
+    <stream mime="audio/mpeg" uri="http://ice912.echo.msk.ru:9120/24.aac"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" channels="Stereo" bitrate="22 kbps" />
     <uri>http://echo.msk.ru/</uri>
-    </station>
-  -->
+  </station>
   <station band="ONLINE" id="somafmdefcon" lang="en" name="SomaFM DEF CON" rank="1.0" type="com">
     <frequency uri="http://www.somafm.com/";>ONLINE in San Francisco, California</frequency>
     <location>San Francisco, California</location>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]