Merge lp:~parnold-x/wingpanel-indicator-sound/fix_1596270 into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Djax]

prevent freezing due to mpris players

The freeze comes due to the fact that many MPRIS interfaces do not give a proper answer after receiving patches. The Vala DBus library always waits the default timeout before continuing, which is 25 seconds. This means blocking the whole elementary UI for 25 seconds, which is really bad.

Since the response is not from use anyways and really many players fail, this fix should be merged instead of relying on patches in the players. The best solution would be allowing 0 timeout in vala, but this does not seem to be possible.

The branch threads the DBus calls to ensure an always responsive UI.

=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala	2016-07-15 16:49:59 +0000
+++ src/Widgets/MprisGui.vala	2016-09-28 20:52:38 +0000
@@ -149,11 +149,23 @@
         btn.clicked.connect (()=> {
             Idle.add (()=> {
                 if  (client.player.can_go_previous) {
-                    try {
-                        client.player.previous ();
-                    } catch  (Error e) {
-                        warning ("Could not go to previous track: %s", e.message);
-                    }
+                  if(!Thread.supported ()) {
+                      warning ("Threading is not supported. DBus timeout could be blocking UI");
+                      try {
+                          client.player.previous();
+                      } catch  (Error e) {
+                          warning ("Going to previous track probably failed (faulty MPRIS interface): %s", e.message);
+                      }
+                  } else {
+                      new Thread <void*> ("wingpanel_indicator_sound_dbus_backward_thread", () => {
+                          try {
+                              client.player.previous();
+                          } catch (Error e) {
+                              warning ("Going to previous track probably failed (faulty MPRIS interface): %s", e.message);
+                          }
+                          return null;
+                        });
+                  }
                 }
                 return false;
             });
@@ -165,15 +177,22 @@
         play_btn = btn;
         btn.clicked.connect (()=> {
             Idle.add (()=> {
-                try {
-                    if (client != null) {
-                        client.player.play_pause ();
-                    } else {
-                        launched_by_indicator = true;
-                        ainfo.launch (null, null);
+                if(!Thread.supported ()) {
+                    warning ("Threading is not supported. DBus timeout could be blocking UI");
+                    try {
+                        client.player.play_pause();
+                    } catch  (Error e) {
+                        warning ("Playing/Pausing probably failed (faulty MPRIS interface): %s", e.message);
                     }
-                } catch  (Error e) {
-                    warning ("Could not play/pause: %s", e.message);
+                } else {
+                    new Thread <void*> ("wingpanel_indicator_sound_dbus_backward_thread", () => {
+                        try {
+                            client.player.play_pause();
+                        } catch (Error e) {
+                            warning ("Playing/Pausing probably failed (faulty MPRIS interface): %s", e.message);
+                        }
+                        return null;
+                      });
                 }
                 return false;
             });
@@ -185,10 +204,22 @@
         btn.clicked.connect (()=> {
             Idle.add (()=> {
                 if (client.player.can_go_next) {
-                    try {
-                        client.player.next ();
-                    } catch  (Error e) {
-                        warning ("Could not go to next track: %s", e.message);
+                    if(!Thread.supported ()) {
+                        warning ("Threading is not supported. DBus timeout could be blocking UI");
+                        try {
+                            client.player.next();
+                        } catch  (Error e) {
+                            warning ("Going to next track probably failed (faulty MPRIS interface): %s", e.message);
+                        }
+                    } else {
+                        new Thread <void*> ("wingpanel_indicator_sound_dbus_forward_thread", () => {
+                            try {
+                                client.player.next();
+                            } catch (Error e) {
+                                warning ("Going to next track probably failed (faulty MPRIS interface): %s", e.message);
+                            }
+                            return null;
+                          });
                     }
                 }
                 return false;
@@ -273,7 +304,23 @@
         try {
             close ();
             if (client != null && client.player.can_raise) {
-                client.player.raise ();
+                if(!Thread.supported ()) {
+                    warning ("Threading is not supported. DBus timeout could be blocking UI");
+                    try {
+                        client.player.raise();
+                    } catch  (Error e) {
+                        warning ("Raising the player probably failed (faulty MPRIS interface): %s", e.message);
+                    }
+                } else {
+                    new Thread <void*> ("wingpanel_indicator_sound_dbus_backward_thread", () => {
+                        try {
+                            client.player.raise();
+                        } catch (Error e) {
+                            warning ("Raising the player probably failed (faulty MPRIS interface): %s", e.message);
+                        }
+                        return null;
+                      });
+                }
             } else if (ainfo != null) {
                 ainfo.launch (null, null);
             }