[gnome-internet-radio-locator] Add KPSU (Portland, Oregon)

[Ole Aamot <ole src gnome org>]

commit 25529b16e0e086e6e13e3c5bbfefc1c48e53156e
Author: Ole Aamot <ole gnome org>
Date:   Wed Jan 1 09:55:20 2020 +0100

    Add KPSU (Portland, Oregon)

 NEWS                                       | 12 ++++++++++++
 configure.ac                               |  2 +-
 src/gnome-internet-radio-locator-markers.c | 11 +++++++++++
 src/gnome-internet-radio-locator.xml       |  9 ++++++++-
 4 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index b44e8ba..3d3f5cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+=============
+Version 2.5.0
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Portland, Oregon
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add KPSU (Portland, Oregon)
+
 =============
 Version 2.4.0
 =============
diff --git a/configure.ac b/configure.ac
index d6315b5..1095520 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.4.0)
+AC_INIT(gnome-internet-radio-locator,2.5.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 7928b4a..0ed0cba 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -594,6 +594,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("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_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));
+       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("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);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 37ce1d1..b664645 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.4.0">
+<gnome_internet_radio_locator version="2.5.0">
   <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>
@@ -917,6 +917,13 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
     <uri>http://kdup.up.edu/</uri>
   </station>
   -->
+  <station band="Online" id="kpsu" lang="en" name="KPSU" rank="1.0" type="edu">
+    <frequency uri="http://www.kpsu.org/";>Online in Portland, Oregon</frequency>
+    <location>Portland, Oregon</location>
+    <description lang="en">Portland State University's radio station</description>
+    <stream mime="audio/ogg" uri="http://173.255.221.48:8000/stream"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="256 kbps" />
+    <uri>http://www.kpsu.org/</uri>
+  </station>
   <station band="95.0FM" id="95bfm" lang="en" name="95bFM" rank="1.0" type="edu">
     <frequency uri="http://www.95bfm.com/";>95.0 FM in Auckland, New Zealand</frequency>
     <location>Auckland, New Zealand</location>