GNOME.org
 

[gnome-internet-radio-locator: 2/3] Release GNOME Internet Radio Locator version 2.6.0

commit 4d2adda466c2e62261d162138ffc115ab77ed1bd
Author: Ole Aamot <ole gnome org>
Date:   Fri Jan 3 01:40:22 2020 +0100

    Release GNOME Internet Radio Locator version 2.6.0

 NEWS                                       | 22 ++++++++++
 configure.ac                               |  2 +-
 src/gnome-internet-radio-locator-markers.c | 69 ++++++++++++++++++++++++------
 src/gnome-internet-radio-locator.xml       | 40 +++++++++++++----
 4 files changed, 112 insertions(+), 21 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3d3f5cf..f5b724a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,25 @@
+=============
+Version 2.6.0
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Buskerud, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Rogaland, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Møre og Romsdal, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Sogn og Fjordane, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Hordaland, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Østfold, Norway
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Buskerud
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Rogaland
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Møre og Romsdal
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Sogn og Fjordane
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Hordaland
+       * src/gnome-internet-radio-locator.xml: Add NRK P1 Østfold
+
 =============
 Version 2.5.0
 =============
diff --git a/configure.ac b/configure.ac
index 1095520..b0582a9 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.5.0)
+AC_INIT(gnome-internet-radio-locator,2.6.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 20bbbb9..4808cbc 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -231,17 +231,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("Buskerud, Norge\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_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));
-       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("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);
@@ -275,6 +264,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("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_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));
+       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("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);
@@ -396,6 +396,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("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_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));
+       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("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);
@@ -495,6 +506,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("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_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));
+       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("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);
@@ -616,7 +638,7 @@ 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("Rogaland, Norge\n<span size=\"small\">NRK P1 Rogaland</span>");
+       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);
@@ -649,6 +671,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("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_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));
+       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("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);
@@ -769,6 +802,18 @@ 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("Ø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_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));
+       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);
 #if 0
        marker = champlain_label_new_from_file ("icons/emblem-important.png", NULL);
        champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index f888c78..61bd3ae 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -1,19 +1,43 @@
 <?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.5.0">
-  <station band="Online" id="p1_buskerud" lang="no" name="NRK P1 Buskerud" rank="1.0" type="gov">
-    <location>Buskerud, Norge</location>
-    <description lang="no">NRK P1 Buskerud</description>
-    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p1_buskerud_aac_h"; codec="MPEG-1 Layer 3 
(MP3)" samplerate="48000 Hz" bitrate="125 kbps" />
-    <uri>https://www.nrk.no/buskerud/</uri>
+<gnome_internet_radio_locator version="2.6.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>
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_ostfold_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="125 kbps" />
+    <uri>https://www.nrk.no/ostfold/</uri>
+  </station>
+  <station band="Online" id="p1_hordaland" lang="no" name="NRK P1 Hordaland" rank="1.0" type="gov">
+    <location>Hordaland, Norway</location>
+    <description lang="no">NRK P1 Hordaland</description>
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_hordaland_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="125 kbps" />
+    <uri>https://www.nrk.no/hordaland/</uri>
+  </station>
+  <station band="Online" id="p1_sognogfjordane" lang="no" name="NRK P1 Sogn og Fjordane" rank="1.0" 
type="gov">
+    <location>Sogn og Fjordane, Norway</location>
+    <description lang="no">NRK P1 Sogn og Fjordane</description>
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_sogn_og_fjordane_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="192 kbps" />
+    <uri>https://www.nrk.no/sognogfjordane/</uri>
+  </station>
+  <station band="Online" id="p1_møreogromsdal" lang="no" name="NRK P1 Møre og Romsdal" rank="1.0" type="gov">
+    <location>Møre og Romsdal, Norway</location>
+    <description lang="no">NRK P1 Møre og Romsdal</description>
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_more_og_romsdal_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="192 kbps" />
+    <uri>https://www.nrk.no/mr/</uri>
   </station>
   <station band="Online" id="p1_rogaland" lang="no" name="NRK P1 Rogaland" rank="1.0" type="gov">
-    <location>Rogaland, Norge</location>
+    <location>Rogaland, Norway</location>
     <description lang="no">NRK P1 Rogaland</description>
-    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p1_rogaland_aac_h"; codec="MPEG-1 Layer 3 
(MP3)" samplerate="48000 Hz" bitrate="125 kbps" />
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_rogaland_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="125 kbps" />
     <uri>https://www.nrk.no/rogaland/</uri>
   </station>
+  <station band="Online" id="p1_buskerud" lang="no" name="NRK P1 Buskerud" rank="1.0" type="gov">
+    <location>Buskerud, Norway</location>
+    <description lang="no">NRK P1 Buskerud</description>
+    <stream mime="audio/aac" uri="http://lyd.nrk.no/nrk_radio_p1_buskerud_aac_h"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="125 kbps" />
+    <uri>https://www.nrk.no/buskerud/</uri>
+  </station>
   <station band="92.2FM" id="anr" lang="dk" name="ANR" rank="1.0" type="com">
     <frequency uri="http://www.anr.dk/";>FM 87.6 in Aalborg C, Denmark</frequency>
     <frequency uri="http://www.anr.dk/";>FM 88.5 in Nørlund, Denmark</frequency>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]