[gnome-internet-radio-locator] GNOME Internet Radio Locator version 3.9.1
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-internet-radio-locator] GNOME Internet Radio Locator version 3.9.1
- Date: Tue, 16 Feb 2021 00:03:37 +0000 (UTC)
commit 46e998b7490d1f31cad6494886cb9f4d16baf8a7
Author: Ole Aamot <ole gnome org>
Date: Tue Feb 16 01:01:58 2021 +0100
GNOME Internet Radio Locator version 3.9.1
NEWS | 24 ++++
configure.ac | 2 +-
meson.build | 4 +-
src/gnome-internet-radio-locator-markers.c | 197 +++++++++++++++++++++--------
src/gnome-internet-radio-locator.c | 8 +-
src/gnome-internet-radio-locator.xml | 27 ++--
6 files changed, 188 insertions(+), 74 deletions(-)
---
diff --git a/NEWS b/NEWS
index 39cc90d..6bb4b58 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,27 @@
+=============
+Version 3.9.1
+=============
+
+Stations
+
+ * src/gnome-internet-radio-locator.c: Shift center (Brooklyn, New York)
+ * src/gnome-internet-radio-locator-markers.c: Radio Adelaide (Adelaide, Australia)
+ * src/gnome-internet-radio-locator-markers.c: 95bFM (Auckland, New Zealand)
+ * src/gnome-internet-radio-locator-markers.c: KVRX (Austin, Texas)
+ * src/gnome-internet-radio-locator-markers.c: Radio R (Brno, Czech Republic)
+ * src/gnome-internet-radio-locator-markers.c: WFUV (Bronx, New York)
+ * src/gnome-internet-radio-locator-markers.c: Radio Free Brooklyn (Brooklyn, New York)
+ * src/gnome-internet-radio-locator-markers.c: EPER (Budapest, Hungary)
+ * src/gnome-internet-radio-locator-markers.c: BlurFM (Buenos Aires, Argentina)
+ * src/gnome-internet-radio-locator.xml: Update 2NURFM (Newcastle, Australia)
+ * src/gnome-internet-radio-locator.xml: Update BlurFM (Buenos Aires, Argentina)
+ * src/gnome-internet-radio-locator.xml: Update EPER (Budapest, Hungary)
+ * src/gnome-internet-radio-locator.xml: Update Radio Adelaide (Adelaide, Australia)
+
+Translations
+
+ * Jordi Mas (ca)
+
=============
Version 3.9.0
=============
diff --git a/configure.ac b/configure.ac
index 8d71945..34a1e60 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,3.9.0)
+AC_INIT(gnome-internet-radio-locator,3.9.1)
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/meson.build b/meson.build
index 9fe2566..94be77f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('gnome-internet-radio-locator', 'c',
- version : '3.9.0',
+ version : '3.9.1',
meson_version: '>= 0.49.2',
license : 'GPL')
prefix = get_option('prefix')
@@ -27,7 +27,7 @@ subdir('src')
subdir('po')
pkg_mod = import('pkgconfig')
pkg_mod.generate(libraries : gnomeinternetradiolibrary,
- version : '3.9.0',
+ version : '3.9.1',
name : 'libgnomeinternetradiolibrary',
filebase : 'gnomeinternetradiolibrary',
description : 'GNOME Internet Radio Library')
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index bbb8a4b..c825638 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -143,17 +143,39 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker));
#endif
marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
- station = g_strdup("Aalborg, Denmark\n<span size=\"small\">ANR</span>");
+ station = g_strdup("Auckland, New Zealand\n<span size=\"small\">95bFM</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_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), -36.852095, 174.7631803);
+ 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("Aalborg, Denmark\n<span size=\"small\">ANR</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_c_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 57.0482206, 9.9193939);
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("Adelaide, Australia\n<span size=\"small\">Radio Adelaide</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), -34.9281805,138.5999312);
+ 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("Alta, Norway\n<span size=\"small\">Radio Alta</span>");
champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -164,11 +186,23 @@ 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);
+ marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+ station = g_strdup("Austin, Texas\n<span size=\"small\">KVRX</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_f_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 30.2711286, -97.7436995);
+ 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("Ayr, Scotland\n<span size=\"small\">UWS Radio</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_b_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.4594119, -4.6326702);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -212,7 +246,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Berlin, Germany\n<span size=\"small\">Radio Eins</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_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 52.5170365, 13.3888599);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -223,7 +257,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Bern, Switzerland\n<span size=\"small\">Radio NRJ Bern</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 46.9482713, 7.4514512);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -234,7 +268,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("WBUR, Boston, Massachusetts\n<span size=\"small\">WBUR</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3516603, -71.1226348);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -245,7 +279,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("WTBU, Boston, Massachusetts\n<span size=\"small\">WTBU</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_f_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3602534, -71.0582912);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -253,10 +287,43 @@ 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("Brno, Czech Republic\n<span size=\"small\">Radio R</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_c_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 49.1922443, 16.6113382);
+ 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("Bronx, New York\n<span size=\"small\">WFUV</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), 40.8466508, -73.8785937);
+ 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("Brooklyn, New York\n<span size=\"small\">Radio Free Brooklyn</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_e_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 40.8466508, -73.8785937);
+ 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("Bruxelles, Belgium\n<span size=\"small\">Radio Campus</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 50.84404145, 4.36720169448285);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -264,10 +331,32 @@ 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("Budapest, Hungary\n<span size=\"small\">EPER</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_a_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 47.4983815, 19.0404707);
+ 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("Buenos Aires, Argentina\n<span size=\"small\">BlurFM</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_b_color);
+ champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
+ champlain_location_set_location (CHAMPLAIN_LOCATION (marker), -34.6075682, -58.4370894);
+ 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("Buskerud, Norway\n<span size=\"small\">NRK P1 Buskerud</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_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 60.2497876, 8.96278676790604);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -278,7 +367,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Calgary, Canada\n<span size=\"small\">CJSW</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_b_color);
+ 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), 51.0534234, -114.0625892);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -289,7 +378,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("WHRB-FM, Cambridge, Massachusetts\n<span size=\"small\">WHRB</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3723191, -71.1186638);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -300,7 +389,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("WMBR-FM, Cambridge, Massachusetts\n<span size=\"small\">WMBR</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_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3617430, -71.0839082);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -311,7 +400,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Cambridge, United Kingdom\n<span size=\"small\">Cam FM</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 52.2033051, 0.124862);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -322,7 +411,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Cape Town, South Africa\n<span size=\"small\">UCT Radio</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_f_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), -33.928992, 18.417396);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -333,7 +422,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Copenhagen, Denmark\n<span size=\"small\">Danmarks Radio Nyheder</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.6867243, 12.5700724);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -344,7 +433,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Chicago, Illinois\n<span size=\"small\">WHPK</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_b_color);
+ 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), 41.8755546, -87.6244212);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -357,7 +446,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Dubai, Saudi Arabia\n<span size=\"small\">Middle East Broadcasting Center
FM</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 21.4146056, 39.8227432);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -367,7 +456,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Dublin, Ireland\n<span size=\"small\">DCUfm</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 53.3497645, -6.2602732);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -377,7 +466,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Finnmark, Norway\n<span size=\"small\">NRK P1 Finnmark</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_b_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 69.86993469999999, 21.827278548625912);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -388,7 +477,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Guatemala City, Guatemala\n<span size=\"small\">Radio Universidad</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 14.6417889, -90.5132239);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -399,7 +488,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Honolulu, Hawaii\n<span size=\"small\">Hawaii Public Radio</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 21.304547, -157.8556764);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -410,7 +499,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Hordaland, Norway\n<span size=\"small\">NRK P1 Hordaland</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_e_color);
+ 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), 60.2570766, 6.06249778348651);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -421,7 +510,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Kárášjohka, Norway\n<span size=\"small\">NRK Sápmi</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_f_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 68.7718259, 24.2803624);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -465,7 +554,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Innlandet, Norway\n<span size=\"small\">NRK P1 Innlandet</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 61.26810555, 10.485458802304304);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -476,7 +565,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("London, United Kingdom\n<span size=\"small\">Imperial College Radio</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_c_color);
+ 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), 51.5073219, -0.1276474);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -487,7 +576,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Los Angeles, California\n<span size=\"small\">KXSC</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_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 34.1430079, -118.14176172581);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -498,7 +587,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Lyon, France\n<span size=\"small\">Radio Brume</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 45.7544734, 4.8122242);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -509,7 +598,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("México City, México\n<span size=\"small\">Radio UNAM</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_f_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 19.647012, -101.22900565);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -520,7 +609,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Moscow, Russia\n<span size=\"small\">Echo of Moscow</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.4792046, 37.3273304);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -531,7 +620,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Møre og Romsdal, Norway\n<span size=\"small\">NRK P1 Møre og Romsdal</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_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 62.8452777, 7.51819407263736);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -542,7 +631,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Newcastle, Australia\n<span size=\"small\">2NURFM</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_b_color);
+ 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), -32.9272881, 151.7812534);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -553,7 +642,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("New Orleans, Louisiana\n<span size=\"small\">WWNO</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 29.9499323, -90.0701156);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -564,7 +653,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("New York City, New York\n<span size=\"small\">WKCR</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_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 40.7306458, -73.9866136);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -575,7 +664,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Nordkapp, Norway\n<span size=\"small\">Radio Nordkapp</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_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 71.1699506, 25.7858893);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -597,7 +686,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Norway\n<span size=\"small\">Radio Norwegian</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 60.133054099999995, 7.531103018917516);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -685,7 +774,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Porsgrunn, Norway\n<span size=\"small\">NRK Telemark</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 59.140759, 9.6562495);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -696,7 +785,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Portland, Oregon\n<span size=\"small\">KPSU</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_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 45.5202471,-122.6741949);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -707,7 +796,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Rogaland, Norway\n<span size=\"small\">NRK P1 Rogaland</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_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 58.93631375, 5.80587864304024);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -718,7 +807,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("San Francisco, California\n<span size=\"small\">SomaFM</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_e_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.7792808, -122.4192363);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -729,7 +818,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Seattle, Washington\n<span size=\"small\">KSUB</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_f_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 47.6038321, -122.3300624);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -740,7 +829,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("University of Washington\n<span size=\"small\">KUOW</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_f_color);
+ 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), 47.6543238,-122.30800894320257);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -751,7 +840,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Sogn og Fjordane, Norway\n<span size=\"small\">NRK P1 Sogn og Fjordane</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_b_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 61.53093745, 6.10242908066871);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -762,7 +851,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Stanford, California\n<span size=\"small\">KZSU</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.4248398, -122.1677058);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -773,7 +862,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Stockholm, Sweden\n<span size=\"small\">Sveriges Radio P1</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_b_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 59.3251172, 18.0710935);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -784,7 +873,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Sydney, Canada\n<span size=\"small\">Caper Radio</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 46.1654766, -60.1735637935906);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -795,7 +884,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Tampere, Finland\n<span size=\"small\">Radio Moreeni</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_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 61.4980214, 23.7603118);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -850,7 +939,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Troms, Norway\n<span size=\"small\">NRK P1 Troms</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 64.5731537, 11.52803643954819);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -861,7 +950,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Trondheim, Norway\n<span size=\"small\">Radio Revolt</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 63.4305658, 10.3951929);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -872,7 +961,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Trøndelag, Norway\n<span size=\"small\">NRK P1 Trøndelag</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_c_color);
+ 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), 63.87759235, 10.195050547141093);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -883,7 +972,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Volda, Norway\n<span size=\"small\">Bygderadio Vest</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 62.08037975, 6.274410767523168);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -894,7 +983,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Warsaw, Poland\n<span size=\"small\">Radio Aktywne</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_b_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 52.2319237, 21.0067265);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -905,7 +994,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Washington, District of Columbia\n<span size=\"small\">WAMU</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_c_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 38.8949549, -77.0366456);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -916,7 +1005,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Supreme Court, United States of America\n<span size=\"small\">C-SPAN</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_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 38.889741, -77.003441);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -927,7 +1016,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
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);
- champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 59.20313315, 10.9535037948529);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -960,7 +1049,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker));
marker = champlain_label_new_from_file ("icons/emblem-favorite.png", NULL);
champlain_label_set_draw_background (CHAMPLAIN_LABEL (marker), FALSE);
- champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
+ champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.873093, -122.303769);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index 4fc396e..b285b87 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -2,7 +2,7 @@
*
* GNOME Internet Radio Locator
*
- * Copyright (C) 2014-2019 Aamot Software
+ * Copyright (C) 2014-2021 Aamot Software
*
* Author: Ole Aamot <ole gnome org>
*
@@ -876,7 +876,7 @@ main (int argc,
g_object_set (G_OBJECT (view),
"kinetic-mode", TRUE,
- "zoom-level", 2,
+ "zoom-level", 0,
NULL);
g_object_set_data (G_OBJECT (view), "window", window);
@@ -895,8 +895,8 @@ main (int argc,
license_actor = champlain_view_get_license_actor (view);
champlain_license_set_extra_text (license_actor, "Free Internet Radio");
- /* FIXME: Boston, Massachusetts */
- champlain_view_center_on (CHAMPLAIN_VIEW (view), 42.3617430, -71.0839082);
+ /* FIXME: Brooklyn, New York */
+ champlain_view_center_on (CHAMPLAIN_VIEW (view), 40.8466508, -73.8785937);
/* location = gclue_simple_get_location (simple); */
/* champlain_view_center_on (CHAMPLAIN_VIEW (view), */
/* gclue_location_get_latitude (location), */
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index c199851..0e9bd95 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="3.9.0">
+<gnome_internet_radio_locator version="3.9.1">
<station band="105.5FM" id="bygderadiovest" lang="en" name="Bygderadio Vest" rank="1.0" type="org">
<location>Volda, Norway</location>
<description lang="no">Volda og Ørsta Bygderadio AS starta sendingar i februar 1989. I starten dekte
radioen berre bygdene Volda og Ørsta. I 2000 vart radioen slått saman med Radio Vest AS i Herøy. Namnet
vart då endra til Bygderadio Vest AS. Alt arbeidet ved radioen vert gjort på dugnad. Bygderadio Vest AS
dekkjer no 7 kommuner; Volda, Ørsta, Hareid, Herøy, Ulstein, Sande og Vannylven. Det bur omlag 46.700
menneske i desse kommunane. Frå 2008 har Bygderadio Vest AS konsesjon som almennradio med konsesjon for å
sende 240 minutt lokalprodusert stoff i tidsrommet 06-18. Konsesjonen gjeld fram til 31.12.2026.</description>
@@ -331,6 +331,7 @@
<stream mime="audio/mpeg" uri="http://khpr-ice.streamguys1.com:80/khpr2"; codec="MPEG-1 Layer 3 (MP3)"
samplerate="24000 Hz" channels="Mono" bitrate="24 kbps" />
<uri>http://www.hawaiipublicradio.org/</uri>
</station>
+ <!-- Appears to be down as of 2021/02/15
<station band="Online" id="burstradio" lang="en" name="Burst Radio" rank="1.0" type="edu">
<frequency uri="http://www.burstradio.org.uk/";></frequency>
<location>Bristol, United Kingdom</location>
@@ -342,6 +343,7 @@
<stream mime="audio/mpeg" uri="http://s.burstradio.org.uk:8000/;"; codec="MPEG ADTS, layer III, v1"
samplerate="44100 Hz" channels="JntStereo" bitrate="128 kbps" />
<uri>http://www.burstradio.org.uk/</uri>
</station>
+ -->
<station band="90.7FM" id="wfuv" lang="en" name="WFUV" rank="1.0" type="edu">
<frequency uri="http://www.wfuv.org/";>Bronx, New York</frequency>
<location>Bronx, New York</location>
@@ -372,6 +374,7 @@
<stream mime="audio/aac" uri="http://rfcmedia2.streamguys1.com/thirdrock.aac"; codec="MPEG-4 AAC"
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
<uri>https://www.nasa.gov/feature/third-rock-radio</uri>
</station>
+ <!-- Appears to be down as of 2021/02/15
<station band="89.9FM" id="ktsw" lang="en" name="KTSW" rank="1.0" type="edu">
<frequency uri="http://ktsw.txstate.edu/";>89.9FM in Austin, Texas</frequency>
<location>San Marcos, Texas</location>
@@ -388,6 +391,7 @@
<stream mime="audio/mpeg" uri="http://ktswlive.txstate.edu:8002/listen"; codec="MPEG 1 Audio, Layer 3
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="95 kbps" />
<uri>http://ktsw.txstate.edu/</uri>
</station>
+ -->
<station band="91.3FM" id="kced" lang="en" name="KCED - Centralia College's Radio" rank="1.0" type="edu">
<frequency uri="http://www.centralia.edu/kced/";>91.3FM in Centralia, District of Columbia</frequency>
<location>Centralia, District of Columbia</location>
@@ -482,9 +486,7 @@ In fact we even split our adverts, and many of our local news and travel bulleti
<description>
Blur FM is an online radio station that works without advertising and with the sole purpose of
promoting the artists that are broadcasted. Music files are downloaded legally-free, or under consent of the
artists, from online sources, which aim to promote independent/emerging artists.
</description>
- <stream mime="audio/mpeg" uri="http://64.34.175.149:8000/blurfm01"; codec="MPEG-1 Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
- <stream mime="audio/mpeg" uri="http://198.199.70.248:8000/blurfm02"; codec="MPEG-1 Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps" />
- <stream mime="audio/aacp" uri="http://91.109.241.253:8170"; codec="MPEG-2 AAC (AAC+)" samplerate="44100
Hz" channels="Stereo" bitrate="32 kbps" />
+ <stream mime="audio/mpeg" uri="https://live.radiovague.com:8443/blurfm01"; codec="MPEG-1 Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
<uri>http://www.blurfm.com/</uri>
</station>
<station band="105.3FM" id="urgentfm" lang="be" name="Urgent.fm" rank="1.0" type="edu">
@@ -977,9 +979,9 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
<frequency uri="http://eper.elte.hu/";></frequency>
<location>Budapest, Hungary</location>
<description lang="en">EPER is a non-profit small power community station in downtown Budapest. We
broadcast from the buildings of the Eötvös Loránd University. Our staff is students and teachers of the
University or of other institutions of higher education.</description>
- <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/live24"; codec="MPEG-2 AAC" samplerate="32000
Hz" channels="Stereo" bitrate="24 kbps" />
- <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper2"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44100 Hz" channels="Mono" bitrate="64 kbps" />
- <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper24"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="22050 Hz" channels="Mono" bitrate="24 kbps" />
+ <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper97"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44000 Hz" channels="Mono" bitrate="63 kbps" />
+ <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper2"; codec="MPEG 1 Audio, Layer 3 (MP3)"
samplerate="44000 Hz" channels="Mono" bitrate="63 kbps" />
+ <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper"; codec="MPEG-2 AAC" samplerate="44000 Hz"
channels="Mono" bitrate="63 kbps" />
<uri>http://eper.elte.hu/</uri>
</station>
<station band="Online" id="fusefm" lang="en" name="Fuse FM" rank="1.0" type="edu">
@@ -1058,16 +1060,15 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
<frequency uri="http://www.newcastle.edu.au/community-and-alumni/arts-and-culture/2nurfm";>103.7 FM in
Newcastle, Australia</frequency>
<location>Newcastle, Australia</location>
<description lang="en">Newcastle's leading 'easy listening' radio station.</description>
- <stream mime="audio/aacp" uri="http://broadcaster1.newcastle.edu.au:8000/2NURFM-aacPlus"; codec="MPEG-2
AAC (AAC+)" samplerate="44100 Hz" channels="Stereo" bitrate="29 kbps" />
- <uri>http://www.newcastle.edu.au/community-and-alumni/arts-and-culture/2nurfm</uri>
+ <stream mime="audio/aacp" uri="https://broadcaster1.newcastle.edu.au:8443/aacplus2"; codec="MPEG-2 AAC
(AAC+)" samplerate="44100 Hz" channels="Stereo" bitrate="62 kbps" />
+ <uri>https://www.2nurfm.com.au/</uri>
</station>
<station band="101.5FM" id="radioadelaide" lang="en" name="Radio Adelaide" rank="1.0" type="edu">
- <frequency uri="https://radio.adelaide.edu.au/";>101.5 FM in Adelaide, Australia</frequency>
+ <frequency uri="https://radioadelaide.org.au/";>101.5 FM in Adelaide, Australia</frequency>
<location>Adelaide, Australia</location>
<description lang="en">Radio Adelaide is a real radio alternative for people curious about ideas, issues
and music. We are as diverse as the city we live in, with programs ranging from Jazz and Classical to World
Music, arts, current affairs and more, with many shows presented by local community groups in their own
languages.</description>
- <stream mime="audio/aac" uri="http://stream.radio.adelaide.edu.au:8000/radadl-128.aac"; codec="MPEG-4
AAC" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
- <stream mime="audio/mpeg" uri="http://stream.radio.adelaide.edu.au:8000/radadl-128.mp3"; codec="MPEG 1
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
- <uri>https://radio.adelaide.edu.au/</uri>
+ <stream mime="audio/aac" uri="https://cast-1.nucleusstreaming.com:4443/5uv_live_128.aacp"; codec="MPEG-2
AAC" samplerate="44100 Hz" channels="Stereo" bitrate="126 kbps" />
+ <uri>https://radioadelaide.org.au/</uri>
</station>
<station band="Online" id="radior" lang="cs" name="Radio R" rank="1.0" type="edu">
<frequency uri="http://radior.cz";>Internet</frequency>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
