GNOME.org
 

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

commit 4c91c5a7881ce9063678495a50656ecec30e787c
Author: Ole Aamot <ole gnome org>
Date:   Thu Oct 24 16:52:20 2019 +0200

    GNOME Internet Radio Locator version 2.1.1

 NEWS                                       | 16 +++++++++++++++
 configure.ac                               |  2 +-
 src/gnome-internet-radio-locator-markers.c | 33 ++++++++++++++++++++++++++++++
 src/gnome-internet-radio-locator.xml       | 27 ++++++++++++++++++++++--
 4 files changed, 75 insertions(+), 3 deletions(-)
---
diff --git a/NEWS b/NEWS
index b6ea108..d5bb067 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+=============
+Version 2.1.1
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Kárášjohka, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Alta, Norway
+       * src/gnome-internet-radio-locator-markers.c: Add Nordkapp, Norway
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add NRK Sápmi (Kárášjohka, Norway)
+       * src/gnome-internet-radio-locator.xml: Add Radio Alta (Alta, Norway)
+       * src/gnome-internet-radio-locator.xml: Add Radio Nordkapp (Honningsvåg, Norway)
+
 =============
 Version 2.1.0
 =============
diff --git a/configure.ac b/configure.ac
index 6bfa24d..2bcf82a 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.1.0)
+AC_INIT(gnome-internet-radio-locator,2.1.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/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 8e5fff0..dbd57d7 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -154,6 +154,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("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);
+       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), 70.04962755, 23.0825349565332);
+       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);
@@ -363,6 +374,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("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_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));
+       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("Kingston, Canada\n<span size=\"small\">CFRC</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
@@ -484,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("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_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));
+       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);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index ce98e21..85ebd87 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.1.0">
+<gnome_internet_radio_locator version="2.1.1">
   <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>
@@ -28,6 +28,20 @@
     <stream mime="audio/mpeg" uri="http://stream.anr.dk/nordjyske"; codec="MPEG-1 Layer 3 (MP3)" 
samplerate="44100 Hz" bitrate="255 kbps" />
     <uri>http://www.anr.dk/</uri>
   </station>
+  <station band="103.9FM" id="radionordkapp" lang="no" name="Radio Nordkapp" rank="1.0" type="com">
+    <frequency uri="http://www.radionordkapp.no/";>FM 103.9 in Nordkapp, Norway</frequency>
+    <location>Nordkapp, Norway</location>
+    <description lang="no">Radio Nordkapp er en lokalradio for Nordkapp. Kanalen sender i FM-nettet og 
tilbyr også radio på internett.</description>
+    <stream mime="audio/mpeg" uri="http://live.radionordkapp.no/"; codec="MPEG-4 AAC" samplerate="44100 Hz" 
bitrate="54 kbps" />
+    <uri>http://www.radionordkapp.no/</uri>
+  </station>
+  <station band="106.9FM" id="radioalta" lang="no" name="Radio Alta" rank="1.0" type="com">
+    <frequency uri="http://www.radioalta.no/";>FM 106.9 in Alta</frequency>
+    <location>Alta, Norway</location>
+    <description lang="no"></description>
+    <stream mime="audio/mpeg" uri="http://stream02.nordavis.no:80/radioalta-128k"; codec="MPEG-1 Layer 3 
(MP3)" samplerate="48000 Hz" bitrate="128 kbps" />
+    <uri>http://www.radioalta.no/</uri>
+  </station>
   <station band="1431AM" id="1431am" lang="gr" name="1431AM" rank="1.0" type="edu">
     <frequency uri="https://www.1431am.org/";>AM 1431 in Thessaloniki, Greece</frequency>
     <location>Thessaloniki, Greece</location>
@@ -645,9 +659,18 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
       NRK Klassisk was launched in Oslo on 1 June 1995 as the world’s first all-digital radio station (DAB), 
broadcasting 24 hours a day. The BBC and Swedish Radio, which launched their first digital radio stations in 
September 1995, caused NRK to bring forward its plans, so as to be the first in the world to use the DAB 
radio standard (Eureka 147).
       Right from the start, the channel was in operation 24 hours a day with a staff of six, in a totally 
digital programme chain from production via DAB transmitter to receiver.
     </description>
-    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_klassisk_aac_h"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_klassisk_aac_h"; codec="MPEG-4 AAC" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>https://radio.nrk.no/direkte/klassisk</uri>
   </station>
+  <station band="Online" id="nrksapmi" lang="smi" name="NRK Sápmi" rank="1.0" type="gov">
+    <frequency uri="http://www.nrk.no/sapmi";>Online in Kárášjohka, Norway</frequency>
+    <location>Kárášjohka, Norway</location>
+    <description lang="en">
+      NRK Sápmi (previously NRK Sámi Radio) is a unit of the Norwegian Broadcasting Corporation (NRK) that 
produces Sami-language news and other programs for broadcast to the Sami people of Norway via radio, 
television, and internet.
+    </description>
+    <stream mime="audio/mpeg" uri="http://nrk-mms-live.telenorcdn.net:80/nrk_radio_sami_aac_h"; codec="MPEG-4 
AAC" samplerate="48000 Hz" channels="Stereo" bitrate="125 kbps" />
+    <uri>http://www.nrk.no/sapmi</uri>
+  </station>
   <station band="104.5FM" id="uctradio" lang="en" name="UCT Radio" rank="1.0" type="edu">
     <frequency uri="http://www.radio.uct.ac.za/";>104.5 FM in Cape Town, South Africa</frequency>
     <location>Cape Town, South Africa</location>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]