GNOME.org
 

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

commit 5a1776b2778dbd2b2c8b1bac07c604992f238646
Author: Ole Aamot <oka oka no>
Date:   Tue Oct 24 21:03:43 2017 +0200

    gnome-internet-radio-locator version 1.0.1

 NEWS                                       |   20 ++++++++++++++
 src/gnome-internet-radio-locator-markers.c |   21 +++++++++++++++
 src/gnome-internet-radio-locator.c         |    2 +-
 src/gnome-internet-radio-locator.xml       |   39 ++++++++++++++++++----------
 4 files changed, 67 insertions(+), 15 deletions(-)
---
diff --git a/NEWS b/NEWS
index 54055c7..60bac73 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,24 @@
 =============
+Version 1.0.1
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Moscow, Russia
+       * src/gnome-internet-radio-locator-markers.c: Add Palo Alto, California
+       * src/gnome-internet-radio-locator-markers.c: Add San Francisco, California
+       * src/gnome-internet-radio-locator.c: Update zoom-level to 9
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add Echo of Moscow (Эхо Москвы)
+
+Translations
+
+       * Mario Blättermann (de)
+       * Matej Urbančič (sl)
+
+=============
 Version 1.0.0
 =============
 
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 46e79ba..8d16abe 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -108,6 +108,13 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
   g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
 
   marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+  champlain_label_set_text (CHAMPLAIN_LABEL (marker), "Moscow, Russia");
+  champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.4792046, 37.3273304);
+  champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+  /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+  g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
+
+  marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
   champlain_label_set_text (CHAMPLAIN_LABEL (marker), "Oslo, Norway");
   champlain_location_set_location (CHAMPLAIN_LOCATION (marker),59.9132694,10.7391112);
   champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -115,6 +122,20 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
   g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
 
   marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+  champlain_label_set_text (CHAMPLAIN_LABEL (marker), "Palo Alto, California");
+  champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.442156,-122.1634472);
+  champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+  /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+  g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
+
+  marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
+  champlain_label_set_text (CHAMPLAIN_LABEL (marker), "San Francisco, California");
+  champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.7792808,-122.4192363);
+  champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
+  /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
+  g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), NULL);
+
+  marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
   champlain_label_set_text (CHAMPLAIN_LABEL (marker), "Washington, District of Columbia");
   champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 38.8949549, -77.0366456);
   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 e8c881c..5d2acf5 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -720,7 +720,7 @@ main (int argc,
 
        g_object_set (G_OBJECT (view),
                      "kinetic-mode", TRUE,
-                     "zoom-level", 5,
+                     "zoom-level", 9,
                      NULL);
 
        g_object_set_data (G_OBJECT (view), "window", window);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 5781922..80d4857 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -2,20 +2,6 @@
 <?xml-stylesheet type="text/xsl" 
href="https://people.gnome.org/~ole/gnome-internet-radio-locator/gnome-internet-radio-locator.xsl"; ?>
 <!DOCTYPE gnome_internet_radio_locator SYSTEM "gnome-internet-radio-locator-0.1.dtd">
 <gnome_internet_radio_locator version="1.0.0">
-  <station band="ONLINE" id="radionorwegian" lang="en" name="Radio Norwegian" rank="1.0" type="org">
-    <frequency uri="http://www.radionorwegian.com/";>ONLINE in Oslo, Norway</frequency>
-    <location>Oslo, Norway</location>
-    <description lang="en">
-      Free Radio broadcast supported by the GNOME Foundation.
-    </description>
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/128.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/112.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="112 kbps" />
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/96.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/80.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="80 kbps" />
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/64.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps" />
-    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/56.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="56 kbps" />
-    <uri>http://www.radionorwegian.com/</uri>
-  </station>
   <station band="ONLINE" id="drnyheder" lang="da" name="Danmarks Radio Nyheder" rank="1.0" type="gov">
     <frequency uri="http://www.dr.dk/nyheder";>FM 93.3 in Aalborg</frequency>
     <location>Copenhagen, Denmark</location>
@@ -1044,4 +1030,29 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <stream mime="audio/mpeg" uri="http://fm939.wnyc.org/wnycfm"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="24000 Hz" channels="Mono" bitrate="32 kbps" />
     <uri>http://www.wnyc.org/</uri>
   </station>
+  <station band="ONLINE" id="echo" lang="ru" name="Эхо Москвы" rank="1.0" type="com">
+    <frequency uri="http://echo.msk.ru/";>ONLINE in Moscow, Russia</frequency>
+    <location>Moscow, Russia</location>
+    <description lang="en">
+      Echo of Moscow is a Russian radio station based in Moscow,
+      broadcasting in many Russian cities, some of the former-Soviet
+      republics, and via the Internet.  It is owned by Gazprom-Media.
+    </description>
+    <stream mime="audio/mpeg" uri="http://81.19.85.197/echo.mp3"; codec="MPEG-1 Layer 3 (MP3)" 
samplerate="48000 Hz" channels="Stereo" bitrate="154 kbps" />
+    <uri>http://echo.msk.ru/</uri>
+  </station>
+  <station band="ONLINE" id="radionorwegian" lang="en" name="Radio Norwegian" rank="1.0" type="org">
+    <frequency uri="http://www.radionorwegian.com/";>ONLINE in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description lang="en">
+      Free Radio broadcast supported by the GNOME Foundation.
+    </description>
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/128.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/112.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="112 kbps" />
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/96.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/80.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="80 kbps" />
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/64.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps" />
+    <stream mime="audio/ogg" uri="http://stream.radionorwegian.com:8000/56.ogg"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="56 kbps" />
+    <uri>http://www.radionorwegian.com/</uri>
+  </station>
 </gnome_internet_radio_locator>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]