GNOME.org
 

[gnome-internet-radio-locator] GNOME Internet Radio Locator 4 for GNOME 40

commit 9ead771082cb578796a547b65883f52b647d47c5
Author: Ole Aamot <ole gnome org>
Date:   Wed Mar 24 23:55:17 2021 +0100

    GNOME Internet Radio Locator 4 for GNOME 40

 Makefile.am                                        |  5 +---
 NEWS                                               | 18 ++++++++++++
 configure.ac                                       |  4 +--
 data/gnome-internet-radio-locator.appdata.xml.in   |  8 +++---
 gnome-internet-radio-locator.spec.in               | 11 +++++---
 meson.build                                        | 33 ----------------------
 src/Makefile.am                                    |  4 +--
 ....1.dtd => gnome-internet-radio-locator-4.0.dtd} |  0
 src/gnome-internet-radio-locator-gui.c             |  6 ----
 src/gnome-internet-radio-locator-station.c         |  9 ++++--
 src/gnome-internet-radio-locator.c                 |  2 +-
 src/gnome-internet-radio-locator.xml               |  4 +--
 src/meson.build                                    | 24 ----------------
 13 files changed, 44 insertions(+), 84 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 62a7c85..635db85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,7 @@ EXTRA_DIST = m4/ChangeLog  \
        TODO \
        UBUNTU \
         gnome-internet-radio-locator.spec \
-        gnome-internet-radio-locator.spec.in \
-        meson.build \
-        po/meson.build \
-        src/meson.build
+        gnome-internet-radio-locator.spec.in
 
 DISTCLEANFILES =                \
         intltool-extract        \
diff --git a/NEWS b/NEWS
index 8df8322..75da4d9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+=============
+Version 4.0.0
+=============
+
+Build
+
+       * configure.in: Require GTK+ 4.0
+       * data/gnome-internet-radio-locator.appdata.xml.in: GNOME 40
+       * gnome-internet-radio-locator.spec: Require GTK+ 4.0
+
+GUI
+
+       * src/gnome-internet-radio-locator-station.c: Fix stream->uri XML issue
+
+XML
+
+       * src/gnome-internet-radio-locator-4.0.dtd: Add 4.0 Data Type Definition
+
 =============
 Version 3.9.2
 =============
diff --git a/configure.ac b/configure.ac
index 15308aa..8165b47 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.9.2)
+AC_INIT(gnome-internet-radio-locator,4.0.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])
@@ -96,7 +96,7 @@ PKG_CHECK_MODULES(GNOME_INTERNET_RADIO_LOCATOR,
                  gstreamer-video-1.0 \
                  gstreamer-plugins-bad-1.0 \
                  gstreamer-plugins-base-1.0 \
-                 gtk+-3.0 >= 3.0 \
+                 gtk4 >= 4.0.3 \
                  libgeoclue-2.0 >= 0.29.1 \
                  libxml-2.0 >= 2.0 \
                  pangoft2 >= 0.28)
diff --git a/data/gnome-internet-radio-locator.appdata.xml.in 
b/data/gnome-internet-radio-locator.appdata.xml.in
index a508c17..9eaed19 100644
--- a/data/gnome-internet-radio-locator.appdata.xml.in
+++ b/data/gnome-internet-radio-locator.appdata.xml.in
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <application>
   <id type="desktop">gnome-internet-radio-locator.desktop</id>
-  <_name>GNOME Internet Radio Locator for GNOME 3</_name>
+  <_name>GNOME Internet Radio Locator 4 for GNOME 40</_name>
   <_summary>Locate and listen to Free Internet Radio stations</_summary>
   <licence>CC0</licence>
   <description>
     <_p>
-      GNOME Internet Radio Locator for GNOME 3 is a Free Software program
+      GNOME Internet Radio Locator 4 for GNOME 40 is a Free Software program
       that allows you to easily locate and listen to Free Internet Radio
       stations by broadcasters on the Internet with the help of a map.
     </_p>
     <_p>
-      GNOME Internet Radio Locator for GNOME 3 is developed for the GNOME
+      GNOME Internet Radio Locator 4 for GNOME 40 is developed for the GNOME
       3 desktop and requires gstreamer 1.0 to be installed for listening
       to Free Internet Radio stations.
     </_p>
     <_p>
       Enjoy listening to Free Internet Radio stations in GNOME Internet
-      Radio Locator for GNOME 3.
+      Radio Locator 4 for GNOME 40.
     </_p>
   </description>
   <url type="homepage">https://wiki.gnome.org/Apps/InternetRadioLocator</url>
diff --git a/gnome-internet-radio-locator.spec.in b/gnome-internet-radio-locator.spec.in
index 3b912c5..1856849 100644
--- a/gnome-internet-radio-locator.spec.in
+++ b/gnome-internet-radio-locator.spec.in
@@ -7,7 +7,7 @@ URL:            https://people.gnome.org/~ole/%{name}
 Source:         %{url}/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc
-BuildRequires:  gtk3-devel
+BuildRequires:  gtk4-devel
 BuildRequires:  pango
 BuildRequires:  libchamplain-devel
 BuildRequires:  libxml2-devel
@@ -24,12 +24,12 @@ Requires:       gstreamer1-plugins-ugly-free >= 1.8.3
 Requires:       geocode-glib >= 3.20.1
 
 %description
-GNOME Internet Radio Locator is a Free Software program that allows
+GNOME Internet Radio Locator 4 is a Free Software program that allows
 you to easily locate and listen to Free Internet Radio stations by
 broadcasters on the Internet with the help of map and text search.
 
-GNOME Internet Radio Locator is developed on the GNOME desktop
-platform and it requires GStreamer 1.0 for playback.
+GNOME Internet Radio Locator 4 is developed on the GNOME 40 desktop
+platform and it requires GTK+ 4.0 and GStreamer 1.0 for playback.
 
 Enjoy Free Internet Radio.
 
@@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Wed Mar 24 2021 Ole Aamot <ole gnome org> - 4.0.0-1
+- gnome-internet-radio-locator 4.0.0 build on Fedora Linux 34
+
 * Sat Nov 28 2020 Ole Aamot <ole gnome org> - 3.7.0-1
 - gnome-internet-radio-locator 3.7.0 build on Fedora Linux 33
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b0c026b..3956706 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,9 +36,9 @@ gnome_internet_radio_locator_LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
 
 gnomeinternetradiolocatordir = $(datadir)/gnome-internet-radio-locator
 
-gnomeinternetradiolocator_DATA = gnome-internet-radio-locator-0.1.dtd gnome-internet-radio-locator.xml
+gnomeinternetradiolocator_DATA = gnome-internet-radio-locator-4.0.dtd gnome-internet-radio-locator.xml
 
-EXTRA_DIST = gnome-internet-radio-locator.h gnome-internet-radio-locator-player.h 
gnome-internet-radio-locator-keys.h gnome-internet-radio-locator-markers.h 
gnome-internet-radio-locator-player-kb.h gnome-internet-radio-locator-player-resource.h 
gnome-internet-radio-locator-radius.h gnome-internet-radio-locator-station.h 
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h 
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h 
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-runners.h 
gnome-internet-radio-locator-streams.h gnome-internet-radio-locator-0.1.dtd gnome-internet-radio-locator.xml 
gnome-internet-radio-locator.xsl gnome-internet-radio-locator.gresource.xml
+EXTRA_DIST = gnome-internet-radio-locator.h gnome-internet-radio-locator-player.h 
gnome-internet-radio-locator-keys.h gnome-internet-radio-locator-markers.h 
gnome-internet-radio-locator-player-kb.h gnome-internet-radio-locator-player-resource.h 
gnome-internet-radio-locator-radius.h gnome-internet-radio-locator-station.h 
gnome-internet-radio-locator-stations-map.h gnome-internet-radio-locator-tz.h 
gnome-internet-radio-locator-gui.h gnome-internet-radio-locator-listener.h 
gnome-internet-radio-locator-program.h gnome-internet-radio-locator-runners.h 
gnome-internet-radio-locator-streams.h gnome-internet-radio-locator-4.0.dtd gnome-internet-radio-locator.xml 
gnome-internet-radio-locator.xsl gnome-internet-radio-locator.gresource.xml
 
 LDADD = $(GNOME_INTERNET_RADIO_LOCATOR_LIBS)
 
diff --git a/src/gnome-internet-radio-locator-0.1.dtd b/src/gnome-internet-radio-locator-4.0.dtd
similarity index 100%
rename from src/gnome-internet-radio-locator-0.1.dtd
rename to src/gnome-internet-radio-locator-4.0.dtd
diff --git a/src/gnome-internet-radio-locator-gui.c b/src/gnome-internet-radio-locator-gui.c
index a205970..884aaa9 100644
--- a/src/gnome-internet-radio-locator-gui.c
+++ b/src/gnome-internet-radio-locator-gui.c
@@ -213,15 +213,11 @@ save_cb (GtkWidget *widget, gpointer data) {
        urientry = g_object_get_data(G_OBJECT(widget), "station_uri");
        websiteentry = g_object_get_data(G_OBJECT(widget), "station_website");
        descriptionentry = g_object_get_data(G_OBJECT(widget), "station_description");
-       player = gst_player_new (NULL, gst_player_g_main_context_signal_dispatcher_new(NULL));
-       gnome_internet_radio_locator_player_new(GST_PLAYER(player), urientry);
        context_id = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar), "Station Name");
        /* Translators: first %s is station name and second %s is station location */
        statusmsg = g_strdup_printf(_("Added %s in %s"), nameentry, locationentry);
        gtk_statusbar_push (GTK_STATUSBAR (statusbar), GPOINTER_TO_INT (context_id), statusmsg);
        g_free(statusmsg);
-       gst_player_stop(player);
-       gst_player_play(player);
        GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("%s\n", nameentry);
        GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("%s\n", locationentry);
        GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("%s\n", urientry);
@@ -336,10 +332,8 @@ GtkWidget *create_new_station_selector(gchar *location) {
                          (gchar *) gtk_entry_get_text(GTK_ENTRY(bandentry)));
        g_object_set_data(G_OBJECT(station_selector), "station_location",
                          (gchar *) gtk_entry_get_text(GTK_ENTRY(locationentry)));
-       GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("LOCATIONENTRY: %s\n", (gchar *) 
gtk_entry_get_text(GTK_ENTRY(locationentry)));
        g_object_set_data(G_OBJECT(station_selector), "station_uri",
                          (gchar *) gtk_entry_get_text(GTK_ENTRY(urientry)));
-       GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("URIENTRY: %s\n", (gchar *) 
gtk_entry_get_text(GTK_ENTRY(urientry)));
        g_object_set_data(G_OBJECT(station_selector), "station_description",
                          (gchar *) gtk_entry_get_text(GTK_ENTRY(descriptionentry)));
        g_object_set_data(G_OBJECT(station_selector), "station_website",
diff --git a/src/gnome-internet-radio-locator-station.c b/src/gnome-internet-radio-locator-station.c
index 2d1f852..56bbd23 100644
--- a/src/gnome-internet-radio-locator-station.c
+++ b/src/gnome-internet-radio-locator-station.c
@@ -2,7 +2,7 @@
  *
  * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014-2019  Aamot Software
+ * Copyright (C) 2014-2021  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
@@ -478,6 +478,11 @@ gnome_internet_radio_locator_station_parser(GNOMEInternetRadioLocatorStationInfo
 
                        GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("station->stream->samplerate = %li\n",
                            station->stream->samplerate);
+
+                       if (xmlGetProp(sub, (const xmlChar *)"uri") != NULL) {
+                               station->stream->uri = (char *)xmlGetProp(sub, (const xmlChar *)"uri");
+                       }
+
                        station->stream->uri = (gchar *)xmlGetProp(sub, (const xmlChar *)"uri");
                        GNOME_INTERNET_RADIO_LOCATOR_DEBUG_MSG("station->stream->uri = %s\n",
                            station->stream->uri);
@@ -626,7 +631,7 @@ gint gnome_internet_radio_locator_station_update (GNOMEInternetRadioLocatorStati
        new_station->stream->uri = g_strdup(station_uri);
        new_station->uri = g_strdup(station_website);
        fp = g_fopen(stations, "w+");
-       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE gnome_internet_radio_locator SYSTEM 
'gnome_internet_radio_locator-0.1.dtd'>\n<gnome_internet_radio_locator version='%s'>\n", VERSION);
+       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE gnome_internet_radio_locator SYSTEM 
'gnome_internet_radio_locator-4.0.dtd'>\n<gnome_internet_radio_locator version='%s'>\n", VERSION);
        // stationinfo-> = l->data;
        while (stationinfo != NULL) {
                local_station_uri = g_strdup(stationinfo->stream->uri);
diff --git a/src/gnome-internet-radio-locator.c b/src/gnome-internet-radio-locator.c
index 04138f3..88a9bdc 100644
--- a/src/gnome-internet-radio-locator.c
+++ b/src/gnome-internet-radio-locator.c
@@ -671,7 +671,7 @@ gnome_internet_radio_locator_window_cb (GtkApplication *app,
        gtk_container_add (GTK_CONTAINER(window), GTK_WIDGET(grid));
        g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 #endif
-       gtk_window_set_title (GTK_WINDOW(window), _("GNOME Internet Radio Locator"));
+       gtk_window_set_title (GTK_WINDOW(window), _("GNOME Internet Radio Locator 4 for GNOME 40"));
        gtk_window_set_default_size (GTK_WINDOW(window), 740, 580);
        gtk_window_maximize (GTK_WINDOW (window));
        gnome_internet_radio_locator_app = create_gnome_internet_radio_locator_app();
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index dd6ddd2..37d133a 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="3.9.2">
+<!DOCTYPE gnome_internet_radio_locator SYSTEM "gnome-internet-radio-locator-4.0.dtd">
+<gnome_internet_radio_locator version="4.0.0">
   <station band="105.5FM" id="bygderadiovest" lang="en" name="Bygderadio Vest" rank="1.0" type="org">
     <location>Volda, Norway</location>
     <description lang="no">Volda og Ørsta Bygderadio AS starta sendingar i februar 1989.  I starten dekte 
radioen berre bygdene Volda og Ørsta.  I 2000 vart radioen slått saman med Radio Vest AS i Herøy.   Namnet 
vart då endra til Bygderadio Vest AS.  Alt arbeidet ved radioen vert gjort på dugnad.   Bygderadio Vest AS 
dekkjer no 7 kommuner; Volda, Ørsta, Hareid, Herøy, Ulstein, Sande og Vannylven.  Det bur omlag 46.700 
menneske i desse kommunane.    Frå 2008 har Bygderadio Vest AS konsesjon som almennradio med konsesjon for å 
sende 240 minutt lokalprodusert stoff i tidsrommet 06-18. Konsesjonen gjeld fram til 31.12.2026.</description>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]