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

From: Ole Aamot <ole src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-internet-radio-locator] GNOME Internet Radio Locator version 3.0.5
Date: Sat, 29 Aug 2020 13:10:21 +0000 (UTC)
commit ba14fe0acf2e3eca701ea37719601283ba75ddf6
Author: Ole Aamot <ole gnome org>
Date:   Sat Aug 29 15:09:38 2020 +0200

    GNOME Internet Radio Locator version 3.0.5

 NEWS                                       | 16 ++++++++
 configure.ac                               |  5 ++-
 src/gnome-internet-radio-locator-markers.c | 11 ++++++
 src/gnome-internet-radio-locator.c         | 62 ++++++++++++++++++++++++++++++
 src/gnome-internet-radio-locator.xml       |  7 ++++
 5 files changed, 99 insertions(+), 2 deletions(-)
---
diff --git a/NEWS b/NEWS
index 7ac79b2..ade2fb0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+=============
+Version 3.0.5
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Add Supreme Court, Washington DC
+
+Stations
+
+       * src/gnome-internet-radio-locator.xml: Add C-SPAN, Washington DC
+
+Translations
+
+       * Ask Hjorth Larsen (da)
+
 =============
 Version 3.0.4
 =============
diff --git a/configure.ac b/configure.ac
index 850cbe2..5a88bcb 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.0.4)
+AC_INIT(gnome-internet-radio-locator,3.0.5)
 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])
@@ -97,10 +97,11 @@ PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
                  gstreamer-plugins-bad-1.0 \
                  gstreamer-plugins-base-1.0 \
                  gtk+-3.0 >= 3.0 \
+                 libgeoclue-2.0 >= 0.29.1 \
                  libxml-2.0 >= 2.0 \
                  pangoft2 >= 0.28)
 
-GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS="champlain-gtk-0.12 geocode-glib-1.0 glib-2.0 gobject-2.0 
gstreamer-1.0 gstreamer-player-1.0 gstreamer-plugins-bad-1.0 gstreamer-plugins-base-1.0 
gstreamer-plugins-good-1.0 gstreamer-video-1.0 gtk+-3.0 libxml-2.0 pangoft2"
+GNOME_INTERNET_RADIO_LOCATOR_PKG_DEPS="champlain-gtk-0.12 geocode-glib-1.0 glib-2.0 gobject-2.0 
gstreamer-1.0 gstreamer-player-1.0 gstreamer-plugins-bad-1.0 gstreamer-plugins-base-1.0 
gstreamer-plugins-good-1.0 gstreamer-video-1.0 gtk+-3.0 libgeoclue-2.0 libxml-2.0 pangoft2"
 
 GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
 
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index da68a6f..5f17f78 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -891,6 +891,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("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_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));
+       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);
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index ec2cdc0..f2b8b04 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -29,6 +29,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <string.h>
+#include <geoclue.h>
 
 #include "gnome-internet-radio-locator.h"
 #include "gnome-internet-radio-locator-gui.h"
@@ -84,6 +85,57 @@ GStatBuf stats;
 
 ChamplainView *view;
 
+/* Commandline options */
+static gint timeout = 30; /* seconds */
+static GClueAccuracyLevel accuracy_level = GCLUE_ACCURACY_LEVEL_EXACT;
+static gint time_threshold;
+
+static GOptionEntry entries[] =
+{
+        { "timeout",
+          't',
+          0,
+          G_OPTION_ARG_INT,
+          &timeout,
+          N_("Exit after T seconds. Default: 30"),
+          "T" },
+        { "time-threshold",
+          'i',
+          0,
+          G_OPTION_ARG_INT,
+          &time_threshold,
+          N_("Only report location update after T seconds. "
+             "Default: 0 (report new location without any delay)"),
+          "T" },
+        { "accuracy-level",
+          'a',
+          0,
+          G_OPTION_ARG_INT,
+          &accuracy_level,
+          N_("Request accuracy level A. "
+             "Country = 1, "
+             "City = 4, "
+             "Neighborhood = 5, "
+             "Street = 6, "
+             "Exact = 8."),
+          "A" },
+        { NULL }
+};
+
+GClueSimple *simple = NULL;
+GClueClient *client = NULL;
+GMainLoop *main_loop;
+
+static gboolean
+on_location_timeout (gpointer user_data)
+{
+        g_clear_object (&client);
+        g_clear_object (&simple);
+        g_main_loop_quit (main_loop);
+
+        return FALSE;
+}
+
 gchar *
 str_channels (GNOMEInternetRadioLocatorChannels type) {
   gchar *channels;
@@ -792,6 +844,11 @@ main (int argc,
        GtkTreeIter iter;
        GNOMEInternetRadioLocatorStationInfo *stationinfo, *localstation;
        guint context_id;
+       GClueLocation *location;
+        gdouble altitude, speed, heading;
+        GVariant *timestamp;
+        GTimeVal tv = { 0 };
+        const char *desc;
        bindtextdomain (GETTEXT_PACKAGE, GNOME_INTERNET_RADIO_LOCATOR_LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
@@ -837,7 +894,12 @@ 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);
+       /* location = gclue_simple_get_location (simple); */
+       /* champlain_view_center_on (CHAMPLAIN_VIEW (view), */
+       /*                        gclue_location_get_latitude (location), */
+       /*                        gclue_location_get_longitude (location)); */
        layer = create_marker_layer (view, &path);
        champlain_view_add_layer (view, CHAMPLAIN_LAYER (path));
        champlain_view_add_layer (view, CHAMPLAIN_LAYER (layer));
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 7f639ca..b3b6f3d 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -1011,6 +1011,13 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
     <stream mime="audio/mpeg" uri="http://wamu-1.streamguys.com/"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Mono" bitrate="48 kbps" />
     <uri>http://wamu.org/</uri>
   </station>
+  <station band="90.1FM" id="c-span" lang="en" name="C-SPAN" rank="1.0" type="org">
+    <frequency uri="http://www.c-span.org/";>90.1 FM in Supreme Court, United States of America</frequency>
+    <location>Supreme Court, United States of America</location>
+    <description lang="en">C-SPAN Radio 90.1 WCSP-FM in Washington, DC offers commercial-free public affairs 
programming 24 hours a day. You’ll hear live coverage from Washington of important congressional hearings and 
key speeches from national leaders.</description>
+    <stream mime="audio/mpeg" 
uri="https://playerservices.streamtheworld.com/api/livestream-redirect/CSPANRADIO.mp3"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="22050 Hz" channels="Stereo" bitrate="39 kbps" />
+    <uri>http://www.c-span.org/</uri>
+  </station>
   <!-- Appears to be down as of 2016/07/07
   <station band="1580AM" id="kdup" lang="en" name="KDUP" rank="1.0" type="edu">
     <frequency uri="http://kdup.up.edu/";>1580 AM in Portland, Oregon</frequency>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]