Merge lp:~mr-fiorotto/wingpanel-indicator-sound/trying-to-fix-1591392 into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Giuliano Fiorotto]

[Danielle Foré (danrabbit)]

Please make sure to add a copyright header for new files, specifically MediaPlayer.vala

I can confirm that my phone shows up as a new media player and the track information displays.

I can't confirm that the player controls work here (iPhone running iOS 10)

Can we get the device icon instead of using the bluetooth icon?

review: Needs Fixing

[Danielle Foré (danrabbit)]

Oh hey I disconnected and re-paired my phone and now the controls are working. Neat :)

[Fabio Zaramella (fabiozaramella)]

Daniel, we have already tried to discriminate between device types in order to display the correct icon but unfortunately the possible values are:"Audio", "Video", "Audio Broadcasting" and "Video Broadcasting". I don't think that showing a phone icon is a good idea because it could also be a tablet, or any other bluetooth media player, but i agree that bluetooth icon also looks a bit out of place. It would be nice to have a proper icon, for example a speaker with a little bluetooth icon overlay or something like this. ;)

[lp:~mr-fiorotto/wingpanel-indicator-sound/trying-to-fix-1591392]

146. By Giuliano Fiorotto on 2017-02-01

Updated all copyright headers

[Danielle Foré (danrabbit)]

If you look on the Bluez interface it actually gives you the direct value of the icon name for a device. I'll ping you about this on Slack :)

[Danielle Foré (danrabbit)]

Please make sure you don't *change* any licenses. It looks like you've re-licensed several files from LGPL to GPL. Only *add* a license header to your *new* files please :)

review: Needs Fixing

[lp:~mr-fiorotto/wingpanel-indicator-sound/trying-to-fix-1591392]

147. By Giuliano Fiorotto on 2017-02-05

Display device icon and name

148. By Giuliano Fiorotto on 2017-02-05

fix conflicts

[Fabio Zaramella (fabiozaramella)]

Can you check licenses are ok now?

review: Needs Information

[Danielle Foré (danrabbit)]

When in doubt check the diff. You diff should only contain changes that fall within the scope of solving the issue. In general, please don't change lines that you don't need to. Smaller diffs are easier to review:

* Indicator.vala, Settings.vala, DisplayWidget.vala, MaxWidthLabel.vala, Scale.vala, and Volume-control.vala seem to have been touched unnecessarily. There's no actual change to the code in these files. Please `bzr revert` them.

* MprisClient.vala also looks like you've completely re-written the file. I'm having a tough time seeing what your actual changes are here.

As far as the functionality of the branch, it seems to work as intended. The correct device icon shows and the controls work as expected :)

review: Needs Fixing (code)

[Giuliano Fiorotto (mr-fiorotto)]

I reverted all the files that seem to have been touched unnecessarily but i can't understand the problem of MprisClient.vala because i reverted it 2 times and it didn't change.

review: Needs Resubmitting

[Giuliano Fiorotto (mr-fiorotto)]

I reverted all the files that seem to have been touched unnecessarily to version 143 as suggested by @danrabbit

review: Needs Resubmitting

[Danielle Foré (danrabbit)]

Marking as rejected since Fabio superseded it with another branch

Unmerged revisions

151. By Giuliano Fiorotto on 2017-01-21

revert version 143

150. By Giuliano Fiorotto on 2017-01-21

revert again mprisclient.vala

149. By Giuliano Fiorotto on 2017-01-21

revert

148. By Giuliano Fiorotto on 2017-02-05

fix conflicts

147. By Giuliano Fiorotto on 2017-02-05

Display device icon and name

146. By Giuliano Fiorotto on 2017-02-01

Updated all copyright headers

145. By Giuliano Fiorotto on 2017-02-01

Implement controls for connected Bluetooth media players, code styling

144. By Giuliano Fiorotto on 2017-01-23

Working on bug #1591392

=== modified file 'po/sound-indicator.pot'
--- po/sound-indicator.pot	2015-08-20 09:56:18 +0000
+++ po/sound-indicator.pot	2017-02-23 11:44:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-20 04:54-0500\n"
+"POT-Creation-Date: 2017-02-01 15:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,30 +17,30 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src//Indicator.vala:53
+#: ../src/Indicator.vala:41
 msgid "Indicator Sound"
 msgstr ""
 
-#: ../src//Indicator.vala:54
+#: ../src/Indicator.vala:42
 msgid "The sound indicator"
 msgstr ""
 
-#: ../src//Indicator.vala:361
+#: ../src/Indicator.vala:327
 msgid "Sound Settings…"
 msgstr ""
 
-#: ../src//Widgets/MprisGui.vala:24
+#: ../src/Widgets/MprisGui.vala:24
 msgid "Not currently playing"
 msgstr ""
 
-#: ../src//Widgets/MprisGui.vala:40
+#: ../src/Widgets/MprisGui.vala:40
 msgid "Music player"
 msgstr ""
 
-#: ../src//Widgets/MprisGui.vala:390
+#: ../src/Widgets/MprisGui.vala:523
 msgid "by "
 msgstr ""
 
-#: ../src//Widgets/MprisGui.vala:393
+#: ../src/Widgets/MprisGui.vala:526
 msgid "Unknown Title"
 msgstr ""

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-12-22 19:28:43 +0000
+++ src/CMakeLists.txt	2017-02-23 11:44:20 +0000
@@ -22,6 +22,10 @@
   Services/MprisClient.vala
   Services/Settings.vala
   Services/Volume-control.vala
+  Services/Manager.vala
+  Services/Adapter.vala
+  Services/Device.vala
+  Services/MediaPlayer.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
   wingpanel-2.0

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2017-02-03 20:19:16 +0000
+++ src/Indicator.vala	2017-02-23 11:44:20 +0000
@@ -1,19 +1,19 @@
-/*
-* Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*-
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 public class Sound.Indicator : Wingpanel.Indicator {
     private DisplayWidget display_widget;

=== added file 'src/Services/Adapter.vala'
--- src/Services/Adapter.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Adapter.vala	2017-02-23 11:44:20 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+[DBus (name = "org.bluez.Adapter1")]
+public interface Sound.Services.Adapter : Object {
+    public abstract void remove_device (ObjectPath device) throws IOError;
+    public abstract void set_discovery_filter (HashTable<string, Variant> properties) throws IOError;
+    public abstract void start_discovery () throws IOError;
+    public abstract void stop_discovery () throws IOError;
+
+    public abstract string[] UUIDs { public owned get; private set; }
+    public abstract bool discoverable { public get; public set; }
+    public abstract bool discovering { public get; private set; }
+    public abstract bool pairable { public get; public set; }
+    public abstract bool powered { public get; public set; }
+    public abstract string address { public owned get; private set; }
+    public abstract string alias { public owned get; public set; }
+    public abstract string modalias { public owned get; private set; }
+    public abstract string name { public owned get; private set; }
+    public abstract uint @class { public get; private set; }
+    public abstract uint discoverable_timeout { public get; private set; }
+    public abstract uint pairable_timeout { public get; private set; }
+}

=== added file 'src/Services/Device.vala'
--- src/Services/Device.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Device.vala	2017-02-23 11:44:20 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+[DBus (name = "org.bluez.Device1")]
+public interface Sound.Services.Device : Object {
+    public abstract void cancel_pairing () throws IOError;
+    public abstract void connect () throws IOError;
+    public abstract void connect_profile (string UUID) throws IOError;
+    public abstract void disconnect () throws IOError;
+    public abstract void disconnect_profile (string UUID) throws IOError;
+    public abstract void pair () throws IOError;
+
+    public abstract string[] UUIDs { public owned get; private set; }
+    public abstract bool blocked { public owned get; public set; }
+    public abstract bool connected { public owned get; private set; }
+    public abstract bool legacy_pairing { public owned get; private set; }
+    public abstract bool paired { public owned get; private set; }
+    public abstract bool trusted { public owned get; public set; }
+    public abstract int16 RSSI { public owned get; private set; }
+    public abstract ObjectPath adapter { public owned get; private set; }
+    public abstract string address { public owned get; private set; }
+    public abstract string alias { public owned get; public set; }
+    public abstract string icon { public owned get; private set; }
+    public abstract string modalias { public owned get; private set; }
+    public abstract string name { public owned get; private set; }
+    public abstract uint16 appearance { public owned get; private set; }
+    public abstract uint32 @class { public owned get; private set; }
+}

=== added file 'src/Services/Manager.vala'
--- src/Services/Manager.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Manager.vala	2017-02-23 11:44:20 +0000
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+[DBus (name = "org.freedesktop.DBus.ObjectManager")]
+public interface Sound.Services.DBusInterface : Object {
+    public signal void interfaces_added (ObjectPath object_path, HashTable<string, HashTable<string, Variant>> param);
+    public signal void interfaces_removed (ObjectPath object_path, string[] string_array);
+
+    public abstract HashTable<ObjectPath, HashTable<string, HashTable<string, Variant>>> get_managed_objects () throws IOError;
+}
+
+public class Sound.Services.ObjectManager : Object {
+    public signal void global_state_changed (bool enabled, bool connected);
+    public signal void adapter_added (Services.Adapter adapter);
+    public signal void adapter_removed (Services.Adapter adapter);
+    public signal void device_added (Services.Device adapter);
+    public signal void device_removed (Services.Device adapter);
+    public signal void media_player_added (Services.MediaPlayer media_player, string name, string icon);
+    public signal void media_player_removed (Services.MediaPlayer media_player);
+    public signal void media_player_status_changed (string status, string title, string album);
+
+    public bool has_object { get; private set; default = false; }
+    public string media_player_status { get;  private set; default = "stopped";}
+    public string current_track_title { get;  private set; default = "Not playing";}
+    public string current_track_artist { get;  private set;}
+
+    private Services.DBusInterface object_interface;
+    private Gee.HashMap<string, Services.Adapter> adapters;
+    private Gee.HashMap<string, Services.Device> devices;
+    private Gee.HashMap<string, Services.MediaPlayer> media_players;
+
+    public ObjectManager () {
+        
+    }
+
+    construct {
+        adapters = new Gee.HashMap<string, Services.Adapter> (null, null);
+        devices = new Gee.HashMap<string, Services.Device> (null, null);
+        media_players = new Gee.HashMap<string, Services.MediaPlayer> (null, null);
+        
+        Bus.get_proxy.begin<Services.DBusInterface> (BusType.SYSTEM, "org.bluez", "/", DBusProxyFlags.NONE, null, (obj, res) => {
+            try {
+                object_interface = Bus.get_proxy.end (res);
+                object_interface.get_managed_objects ().foreach (add_path);
+                object_interface.interfaces_added.connect (add_path);
+                object_interface.interfaces_removed.connect (remove_path);
+            } catch (Error e) {
+                critical (e.message);
+            }
+        });
+    }
+
+    [CCode (instance_pos = -1)]
+    private void add_path (ObjectPath path, HashTable<string, HashTable<string, Variant>> param) {
+        if ("org.bluez.Adapter1" in param) {
+            try {
+                Services.Adapter adapter = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", path, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+                lock (adapters) {
+                    adapters.set (path, adapter);
+                }
+                has_object = true;
+
+                adapter_added (adapter);
+                (adapter as DBusProxy).g_properties_changed.connect ((changed, invalid) => {
+                    var powered = changed.lookup_value ("Powered", new VariantType ("b"));
+                    if (powered != null) {
+                        check_global_state ();
+                    }
+                });
+            } catch (Error e) {
+                warning ("Connecting to bluetooth adapter failed: %s", e.message);
+            }
+        } else if ("org.bluez.Device1" in param) {
+            try {
+                Services.Device device = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", path, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+                if (device.paired) {
+                    lock (devices) {
+                        devices.set (path, device);
+                    }
+
+                    device_added (device);
+                }
+
+                (device as DBusProxy).g_properties_changed.connect ((changed, invalid) => {
+                    var connected = changed.lookup_value ("Connected", new VariantType ("b"));
+                    if (connected != null) {
+                        check_global_state ();
+                    }
+
+                    var paired = changed.lookup_value ("Paired", new VariantType ("b"));
+                    if (paired != null) {
+                        if (device.paired) {
+                            lock (devices) {
+                                devices.set (path, device);
+                            }
+
+                            device_added (device);
+                        } else {
+                            lock (devices) {
+                                devices.unset (path);
+                            }
+
+                            device_removed (device);
+                        }
+                    }
+                });
+            } catch (Error e) {
+            	warning ("Connecting to bluetooth device failed: %s", e.message);
+            }
+        } else if ("org.bluez.MediaPlayer1" in param) {
+            try {           
+                Services.MediaPlayer media_player = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", path, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+                lock (media_players) {
+                    media_players.set (path, media_player);
+                    
+                }
+                string device_name = path.substring (0, path.last_index_of("/"));
+                Services.Device cur_device = Bus.get_proxy_sync (BusType.SYSTEM, "org.bluez", device_name, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+                media_player_status = media_player.track.lookup ("Title").get_string (null);
+                media_player_added (media_player, cur_device.name, cur_device.icon);
+
+                (media_player as DBusProxy).g_properties_changed.connect ((changed, invalid) => {
+                    if (changed.print (true).contains ("Track")) {
+                        Variant tmp = changed.lookup_value ("Track", VariantType.DICTIONARY);
+                        string title = tmp.lookup_value ("Title", VariantType.STRING).get_string (null);
+                        string artist = tmp.lookup_value ("Artist", VariantType.STRING).get_string (null);
+                        current_track_title = title;
+                        current_track_artist = artist;
+                        media_player_status_changed ("", title, artist);
+                    } else if (changed.lookup("Status", "s")) {
+                        string status = changed.lookup_value ("Status", VariantType.STRING).get_string (null);
+                        media_player_status = status;
+                        media_player_status_changed (status, "", "");
+                    }
+                });
+            } catch (Error e) {
+                warning ("Connecting to bluetooth media player failed: %s", e.message);
+            }
+        }
+    }
+
+    [CCode (instance_pos = -1)]
+    public void remove_path (ObjectPath path) {
+        lock (adapters) {
+            var adapter = adapters.get (path);
+            if (adapter != null) {
+                adapters.unset (path);
+                has_object = !adapters.is_empty;
+
+                adapter_removed (adapter);
+                return;
+            }
+        }
+
+        lock (devices) {
+            var device = devices.get (path);
+            if (device != null) {
+                devices.unset (path);
+                device_removed (device);
+            }
+        }
+        
+        lock (media_players) {
+            var media_player = media_players.get (path);
+            if (media_player != null) {
+                media_players.unset (path);
+                media_player_removed (media_player);
+            }
+        }
+    }
+
+    public Gee.Collection<Services.Adapter> get_adapters () {
+        lock (adapters) {
+            return adapters.values;
+        }
+    }
+
+    public Gee.Collection<Services.Device> get_devices () {
+        lock (devices) {
+            return devices.values;
+        }
+    }
+
+    public Services.Adapter? get_adapter_from_path (string path) {
+        lock (adapters) {
+            return adapters.get (path);
+        }
+    }
+
+    private void check_global_state () {
+        global_state_changed (get_global_state (), get_connected ());
+    }
+
+    public bool get_connected () {
+        lock (devices) {
+            foreach (var device in devices.values) {
+                if (device.connected) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public bool get_global_state () {
+        lock (adapters) {
+            foreach (var adapter in adapters.values) {
+                if (adapter.powered) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public void set_global_state (bool state) {
+        new Thread<void*> (null, () => {
+            lock (devices) {
+                foreach (var device in devices.values) {
+                    if (device.connected) {
+                        try {
+                            device.disconnect ();
+                        } catch (Error e) {
+                            critical (e.message);
+                        }
+                    }
+                }
+            }
+
+            lock (adapters) {
+                foreach (var adapter in adapters.values) {
+                    adapter.powered = state;
+                }
+            }
+
+            return null;
+        });
+    }
+
+    public void set_last_state () {
+        check_global_state();
+    }
+}

=== added file 'src/Services/MediaPlayer.vala'
--- src/Services/MediaPlayer.vala	1970-01-01 00:00:00 +0000
+++ src/Services/MediaPlayer.vala	2017-02-23 11:44:20 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Fiorotto Giuliano <[e-mail]>
+ *              Fabio Zaramella <[e-mail]>
+ */
+
+[DBus (name = "org.bluez.MediaPlayer1")]
+public interface Sound.Services.MediaPlayer : Object {
+    public abstract void play () throws IOError;
+    public abstract void pause () throws IOError;
+    public abstract void stop () throws IOError;
+    public abstract void next () throws IOError;
+    public abstract void previous () throws IOError;
+    public abstract void fast_forward () throws IOError;
+    public abstract void rewind () throws IOError;
+    public abstract string name { public owned get; }
+    public abstract string status { public owned get; }
+    public abstract HashTable<string,Variant> track { public owned get; }
+}

=== modified file 'src/Services/MprisClient.vala'
--- src/Services/MprisClient.vala	2017-02-03 20:19:16 +0000
+++ src/Services/MprisClient.vala	2017-02-23 11:44:20 +0000
@@ -1,19 +1,13 @@
 /*
-* Copyright (c) 2014 Ikey Doherty <[e-mail]>
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+ * MprisClient.vala
+ *
+ * Copyright 2014 Ikey Doherty <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
 
  namespace Sound.Services {
 
@@ -111,4 +105,4 @@
 
 }
 
-}
+}
\ No newline at end of file

=== modified file 'src/Services/Settings.vala'
--- src/Services/Settings.vala	2017-02-03 20:19:16 +0000
+++ src/Services/Settings.vala	2017-02-23 11:44:20 +0000
@@ -1,19 +1,19 @@
-/*
-* Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*-
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 public class Sound.Services.Settings : Granite.Services.Settings {
 

=== modified file 'src/Services/Volume-control.vala'
--- src/Services/Volume-control.vala	2017-01-27 21:44:31 +0000
+++ src/Services/Volume-control.vala	2017-02-23 11:44:20 +0000
@@ -1,7 +1,8 @@
 /*
  * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
- * Copyright (c) 2013 Canonical Ltd.
- *               2015-2017 elementary LLC. (http://launchpad.net/wingpanel)
+ * Copyright
+ * 2013 Canonical Ltd.
+ * 2015 Wingpanel Developers
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -832,4 +833,4 @@
         }
         return false; // G_SOURCE_REMOVE
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	2017-02-03 20:19:16 +0000
+++ src/Widgets/DisplayWidget.vala	2017-02-23 11:44:20 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public
@@ -11,8 +11,10 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
 */
 
 public class DisplayWidget : Gtk.Grid {

=== modified file 'src/Widgets/MaxWidthLabel.vala'
--- src/Widgets/MaxWidthLabel.vala	2017-02-03 20:19:16 +0000
+++ src/Widgets/MaxWidthLabel.vala	2017-02-23 11:44:20 +0000
@@ -1,19 +1,19 @@
-/*
-* Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*-
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 public class MaxWidthLabel : Gtk.Label {
     private int max_width;
@@ -34,4 +34,4 @@
         }
     }
 
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala	2017-02-03 20:19:16 +0000
+++ src/Widgets/MprisGui.vala	2017-02-23 11:44:20 +0000
@@ -14,6 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 const int ICON_SIZE = 48;
@@ -71,6 +72,7 @@
     }
 
     private Services.MprisClient? client_ = null;
+    private Services.MediaPlayer? mp_client = null;
 
     public Services.MprisClient? client {
         get {
@@ -118,6 +120,22 @@
     public ClientWidget (Services.MprisClient mpris_client) {
         Object (orientation: Gtk.Orientation.VERTICAL, spacing: 0, client: mpris_client);
     }
+    
+    /**
+     * Create a new ClientWidget for bluetooth controls
+     *
+     * @param client The underlying MediaPlayer instance to use
+     */
+    public ClientWidget.bluetooth (Services.MediaPlayer media_player_client, string name, string icon){
+        mp_client = media_player_client;
+
+        app_icon = new ThemedIcon (icon);
+        background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
+        title_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (name)));
+        artist_label.set_text (NOT_PLAYING);
+
+        update_controls ();
+    }
 
     /**
      * Create a new ClientWidget for the default player
@@ -194,25 +212,33 @@
         prev_btn = btn;
         btn.clicked.connect (()=> {
             Idle.add (()=> {
-                if (client.player.can_go_previous) {
-                  if(!Thread.supported ()) {
-                      warning ("Threading is not supported. DBus timeout could be blocking UI");
+                if (!Thread.supported ()) {
+                  warning ("Threading is not supported. DBus timeout could be blocking UI");
+                  try {
+                    if (mp_client == null && client.player.can_go_previous) {
+                        client.player.previous ();
+                    } else if (mp_client != null) {
+                        mp_client.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) {
+                        if (mp_client == null) {
+                            client.player.previous ();
+                        } else if(mp_client != null) {
+                            mp_client.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 null;
+                    });
                 }
+
                 return false;
             });
         });
@@ -224,23 +250,43 @@
         play_btn = btn;
         btn.clicked.connect (()=> {
             Idle.add (()=> {
-                if(!Thread.supported ()) {
+                if (!Thread.supported ()) {
                     warning ("Threading is not supported. DBus timeout could be blocking UI");
                     try {
-                        client.player.play_pause();
-                    } catch  (Error e) {
+                        if (mp_client == null) {
+                            client.player.play_pause ();
+                        } else if (mp_client != null) {
+                            if (mp_client.status == "playing") {
+                                mp_client.pause ();
+                            } else {
+                                mp_client.play ();
+                            }
+                            update_play_status ();
+                        }
+                    } catch (Error e) {
                         warning ("Playing/Pausing probably failed (faulty MPRIS interface): %s", e.message);
                     }
                 } else {
                     new Thread <void*> ("wingpanel_indicator_sound_dbus_backward_thread", () => {
                         try {
-                            client.player.play_pause();
+                            if (mp_client == null) {
+                                client.player.play_pause ();
+                            } else if (mp_client != null) {
+                                if (mp_client.status == "playing") {
+                                    mp_client.pause (); 
+                                } else {
+                                    mp_client.play ();
+                                }
+                                update_play_status ();                              
+                            }
                         } catch (Error e) {
                             warning ("Playing/Pausing probably failed (faulty MPRIS interface): %s", e.message);
                         }
+
                         return null;
                       });
                 }
+
                 return false;
             });
         });
@@ -251,25 +297,33 @@
         next_btn = btn;
         btn.clicked.connect (()=> {
             Idle.add (()=> {
-                if (client.player.can_go_next) {
-                    if(!Thread.supported ()) {
-                        warning ("Threading is not supported. DBus timeout could be blocking UI");
+                if(!Thread.supported ()) {
+                    warning ("Threading is not supported. DBus timeout could be blocking UI");
+                    try {
+                        if (mp_client == null && client.player.can_go_next) {
+                            client.player.next ();
+                        } else if (mp_client != null) {
+                            mp_client.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) {
+                            if (mp_client == null) {
+                                client.player.next ();
+                            } else if (mp_client != null) {
+                                mp_client.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 null;
+                    });
                 }
+
                 return false;
             });
         });
@@ -295,7 +349,7 @@
 
     private void connect_to_client () {
         client.prop.properties_changed.connect ((i,p,inv)=> {
-            if  (i == "org.mpris.MediaPlayer2.Player") {
+            if (i == "org.mpris.MediaPlayer2.Player") {
                 /* Handle mediaplayer2 iface */
                 p.foreach ((k,v)=> {
                     if (k == "Metadata") {
@@ -323,17 +377,17 @@
         try {
             close ();
             if (client != null && client.player.can_raise) {
-                if(!Thread.supported ()) {
+                if( !Thread.supported ()) {
                     warning ("Threading is not supported. DBus timeout could be blocking UI");
                     try {
-                        client.player.raise();
-                    } catch  (Error e) {
+                        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();
+                            client.player.raise ();
                         } catch (Error e) {
                             warning ("Raising the player probably failed (faulty MPRIS interface): %s", e.message);
                         }
@@ -343,7 +397,7 @@
             } else if (app_info != null) {
                 app_info.launch (null, null);
             }
-        } catch  (Error e) {
+        } catch (Error e) {
             warning ("Could not launch player");
         }
 
@@ -367,20 +421,21 @@
 
             return Gdk.EVENT_STOP;
         });
+
         return btn;
     }
 
     /**
-     * Update play status based on player requirements
+     * Update play status based on player requirements     
      */
     private void update_play_status () {
-        switch  (client.player.playback_status) {
+        switch (client.player.playback_status) {
             case "Playing":
-                 (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
+                (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
                 break;
             default:
                 /* Stopped, Paused */
-                 (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
+                (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
                 break;
         }
     }
@@ -389,28 +444,33 @@
      * Update prev/next sensitivity based on player requirements
      */
     private void update_controls () {
-        prev_btn.set_sensitive (client.player.can_go_previous);
-        next_btn.set_sensitive (client.player.can_go_next);
+        if (mp_client == null) {
+            prev_btn.set_sensitive (client.player.can_go_previous);
+            next_btn.set_sensitive (client.player.can_go_next);
+        } else {
+            prev_btn.set_sensitive (true);
+            next_btn.set_sensitive (true);
+        }
     }
 
     /**
      * Utility, handle updating the album art
      */
     private void update_art (string uri) {
-        if  (!uri.has_prefix ("file://") && !uri.has_prefix  ("http")) {
+        if (!uri.has_prefix ("file://") && !uri.has_prefix  ("http")) {
             background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
             mask.no_show_all = true;
             mask.hide ();
             return;
         }
-        if  (uri.has_prefix  ("file://")) {
+        if (uri.has_prefix ("file://")) {
             string fname = uri.split ("file://")[1];
             try {
                 var pbuf = new Gdk.Pixbuf.from_file_at_size (fname, ICON_SIZE, ICON_SIZE);
                 background.set_from_pixbuf (mask_pixbuf (pbuf));
                 mask.no_show_all = false;
                 mask.show ();
-            } catch  (Error e) {
+            } catch (Error e) {
                 //background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
             }
         } else {
@@ -430,7 +490,7 @@
               mask.no_show_all = false;
               mask.show ();
           }
-      } catch  (Error e) {
+      } catch (Error e) {
           background.set_from_gicon (app_icon, Gtk.IconSize.DIALOG);
           mask.no_show_all = true;
           mask.hide ();
@@ -442,7 +502,7 @@
      */
     protected void update_from_meta () {
         var metadata = client.player.metadata;
-        if  ("mpris:artUrl" in metadata) {
+        if ("mpris:artUrl" in metadata) {
             var url = metadata["mpris:artUrl"].get_string ();
             last_artUrl = url;
             update_art (url);
@@ -455,7 +515,7 @@
         }
         
         string title;
-        if  ("xesam:title" in metadata && metadata["xesam:title"].is_of_type (VariantType.STRING)
+        if ("xesam:title" in metadata && metadata["xesam:title"].is_of_type (VariantType.STRING)
             && metadata["xesam:title"].get_string () != "") {
             title = metadata["xesam:title"].get_string ();
         } else {
@@ -464,11 +524,11 @@
 
         title_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (title)));
 
-        if  ("xesam:artist" in metadata && metadata["xesam:artist"].is_of_type (VariantType.STRING_ARRAY)) {
+        if ("xesam:artist" in metadata && metadata["xesam:artist"].is_of_type (VariantType.STRING_ARRAY)) {
             (unowned string)[] artists = metadata["xesam:artist"].get_strv ();
             artist_label.set_text (_("by ")+string.joinv (", ", artists));
         } else {
-            if  (client.player.playback_status == "Playing") {
+            if (client.player.playback_status == "Playing") {
                 artist_label.set_text (_("Unknown Title"));
             } else {
                 artist_label.set_text (NOT_PLAYING);
@@ -489,8 +549,7 @@
         var surface = new Cairo.ImageSurface (Cairo.Format.ARGB32, mask_size, mask_size);
         var cr = new Cairo.Context (surface);
 
-        Granite.Drawing.Utilities.cairo_rounded_rectangle (cr,
-            offset_x, offset_y, size, size, 4);
+        Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, offset_x, offset_y, size, size, 4);
         cr.clip ();
 
         Gdk.cairo_set_source_pixbuf (cr, input, offset_x, offset_y);
@@ -498,4 +557,23 @@
 
         return Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);
     }
+
+    public void update_play (string playing, string title, string artist) {
+        if (playing != "") {
+            switch (playing) {
+                case "playing":
+                    (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
+                    break;
+                default:
+                    /* Stopped, Paused */
+                    (play_btn.get_image () as Gtk.Image).set_from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
+                    break;
+            }
+        }
+
+        if (title != "" && artist != "") {
+            title_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (title)));
+            artist_label.set_text (artist);
+        }
+    }
 }

=== modified file 'src/Widgets/MprisWidget.vala'
--- src/Widgets/MprisWidget.vala	2017-02-03 20:19:16 +0000
+++ src/Widgets/MprisWidget.vala	2017-02-23 11:44:20 +0000
@@ -14,6 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 public class Sound.Widgets.MprisWidget : Gtk.Box {
@@ -21,15 +22,18 @@
 
     AppInfo? default_music;
     ClientWidget default_widget;
+    ClientWidget bluetooth_widget;
     HashTable<string,ClientWidget> ifaces;
     public signal void close ();
 
-    public MprisWidget() {
+    public Sound.Services.ObjectManager object_manager;
+
+    public MprisWidget () {
         Object (orientation: Gtk.Orientation.VERTICAL, spacing: 1);
 
-        ifaces = new HashTable<string,ClientWidget>(str_hash, str_equal);
+        ifaces = new HashTable<string,ClientWidget> (str_hash, str_equal);
 
-        Idle.add(()=> {
+        Idle.add (()=> {
             setup_dbus();
             return false;
         });
@@ -42,18 +46,51 @@
                 close ();
             });
 
-            default_widget.show_all();
+            default_widget.show_all ();
             pack_start(default_widget, false, false, 0);
         }
 
-        show_all();
+        object_manager = new Services.ObjectManager ();
+        object_manager.bind_property ("has-object", this, "visible", GLib.BindingFlags.SYNC_CREATE);
+
+        if (object_manager.has_object) {
+            object_manager.set_last_state ();
+        }
+
+        object_manager.media_player_added.connect ((media_player, name, icon) => {
+            try { 
+                bluetooth_widget = new ClientWidget.bluetooth (media_player, name, icon);
+                bluetooth_widget.close.connect (() => {
+                    close ();
+                });
+
+                bluetooth_widget.show_all ();
+                pack_start (bluetooth_widget, false, false, 0);
+            } catch (Error e) {
+                warning ("Connecting to bluetooth device failed: %s", e.message);
+            }
+        });
+
+        object_manager.media_player_removed.connect ((media_player) => {
+            debug ("Media player %s removed", media_player.name);
+            bluetooth_widget.destroy ();
+        });
+
+        object_manager.media_player_status_changed.connect ((status, title, artist) => {
+            bluetooth_widget.update_play (status, title, artist);
+            if (status == "playing" && default_widget.client.player.playback_status == "Playing") {
+                default_widget.client.player.play_pause ();
+            }
+        });
+
+        show_all ();
     }
 
     public void pause_all () {
         foreach (var cw in ifaces.get_values ()) {
             try {
                 cw.client.player.pause ();
-            } catch  (Error e) {
+            } catch (Error e) {
                 warning ("Could not pause: %s", e.message);
             }
         }
@@ -69,7 +106,7 @@
         if (iface.player.desktop_entry == default_music.get_id ().replace (".desktop","")) {
             default_widget.mpris_name = name;
             default_widget.client = iface;
-            ifaces.insert(name, default_widget);
+            ifaces.insert (name, default_widget);
             default_widget.no_show_all = false;
             default_widget.visible = true;
         } else {
@@ -82,9 +119,9 @@
             widg.close.connect (() => {
                 close ();
             });
-            widg.show_all();
-            pack_start(widg, false, false, 0);
-            ifaces.insert(name, widg);
+            widg.show_all ();
+            pack_start (widg, false, false, 0);
+            ifaces.insert (name, widg);
         }
     }
 
@@ -93,17 +130,17 @@
      *
      * @param name DBUS name to remove handler for
      */
-    void destroy_iface(string name) {
+    void destroy_iface (string name) {
         if (default_widget.mpris_name == name) {
             default_widget.client = null;
         } else {
             var widg = ifaces[name];
-            if (widg  != null) {
-                remove(widg);
+            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;
@@ -118,14 +155,14 @@
     /**
      * Do basic dbus initialisation
      */
-    public void setup_dbus() {
+    public void setup_dbus () {
         try {
             impl = Bus.get_proxy_sync(BusType.SESSION, "org.freedesktop.DBus", "/org/freedesktop/DBus");
             var names = impl.list_names();
 
             /* Search for existing players (launched prior to our start) */
             foreach (var name in names) {
-                if (name.has_prefix("org.mpris.MediaPlayer2.")) {
+                if (name.has_prefix ("org.mpris.MediaPlayer2.")) {
                     bool add = true;
                     foreach (string name2 in ifaces.get_keys ()) {
                         // skip if already a interface is present.
@@ -135,18 +172,18 @@
                         }
                     }
                     if (add) {
-                        var iface = new_iface(name);
+                        var iface = new_iface (name);
                         if (iface != null) {
-                            add_iface(name, iface);
+                            add_iface (name, iface);
                         }
                     }
                 }
             }
 
             /* Also check for new mpris clients coming up while we're up */
-            impl.name_owner_changed.connect((n,o,ne)=> {
+            impl.name_owner_changed.connect ((n,o,ne)=> {
                 /* Separate.. */
-                if (n.has_prefix("org.mpris.MediaPlayer2.")) {
+                if (n.has_prefix ("org.mpris.MediaPlayer2.")) {
                     if (o == "") {
                         // delay the sync because otherwise the dbus properties are not yet intialized!
                         Timeout.add (100, () => {
@@ -157,15 +194,15 @@
                                     return false;
                                 }
                             }
-                            var iface = new_iface(n);
+                            var iface = new_iface (n);
                             if (iface != null) {
-                                add_iface(n,iface);
+                                add_iface (n,iface);
                             }
                             return false;
                         });
                     } else {
                         Idle.add(()=> {
-                            destroy_iface(n);
+                            destroy_iface (n);
                             return false;
                         });
                     }
@@ -183,24 +220,25 @@
      * @param busname The busname to instaniate ifaces from
      * @return a new MprisClient, or null if errors occurred.
      */
-    public Services.MprisClient? new_iface(string busname) {
+    public Services.MprisClient? new_iface (string busname) {
         Services.PlayerIface? play = null;
         Services.MprisClient? cl = null;
         Services.DbusPropIface? prop = null;
 
         try {
-            play = Bus.get_proxy_sync(BusType.SESSION, busname, "/org/mpris/MediaPlayer2");
+            play = Bus.get_proxy_sync (BusType.SESSION, busname, "/org/mpris/MediaPlayer2");
         } catch (Error e) {
-            message(e.message);
+            message (e.message);
             return null;
         }
+
         try {
-            prop = Bus.get_proxy_sync(BusType.SESSION, busname, "/org/mpris/MediaPlayer2");
+            prop = Bus.get_proxy_sync (BusType.SESSION, busname, "/org/mpris/MediaPlayer2");
         } catch (Error e) {
-            message(e.message);
+            message (e.message);
             return null;
         }
-        cl = new Services.MprisClient(play, prop);
+        cl = new Services.MprisClient (play, prop);
 
         return cl;
     }

=== modified file 'src/Widgets/Scale.vala'
--- src/Widgets/Scale.vala	2017-02-03 20:19:16 +0000
+++ src/Widgets/Scale.vala	2017-02-23 11:44:20 +0000
@@ -1,19 +1,19 @@
-/*
-* Copyright (c) 2015-2017 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public
-* License as published by the Free Software Foundation; either
-* version 2 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/*-
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 public class Sound.Widgets.Scale : Gtk.Grid {
     private Gtk.Image image;