[gnome-internet-radio-locator] Release GNOME Internet Radio Locator version 2.8.0

From: Ole Aamot <ole src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-internet-radio-locator] Release GNOME Internet Radio Locator version 2.8.0
Date: Tue, 14 Jan 2020 01:07:28 +0000 (UTC)
commit 389eece80aa933a7c731a729eb716a27a5b0a9a1
Author: Ole Aamot <ole gnome org>
Date:   Tue Jan 14 02:06:50 2020 +0100

    Release GNOME Internet Radio Locator version 2.8.0

 NEWS                                       |  8 ++++++++
 configure.ac                               |  2 +-
 src/gnome-internet-radio-locator-markers.c | 22 +++++++++++-----------
 src/gnome-internet-radio-locator.xml       | 14 +++++++-------
 4 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/NEWS b/NEWS
index f5b724a..33a6f09 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+=============
+Version 2.8.0
+=============
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add RadioWaterloo (Ontario, Canada)
+
 =============
 Version 2.6.0
 =============
diff --git a/configure.ac b/configure.ac
index b0582a9..23c1b1b 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,2.6.0)
+AC_INIT(gnome-internet-radio-locator,2.8.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/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 4808cbc..32b25a0 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -561,6 +561,17 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
        marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+       station = g_strdup("Ontario, Canada\n<span size=\"small\">RadioWaterloo</span>");
+       champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
+       champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
+       champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+       champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.466874, -80.524635);
+       champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+       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);
+       marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
        station = g_strdup("Oslo, Norway\n<span size=\"small\">NRK Sport</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -792,17 +803,6 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
        marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
-       station = g_strdup("Waterloo, Canada\n<span size=\"small\">SoundFM</span>");
-       champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
-       champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
-       champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
-       champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.466874, -80.524635);
-       champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
-       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);
-       marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
        station = g_strdup("Østfold, Norway\n<span size=\"small\">NRK P1 Østfold</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 61bd3ae..96b19e1 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="2.6.0">
+<gnome_internet_radio_locator version="2.8.0">
   <station band="Online" id="p1_østfold" lang="no" name="NRK P1 Østfold" rank="1.0" type="gov">
     <location>Østfold, Norway</location>
     <description lang="no">NRK P1 Østfold</description>
@@ -789,14 +789,14 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
     <stream mime="audio/mpeg" uri="http://184.154.90.186:8006/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.blazeradioonline.com/</uri>
   </station>
-  <station band="100.3FM" id="soundfm" lang="en" name="SoundFM" rank="1.0" type="edu">
-    <frequency uri="http://soundfm.ca/";>100.3 FM in Waterloo, Canada</frequency>
-    <location>Waterloo, Canada</location>
+  <station band="102.7FM" id="radiowaterloo" lang="en" name="radiowaterloo" rank="1.0" type="edu">
+    <frequency uri="http://radiowaterloo.ca/";>102.7 FM in Ontario, Canada</frequency>
+    <location>Ontario, Canada</location>
     <description lang="en">
-      CKMS 100.3 FM (SoundFM) is a community radio station broadcasting independent and alternative music 
and culture to Waterloo Region.
+      CKMS 102.7 FM (RadioWaterloo) is a community radio station broadcasting independent and alternative 
music and culture to Waterloo Region.
     </description>
-    <stream mime="audio/mpeg" uri="http://192.240.102.133:7703/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
-    <uri>http://soundfm.ca/</uri>
+    <stream mime="audio/mpeg" uri="http://192.240.102.133:7703/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="127 kbps" />
+    <uri>http://radiowaterloo.ca/</uri>
   </station>
   <station band="Online" id="nrj-bern" lang="en" name="Radio NRJ Bern" rank="1.0" type="edu">
     <frequency uri="http://www.energy.ch/bern/";>Internet</frequency>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]