Merge lp:~philip.scott/wingpanel-indicator-sound/remember-last-player into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Felipe Escoto]

Remember last player

Whenever you use a different music player other than your default, it never remembers which one you last used, and you can end up with two players even if the default one is inactive

[Djax (parnold-x)]

hey felipe, maybe I'm don't get it right but why are you storing the player? For me the thing you want to achieve is that when the default media player is not running and some other is started you hide the default media player and when none is running you show the default media player right?

[Felipe Escoto (philip.scott)]

Well yeah, that's one thing I wanted to solve. But I also wanted to let the indicator store the last player you used (Spotify for example) even if that's not the default player

[Djax (parnold-x)]

And why does it need the last player? Do you want to show the last player instead of the default player starting then? In my testing it doesn't do that.

[Felipe Escoto (philip.scott)]

Ahh, i see my problem. It does replace the default one but only after wingpanel restarts or while the replacement is still running.

review: Needs Fixing

[Djax (parnold-x)]

Maybe it would be better to just hide the default if it is not running and something other is running. Would be a lot easier...

[lp:~philip.scott/wingpanel-indicator-sound/remember-last-player]

122. By Felipe Escoto on 2016-10-23

Hide default if another player is running

123. By Felipe Escoto on 2016-10-23

Corrected disapearing condition for the default widget

[Felipe Escoto (philip.scott)]

Djax: Alright, for now I followed your advice and just hid the default if is not running while another interface is there. I still would like if the indicator could remember the last player you used instead of it returning straight to the default app after you closed it, but i'll push that in another branch as it would require quite some changes

review: Approve (removing my needs fixing)

[Djax (parnold-x)]

Works as intended

review: Approve

=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala	2016-09-28 20:49:29 +0000
+++ src/Widgets/MprisGui.vala	2016-10-23 13:44:39 +0000
@@ -272,6 +272,7 @@
         settings.last_title_info = {ainfo.get_id (), title_label.get_text (), artist_label.get_text (), last_artUrl};
 
         this.client = null;
+        this.mpris_name = "";
     }
 
     private void connect_to_client () {

=== modified file 'src/Widgets/MprisWidget.vala'
--- src/Widgets/MprisWidget.vala	2015-09-14 21:09:53 +0000
+++ src/Widgets/MprisWidget.vala	2016-10-23 13:44:39 +0000
@@ -28,15 +28,19 @@
             setup_dbus();
             return false;
         });
+
         default_music = AppInfo.get_default_for_type ("audio/x-vorbis+ogg", false);
         if (default_music != null) {
             default_widget = new ClientWidget.default (default_music, settings);
+
             default_widget.close.connect (() => {
                 close ();
             });
+
             default_widget.show_all();
             pack_start(default_widget, false, false, 0);
         }
+
         show_all();
     }
 
@@ -60,7 +64,14 @@
         if (iface.player.desktop_entry == default_music.get_id ().replace (".desktop","")) {
             default_widget.set_client (name, iface);
             ifaces.insert(name, default_widget);
+            default_widget.no_show_all = false;
+            default_widget.visible = true;
         } else {
+            if (default_widget.mpris_name == "") {
+                default_widget.no_show_all = true;
+                default_widget.visible = false;
+            }
+
             ClientWidget widg = new ClientWidget (iface);
             widg.close.connect (() => {
                 close ();
@@ -83,9 +94,19 @@
             var widg = ifaces[name];
             if (widg  != null) {
                 remove(widg);
-                ifaces.remove(name);
             }
         }
+
+        ifaces.remove(name);
+
+        if (ifaces.length != 0 && default_widget.mpris_name == "") {
+            default_widget.no_show_all = true;
+            default_widget.visible = false;
+        } else {
+            default_widget.no_show_all = false;
+            default_widget.visible = true;
+            show_all ();
+        }
     }
 
     /**
@@ -177,4 +198,4 @@
 
         return cl;
     }
-}
\ No newline at end of file
+}