Merge pull request #374 from technosf/development

2.1.0

Author: technosf

data/css/Tuner-system.css

@@ -56,6 +56,50 @@
         border-style: ridge;
 }
 
+/* Remove green focus/active outline during drag */
+.station-button:focus,
+.station-button:active,
+.station-button.reorderable:focus,
+.station-button.reorderable:active {
+    outline-style: none;
+    outline-width: 0;
+    -gtk-outline-width: 0;
+    box-shadow: none;
+}
+
+/* Suppress FlowBox focus rings around station items */
+flowboxchild:focus,
+flowboxchild:active,
+flowboxchild:selected,
+flowboxchild:selected:focus,
+flowboxchild:selected:active {
+    outline-style: none;
+    outline-width: 0;
+    -gtk-outline-width: 0;
+    box-shadow: none;
+    border: none;
+    background: transparent;
+}
+
+/* Suppress drag outlines within station lists */
+.station-list,
+.station-list flowboxchild,
+.station-list flowboxchild:focus,
+.station-list flowboxchild:active,
+.station-list flowboxchild:selected,
+.station-list flowboxchild:selected:focus,
+.station-list flowboxchild:selected:active,
+.station-list flowboxchild:drop(active),
+.station-list flowboxchild.drag-highlight {
+    /* GTK3 focus ring removal for DnD; note this hides keyboard focus. */
+    outline-style: none;
+    outline-width: 0;
+    -gtk-outline-width: 0;
+    box-shadow: none;
+    border: none;
+    background: transparent;
+}
+
 /* Spaces the station button image */
 .station-button image {
 	background-color: darker(@bg_color);
@@ -84,3 +128,27 @@
     padding-bottom: 0px;
 }
 
+tooltip {
+    opacity: 0.65;
+    background-color: black;
+} 
+
+.metadata-popover {
+    opacity: 0.65;
+    /* Match popover background to tooltip background. */
+    background-color: black;
+}
+
+.heart-favorited image {
+    color: #d00000;
+}
+
+/* Search revealer background to avoid transparency gaps */
+.search-revealer-bg {
+    /* Use a solid, theme-safe color */
+    background-color: shade(@theme_bg_color, 0.90);
+    background-image: none;
+    box-shadow: none;
+    border: 2px solid shade(@theme_bg_color, 0.8);
+    border-radius: 0;
+}

data/io.github.tuner_labs.tuner.gresource.xml

@@ -29,5 +29,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
  </gresource>
 
-</gresources>
+  <gresource prefix="/io/github/tuner_labs/tuner/sounds">
+    <file alias="tuner_startup.mp3">sounds/tuner_startup.mp3</file>
+  </gresource>
 
+</gresources>

data/io.github.tuner_labs.tuner.gschema.xml

@@ -48,7 +48,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <default>false</default>
             <summary>Faster cycling through stream info</summary>
             <description>Fast cycle through the metadata from the playing stream if show stream info is enabled</description>
-        </key>        
+        </key>
+        <key name="stream-info-image-popup" type="b">
+            <default>false</default>
+            <summary>Stream metadata image popup</summary>
+            <description>Show a movable popup with images discovered in the stream metadata</description>
+        </key>
         <key name="excluded-countries" type="as">
             <default>[]</default>
             <summary>Excluded Countries</summary>
@@ -94,5 +99,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
             <summary>Restart playing after a network interuption</summary>
             <description>If enabled, if there is an network interuption and Tuner was playing Tuner will automatically start to play the last played station</description>
         </key>
+        <key name="source-list-expanded-mask" type="u">
+            <default>2</default>
+            <summary>Source list expansion state</summary>
+            <description>Bitmask of expanded source list sections</description>
+        </key>
     </schema>
 </schemalist>

data/sounds/tuner_startup.mp3

@@ -12,7 +12,7 @@
 project (
     'io.github.tuner_labs.tuner',
     'vala', 'c',
-    version: '2.0.3',
+    version: '2.0.4-beta.1',
     meson_version: '>= 1.3.2',
 )
 

meson.build

@@ -13,4 +13,4 @@
 set -e
 
 meson compile -C builddir 
-GSETTINGS_SCHEMA_DIR="builddir/data" ./builddir/io.github.tuner_labs.tuner
+G_MESSAGES_DEBUG=all GSETTINGS_SCHEMA_DIR="builddir/data" ./builddir/io.github.tuner_labs.tuner

scripts/helpers/tbrl

@@ -12,4 +12,4 @@
 
 set -e
 
-GSETTINGS_SCHEMA_DIR="builddir/data" ./builddir/io.github.tuner_labs.tuner
+G_MESSAGES_DEBUG=all GSETTINGS_SCHEMA_DIR="builddir/data" ./builddir/io.github.tuner_labs.tuner

scripts/helpers/trl

@@ -10,6 +10,7 @@
  */
 
  using GLib;
+ using Gst;
  using Tuner.Coordinators;
  using Tuner.Controllers;
  using Tuner.Events;
@@ -68,9 +69,6 @@ namespace Tuner {
     {
         private delegate void StringActionHandler(string value);
 
-        /** @brief Signal emitted when the shuffle mode changes   */
-        public signal void shuffle_mode_sig(bool shuffle);
-
         public static string ENV_LANG = "LANGUAGE";
 
         /** @brief Application version */
@@ -131,7 +129,7 @@ namespace Tuner {
             } catch (Error e) {
                 warning(@"Error reading locale path: $(e.message)");
             }            
-        }
+        } // static construct
 
         // -------------------------------------
 
@@ -227,7 +225,7 @@ namespace Tuner {
                 _is_online = value;
                 is_offline = !value;
                 if (events != null)
-                    events.connectivity_changed(_is_online, is_offline);
+                    events.connectivity_changed_sig(_is_online );
             }
         }   
 
@@ -251,6 +249,7 @@ namespace Tuner {
         private bool _has_started = false;
         // Coordinates startup-only cross-component flows (e.g., deferred autoplay).
         private StartupCoordinator _startup_coordinator;
+        private Gst.Element? _startup_jingle;
         // Coordinates playback restart behavior after online/offline transitions.
         private PlaybackRecoveryCoordinator _playback_recovery_coordinator;
         // Coordinates provider click/vote updates from player events.
@@ -261,7 +260,7 @@ namespace Tuner {
         * @brief Constructor for the Application
         */
         private Application () {
-            Object (
+            GLib.Object (
                 application_id: APP_ID,
                 flags: ApplicationFlags.FLAGS_NONE
             );
@@ -429,7 +428,7 @@ namespace Tuner {
         private void initialize_coordinators()
         {
             _playback_recovery_coordinator = new PlaybackRecoveryCoordinator(this, events, player, settings);
-            _usage_tracking_coordinator = new UsageTrackingCoordinator(settings, player, provider);
+            _usage_tracking_coordinator = new UsageTrackingCoordinator(settings, events, provider);
         }
 
 
@@ -548,16 +547,57 @@ namespace Tuner {
         private void create_main_window()
         {
             window = new Window (this, player, settings, directory);
+            play_startup_jingle ();
             _startup_coordinator = new StartupCoordinator(this, events, window, settings, directory);
             _startup_coordinator.start();
 
             // Flathub screenshot sizing
-            window.resize(1000, 625);    // Screenshot sizing - round corners 80, ds op 1
+            //window.resize(1000, 625);    // Screenshot sizing - round corners 80, ds op 1
 
             add_window(window);
         }
 
 
+        /**
+        * @brief Play the startup jingle (resource-backed WAV) once per launch.
+        */
+        private void play_startup_jingle ()
+        {
+            if (_startup_jingle != null)
+                return;
+
+            var playbin = Gst.ElementFactory.make ("playbin", "startup-jingle");
+            if (playbin == null)
+                return;
+
+            var uri = "resource:///io/github/tuner_labs/tuner/sounds/tuner_startup.mp3";
+            playbin.set ("uri", uri);
+            playbin.set ("volume", settings.volume);
+            _startup_jingle = playbin;
+
+            var bus = playbin.get_bus ();
+            if (bus != null)
+            {
+                bus.add_signal_watch ();
+                bus.message.connect ((message) => {
+                    switch (message.type)
+                    {
+                        case Gst.MessageType.EOS:
+                        case Gst.MessageType.ERROR:
+                            playbin.set_state (Gst.State.NULL);
+                            bus.remove_signal_watch ();
+                            _startup_jingle = null;
+                            break;
+                        default:
+                            break;
+                    }
+                });
+            }
+
+            playbin.set_state (Gst.State.PLAYING);
+        }
+
+
         /**
         * @brief Create directory structure quietly
         *
@@ -589,7 +629,8 @@ namespace Tuner {
         {
             bool network_available = NETMON.get_network_available ();
 
-            if(_monitor_changed_id > 0) 
+            // Clean up the prior network monitor task
+            if( _monitor_changed_id > 0) 
             {
                 Source.remove(_monitor_changed_id);
                 _monitor_changed_id = 0;
@@ -600,7 +641,7 @@ namespace Tuner {
                 wait 1 seconds before setting to online status
                 to whatever the state is at that time
             */
-            if (network_available)
+            if ( network_available )
             {
                 if (is_online)
                     return;
@@ -660,7 +701,6 @@ namespace Tuner {
             }
 
             return { exe };
-        }
-
+        } // build_restart_argv
     } // Application
 } // namespace Tuner

src/Application.vala

@@ -245,6 +245,17 @@ public class Tuner.Controllers.DirectoryController : Object
     } // get_starred
 
 
+    /**
+     * @brief Reorders starred stations and persists the change.
+     *
+     * @param stationuuids The ordered list of station UUIDs.
+     */
+    public void reorder_starred (Gee.List<string> stationuuids)
+    {
+        _star_store.reorder_stations (stationuuids);
+    } // reorder_starred
+
+
 // --------------------------------------------------
 
     /**

src/Controllers/DirectoryController.vala

@@ -34,24 +34,6 @@ public class Tuner.Controllers.PlayerController : GLib.Object
     } // Is
 
 
-    /** Signal emitted when the station changes. */
-    public signal void station_changed_sig (Station station);
-
-    /** Signal emitted when the player state changes. */
-    public signal void state_changed_sig (Station station, Is state);
-
-    //  /** Signal emitted when the title changes. */
-    public signal void metadata_changed_sig (Station station, Metadata metadata);
-
-    /** Signal emitted when the volume changes. */
-    public signal void volume_changed_sig (double volume);
-
-    /** Signal emitted every ten minutes that a station has been playing continuously. */
-    public signal void tape_counter_sig (Station station);
-
-    /** @brief Signal emitted when the shuffle is requested   */
-    public signal void shuffle_requested_sig();
-
     /** The error received when playing, if any */
     private bool _play_error = false;
     public bool play_error { get { return _play_error; } }
@@ -83,13 +65,13 @@ public class Tuner.Controllers.PlayerController : GLib.Object
 		// Stream metadata received
 		{
 			if (_metadata.process_media_info_update (obj))
-				metadata_changed_sig (_station, _metadata);
+				app().events.metadata_changed_sig (_station, _metadata);
 		});
 
         _player.volume_changed.connect ((obj) => 
         // Volume changed
         {
-            volume_changed_sig(obj.volume);
+            app().events.volume_changed_sig(obj.volume);
             app().settings.volume =  obj.volume;
         });
 
@@ -181,7 +163,7 @@ public class Tuner.Controllers.PlayerController : GLib.Object
         private set {
             _player_state = value;
             if (_station != null)
-                state_changed_sig(_station, value);
+                app().events.state_changed_sig(_station, value);
 
 			if (value == Is.STOPPED || value == Is.STOPPED_ERROR)
 			{
@@ -197,7 +179,7 @@ public class Tuner.Controllers.PlayerController : GLib.Object
 				{
 					if (_station == null)
 						return Source.REMOVE;
-					tape_counter_sig(_station);
+					app().events.tape_counter_sig(_station);
 					return Source.CONTINUE;
 				});
 			}
@@ -243,7 +225,7 @@ public class Tuner.Controllers.PlayerController : GLib.Object
 	{
 		_player.stop ();
         _station = station;
-        station_changed_sig (_station);
+        app().events.station_changed_sig (_station);
 		_player.uri = (_station.urlResolved != null && _station.urlResolved != "") ? _station.urlResolved : _station.url;
 		_play_error = false;
 		Timeout.add (500, () =>
@@ -298,6 +280,6 @@ public class Tuner.Controllers.PlayerController : GLib.Object
      */
 	public void shuffle ()
 	{
-		shuffle_requested_sig();
+		app().events.shuffle_requested_sig();
 	} // shuffle
 } // PlayerController