Merge lp:~ted/indicator-sound/sound-stream-cleanup into lp:indicator-sound/15.04

[Ted Gould]

[lp:~ted/indicator-sound/sound-stream-cleanup]

503. By Ted Gould on 2015-02-13

Merging in the notifications mock branch

Unmerged revisions

503. By Ted Gould on 2015-02-13

Merging in the notifications mock branch

502. By Ted Gould on 2015-01-30

Adding another missing symbol

501. By Ted Gould on 2015-01-30

Add a mock symbol for stream restore checking

500. By Ted Gould on 2015-01-30

Add a focus tracker mock

499. By Ted Gould on 2015-01-30

Put an abstraction in for the focus tracker so we can mock it

498. By Ted Gould on 2015-01-30

Merging the indicator-test branch

497. By Ted Gould on 2014-12-17

Set it up so the end we're detecting that the stream changes, and then looking up values based on that.

496. By Ted Gould on 2014-12-17

Warn when we stop because of not being able to get a name

495. By Ted Gould on 2014-12-17

Making sure all the media player lists can use standard object primitivs

494. By Ted Gould on 2014-12-17

Bind the property into a value in volume control

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-01-27 17:42:26 +0000
+++ src/CMakeLists.txt	2015-02-14 02:38:32 +0000
@@ -36,6 +36,7 @@
     --vapidir=.
     --pkg=url-dispatcher
     --pkg=bus-watcher
+    --pkg=libpulse-ext-stream-restore
 )
 
 vala_add(indicator-sound-service
@@ -43,15 +44,23 @@
   DEPENDS
     sound-menu
     volume-control
+    volume-control-pulse
     media-player
     media-player-list
     mpris2-interfaces
     accounts-service-user
+    focus-tracker
 )
 vala_add(indicator-sound-service
   volume-control.vala
 )
 vala_add(indicator-sound-service
+  volume-control-pulse.vala
+  DEPENDS
+    volume-control
+    focus-tracker
+)
+vala_add(indicator-sound-service
   media-player.vala
 )
 vala_add(indicator-sound-service
@@ -120,6 +129,14 @@
 vala_add(indicator-sound-service
   greeter-broadcast.vala
 )
+vala_add(indicator-sound-service
+  focus-tracker.vala
+)
+vala_add(indicator-sound-service
+  focus-tracker-stack.vala
+  DEPENDS
+    focus-tracker
+)
 
 vala_finish(indicator-sound-service
   SOURCES
@@ -154,6 +171,7 @@
 
 add_definitions(
   -w
+  -DG_LOG_DOMAIN="indicator-sound"
 )
 
 add_library(
 
=== added file 'src/focus-tracker-stack.vala'
--- src/focus-tracker-stack.vala	1970-01-01 00:00:00 +0000
+++ src/focus-tracker-stack.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,88 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+private struct WindowInfo {
+	public uint window_id;
+	public string app_id;
+	public bool focused;
+	public uint stage;
+}
+
+/*
+private struct DesktopInfo {
+	public string app_id;
+	public string desktop_file;
+}
+*/
+
+[DBus (name = "com.canonical.Unity.WindowStack")]
+private interface WindowStack : Object {
+	/* public abstract async DesktopInfo GetAppIdFromPid (uint pid) throws IOError; */
+	public abstract async WindowInfo[] GetWindowStack () throws IOError;
+	/* public abstract async string[] GetWindowProperties (uint window_id, string app_id, string[] names) throws IOError; */
+
+	public signal void FocusedWindowChanged (uint window_id, string app_id, uint stage);
+	/* public signal void WindowCreated (uint window_id, string app_id); */
+	/* public signal void WindowDestroyed (uint window_id, string app_id); */
+}
+
+public class FocusTrackerStack : FocusTracker {
+	public override string focused_appid { get; private set; default = "unknown"; }
+	private WindowStack proxy;
+
+	public FocusTrackerStack ( ) {
+		build_proxies.begin();
+	}
+
+	private async void build_proxies() {
+		try {
+			proxy = yield Bus.get_proxy<WindowStack>(BusType.SESSION,
+				"com.canonical.Unity.WindowStack",
+				"/com/canonical/Unity/WindowStack",
+				DBusProxyFlags.DO_NOT_LOAD_PROPERTIES,
+				null);
+
+			proxy.FocusedWindowChanged.connect((window, appid, stage) => {
+				if (stage == 0) {
+					debug("Focus changed to: %s", appid);
+					this.focused_appid = appid;
+				}
+			});
+
+			update_focused_appid.begin();
+		} catch (Error e) {
+			warning("Unable to create window stack proxy: %s", e.message);
+		}
+	}
+
+	private async void update_focused_appid () {
+		try {
+			var windows = yield proxy.GetWindowStack();
+			foreach (var window in windows) {
+				if (window.focused && window.stage == 0) {
+					focused_appid = window.app_id;
+					break;
+				}
+			}
+		} catch (Error e) {
+			warning("Unable to get window stack list: %s", e.message);
+		}
+	}
+}
 
=== added file 'src/focus-tracker.vala'
--- src/focus-tracker.vala	1970-01-01 00:00:00 +0000
+++ src/focus-tracker.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public abstract class FocusTracker : Object {
+	public virtual string focused_appid { get; protected set; }
+}
 
=== modified file 'src/main.c'
--- src/main.c	2014-02-25 22:47:45 +0000
+++ src/main.c	2015-02-14 02:38:32 +0000
@@ -1,6 +1,21 @@
-/* main.c generated by valac 0.22.1, the Vala compiler
- * generated from main.vala, do not modify */
-
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
 
 #include <glib.h>
 #include <locale.h>
@@ -9,33 +24,79 @@
 #include "indicator-sound-service.h"
 #include "config.h"
 
+static gboolean
+sigterm_handler (gpointer data)
+{
+	g_debug("Got SIGTERM");
+	g_main_loop_quit((GMainLoop *)data);
+	return G_SOURCE_REMOVE;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_debug("Name lost");
+	g_main_loop_quit((GMainLoop *)user_data);
+}
+
 int
 main (int argc, char ** argv) {
-	gint result = 0;
+	GMainLoop * loop = NULL;
 	IndicatorSoundService* service = NULL;
+	GDBusConnection * bus = NULL;
 
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 
+	/* Grab DBus */
+	GError * error = NULL;
+	bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+	if (error != NULL) {
+		g_error("Unable to get session bus: %s", error->message);
+		g_error_free(error);
+		return -1;
+	}
+
+	/* Build Mainloop */
+	loop = g_main_loop_new(NULL, FALSE);
+
+	g_unix_signal_add(SIGTERM, sigterm_handler, loop); 
+
 	/* Initialize libnotify */
 	notify_init ("indicator-sound");
 
 	MediaPlayerList * playerlist = NULL;
+	AccountsServiceUser * accounts = NULL;
 
 	if (g_strcmp0("lightdm", g_get_user_name()) == 0) {
 		playerlist = MEDIA_PLAYER_LIST(media_player_list_greeter_new());
 	} else {
 		playerlist = MEDIA_PLAYER_LIST(media_player_list_mpris_new());
+		accounts = accounts_service_user_new();
 	}
 
-	service = indicator_sound_service_new (playerlist);
-	result = indicator_sound_service_run (service);
-
-	g_object_unref(playerlist);
-	g_object_unref(service);
-
-	return result;
+	FocusTracker * tracker = FOCUS_TRACKER(focus_tracker_stack_new());
+	VolumeControlPulse * volume = volume_control_pulse_new(tracker);
+
+	service = indicator_sound_service_new (playerlist, volume, accounts);
+
+	g_bus_own_name_on_connection(bus,
+		"com.canonical.indicator.sound",
+		G_BUS_NAME_OWNER_FLAGS_NONE,
+		NULL, /* acquired */
+		name_lost,
+		loop,
+		NULL);
+
+	g_main_loop_run(loop);
+
+	g_clear_object(&playerlist);
+	g_clear_object(&tracker);
+	g_clear_object(&accounts);
+	g_clear_object(&service);
+	g_clear_object(&bus);
+
+	return 0;
 }
 
-
 
=== modified file 'src/media-player-list.vala'
--- src/media-player-list.vala	2014-02-24 22:47:50 +0000
+++ src/media-player-list.vala	2015-02-14 02:38:32 +0000
@@ -17,7 +17,7 @@
  *      Ted Gould <[e-mail]>
  */
 
-public class MediaPlayerList {
+public abstract class MediaPlayerList : Object {
 	public class Iterator {
 		public virtual MediaPlayer? next_value() {
 			return null;
 
=== modified file 'src/service.vala'
--- src/service.vala	2015-02-05 14:52:58 +0000
+++ src/service.vala	2015-02-14 02:38:32 +0000
@@ -18,13 +18,29 @@
  */
 
 public class IndicatorSound.Service: Object {
-	public Service (MediaPlayerList playerlist) {
+	DBusConnection bus;
+	DBusProxy notification_proxy;
+
+	public Service (MediaPlayerList playerlist, VolumeControl volume, AccountsServiceUser? accounts) {
+		try {
+			bus = Bus.get_sync(GLib.BusType.SESSION);
+		} catch (GLib.Error e) {
+			error("Unable to get DBus session bus: %s", e.message);
+		}
+
 		sync_notification = new Notify.Notification(_("Volume"), "", "audio-volume-muted");
-		this.notification_server_watch = GLib.Bus.watch_name(GLib.BusType.SESSION,
-			"org.freedesktop.Notifications",
-			GLib.BusNameWatcherFlags.NONE,
-			() => { check_sync_notification = false; },
-			() => { check_sync_notification = false; });
+		try {
+			this.notification_proxy = new DBusProxy.for_bus_sync(GLib.BusType.SESSION,
+				DBusProxyFlags.DO_NOT_LOAD_PROPERTIES | DBusProxyFlags.DO_NOT_CONNECT_SIGNALS | DBusProxyFlags.DO_NOT_AUTO_START,
+				null, /* interface info */
+				"org.freedesktop.Notifications",
+				"/org/freedesktop/Notifications",
+				"org.freedesktop.Notifications",
+				null);
+			this.notification_proxy.notify["g-name-owner"].connect ( () => { debug("Notifications name owner changed"); check_sync_notification = false; } );
+		} catch (GLib.Error e) {
+			error("Unable to build notification proxy: %s", e.message);
+		}
 
 		this.settings = new Settings ("com.canonical.indicator.sound");
 		this.sharedsettings = new Settings ("com.ubuntu.sound");
@@ -32,12 +48,12 @@
 		this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET);
 		this.notify["visible"].connect ( () => this.update_root_icon () );
 
-		this.volume_control = new VolumeControl ();
+		this.volume_control = volume;
+		this.volume_control.bind_property ("media-playing", this, "player-playing", BindingFlags.SYNC_CREATE);
 
+		this.accounts_service = accounts;
 		/* If we're on the greeter, don't export */
-		if (GLib.Environment.get_user_name() != "lightdm") {
-			this.accounts_service = new AccountsServiceUser();
-
+		if (this.accounts_service != null) {
 			this.accounts_service.notify["showDataOnGreeter"].connect(() => {
 				this.export_to_accounts_service = this.accounts_service.showDataOnGreeter;
 				eventually_update_player_actions();
@@ -90,9 +106,27 @@
 				}
 			}
 		});
+
+		/* Everything is built, let's put it on the bus */
+		try {
+			export_actions = bus.export_action_group ("/com/canonical/indicator/sound", this.actions);
+		} catch (Error e) {
+			critical ("%s", e.message);
+		}
+
+		this.menus.@foreach ( (profile, menu) => menu.export (bus, @"/com/canonical/indicator/sound/$profile"));
 	}
 
 	~Service() {
+		debug("Destroying Service Object");
+
+		clear_acts_player();
+
+		if (this.player_action_update_id > 0) {
+			Source.remove (this.player_action_update_id);
+			this.player_action_update_id = 0;
+		}
+
 		if (this.sound_was_blocked_timeout_id > 0) {
 			Source.remove (this.sound_was_blocked_timeout_id);
 			this.sound_was_blocked_timeout_id = 0;
@@ -102,6 +136,11 @@
 			GLib.Bus.unwatch_name(this.notification_server_watch);
 			this.notification_server_watch = 0;
 		}
+
+		if (this.export_actions != 0) {
+			bus.unexport_action_group(this.export_actions);
+			this.export_actions = 0;
+		}
 	}
 
 	bool greeter_show_track () {
@@ -115,30 +154,6 @@
 			this.accounts_service.player = null;
 	}
 
-	public int run () {
-		if (this.loop != null) {
-			warning ("service is already running");
-			return 1;
-		}
-
-		Bus.own_name (BusType.SESSION, "com.canonical.indicator.sound", BusNameOwnerFlags.NONE,
-			this.bus_acquired, null, this.name_lost);
-
-		this.loop = new MainLoop (null, false);
-
-		GLib.Unix.signal_add(GLib.ProcessSignal.TERM, () => {
-			debug("SIGTERM recieved, stopping our mainloop");
-			this.loop.quit();
-			return false;
-		});
-
-		this.loop.run ();
-
-		clear_acts_player();
-
-		return 0;
-	}
-
 	public bool visible { get; set; }
 
 	public bool allow_amplified_volume {
@@ -171,13 +186,13 @@
 		{ "indicator-shown", null, null, "@b false", null },
 	};
 
-	MainLoop loop;
 	SimpleActionGroup actions;
 	HashTable<string, SoundMenu> menus;
 	Settings settings;
 	Settings sharedsettings;
 	VolumeControl volume_control;
 	MediaPlayerList players;
+	public bool player_playing { get; set; default = false; }
 	uint player_action_update_id;
 	bool mute_blocks_sound;
 	uint sound_was_blocked_timeout_id;
@@ -275,6 +290,7 @@
 
 	void update_sync_notification () {
 		if (!check_sync_notification) {
+			support_sync_notification = false;
 			List<string> caps = Notify.get_server_caps ();
 			if (caps.find_custom ("x-canonical-private-synchronous", strcmp) != null) {
 				support_sync_notification = true;
@@ -285,27 +301,12 @@
 		if (!support_sync_notification)
 			return;
 
-		/* Update our volume and output */
-		var oldoutput = this.last_output_notification;
-		this.last_output_notification = this.volume_control.stream;
-
-		var oldvolume = this.last_volume_notification;
-		this.last_volume_notification = volume_control.volume;
-
-		/* Suppress notifications of volume changes if it is because the 
-		   output stream changed. */
-		if (oldoutput != this.last_output_notification)
-			return;
-		/* Supress updates that don't change the value */
-		if (GLib.Math.fabs(oldvolume - this.last_volume_notification) < 0.01)
-			return;
-
 		var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction;
 		if (shown_action != null && shown_action.get_state().get_boolean())
 			return;
 
 		/* Determine Label */
-		string volume_label = "";
+		string volume_label = volume_control.stream; /* TODO: Undo this */
 		if (volume_control.high_volume)
 			volume_label = _("High volume");
 
@@ -341,13 +342,14 @@
 		}
 	}
 
+	SimpleAction silent_action;
 	Action create_silent_mode_action () {
 		bool silentNow = false;
 		if (this.accounts_service != null) {
 			silentNow = this.accounts_service.silentMode;
 		}
 
-		var silent_action = new SimpleAction.stateful ("silent-mode", null, new Variant.boolean (silentNow));
+		silent_action = new SimpleAction.stateful ("silent-mode", null, new Variant.boolean (silentNow));
 
 		/* If we're not dealing with accounts service, we'll just always be out
 		   of silent mode and that's cool. */
@@ -371,15 +373,16 @@
 		return silent_action;
 	}
 
+	SimpleAction mute_action;
 	Action create_mute_action () {
-		var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
+		mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
 
 		mute_action.activate.connect ( (action, param) => {
 			action.change_state (new Variant.boolean (!action.get_state ().get_boolean ()));
 		});
 
 		mute_action.change_state.connect ( (action, val) => {
-			volume_control.set_mute (val.get_boolean ());
+			volume_control.mute = val.get_boolean ();
 		});
 
 		this.volume_control.notify["mute"].connect ( () => {
@@ -415,6 +418,7 @@
 		return mute_action;
 	}
 
+	SimpleAction volume_action;
 	Action create_volume_action () {
 		/* The action's state is between be in [0.0, 1.0] instead of [0.0,
 		 * max_volume], so that we don't need to update the slider menu item
@@ -425,7 +429,7 @@
 
 		double volume = this.volume_control.volume / this.max_volume;
 
-		var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (volume));
+		volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (volume));
 
 		volume_action.change_state.connect ( (action, val) => {
 			double v = val.get_double () * this.max_volume;
@@ -440,12 +444,26 @@
 		});
 
 		this.volume_control.notify["volume"].connect (() => {
-			var vol_action = this.actions.lookup_action ("volume") as SimpleAction;
-
 			/* Normalize volume, because the volume action's state is [0.0, 1.0], see create_volume_action() */
-			vol_action.set_state (new Variant.double (this.volume_control.volume / this.max_volume));
+			volume_action.set_state (new Variant.double (this.volume_control.volume / this.max_volume));
 
 			this.update_root_icon ();
+
+			/* Update our volume and output */
+			var oldoutput = this.last_output_notification;
+			this.last_output_notification = this.volume_control.stream;
+
+			var oldvolume = this.last_volume_notification;
+			this.last_volume_notification = volume_control.volume;
+
+			/* Suppress notifications of volume changes if it is because the 
+			   output stream changed. */
+			if (oldoutput != this.last_output_notification)
+				return;
+			/* Supress updates that don't change the value */
+			if (GLib.Math.fabs(oldvolume - this.last_volume_notification) < 0.01)
+				return;
+
 			this.update_sync_notification ();
 		});
 
@@ -454,24 +472,26 @@
 		return volume_action;
 	}
 
+	SimpleAction mic_volume_action;
 	Action create_mic_volume_action () {
-		var volume_action = new SimpleAction.stateful ("mic-volume", null, new Variant.double (this.volume_control.mic_volume));
+		mic_volume_action = new SimpleAction.stateful ("mic-volume", null, new Variant.double (this.volume_control.mic_volume));
 
-		volume_action.change_state.connect ( (action, val) => {
+		mic_volume_action.change_state.connect ( (action, val) => {
 			volume_control.mic_volume = val.get_double ();
 		});
 
 		this.volume_control.notify["mic-volume"].connect ( () => {
-			volume_action.set_state (new Variant.double (this.volume_control.mic_volume));
+			mic_volume_action.set_state (new Variant.double (this.volume_control.mic_volume));
 		});
 
-		this.volume_control.bind_property ("ready", volume_action, "enabled", BindingFlags.SYNC_CREATE);
+		this.volume_control.bind_property ("ready", mic_volume_action, "enabled", BindingFlags.SYNC_CREATE);
 
-		return volume_action;
+		return mic_volume_action;
 	}
 
+	SimpleAction high_volume_action;
 	Action create_high_volume_action () {
-		var high_volume_action = new SimpleAction.stateful("high-volume", null, new Variant.boolean (this.volume_control.high_volume));
+		high_volume_action = new SimpleAction.stateful("high-volume", null, new Variant.boolean (this.volume_control.high_volume));
 
 		this.volume_control.notify["high-volume"].connect( () => {
 			high_volume_action.set_state(new Variant.boolean (this.volume_control.high_volume));
@@ -481,19 +501,7 @@
 		return high_volume_action;
 	}
 
-	void bus_acquired (DBusConnection connection, string name) {
-		try {
-			connection.export_action_group ("/com/canonical/indicator/sound", this.actions);
-		} catch (Error e) {
-			critical ("%s", e.message);
-		}
-
-		this.menus.@foreach ( (profile, menu) => menu.export (connection, @"/com/canonical/indicator/sound/$profile"));
-	}
-
-	void name_lost (DBusConnection connection, string name) {
-		this.loop.quit ();
-	}
+	uint export_actions = 0;
 
 	Variant action_state_for_player (MediaPlayer player, bool show_track = true) {
 		var builder = new VariantBuilder (new VariantType ("a{sv}"));
@@ -510,6 +518,7 @@
 
 	bool update_player_actions () {
 		bool clear_accounts_player = true;
+		bool player_playing = false;
 
 		foreach (var player in this.players) {
 			SimpleAction? action = this.actions.lookup_action (player.id) as SimpleAction;
@@ -529,11 +538,20 @@
 				accounts_service.player = player;
 				clear_accounts_player = false;
 			}
+
+			if (player.state == "Playing") {
+				player_playing = true;
+			}
 		}
 
 		if (clear_accounts_player)
 			clear_acts_player();
 
+		if (this.player_playing != player_playing) {
+			this.player_playing = player_playing;
+			update_root_icon();
+		}
+
 		this.player_action_update_id = 0;
 		return false;
 	}
 
=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2015-01-29 17:31:03 +0000
+++ src/sound-menu.vala	2015-02-14 02:38:32 +0000
@@ -73,9 +73,20 @@
 		this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0;
 	}
 
+	~SoundMenu () {
+		if (export_id != 0) {
+			bus.unexport_menu_model(export_id);
+			export_id = 0;
+		}
+	}
+
+	DBusConnection? bus = null;
+	uint export_id = 0;
+
 	public void export (DBusConnection connection, string object_path) {
+		bus = connection;
 		try {
-			connection.export_menu_model (object_path, this.root);
+			export_id = bus.export_menu_model (object_path, this.root);
 		} catch (Error e) {
 			critical ("%s", e.message);
 		}
 
=== renamed file 'src/volume-control.vala' => 'src/volume-control-pulse.vala'
--- src/volume-control.vala	2015-01-30 14:57:03 +0000
+++ src/volume-control-pulse.vala	2015-02-14 02:38:32 +0000
@@ -19,6 +19,7 @@
  */
 
 using PulseAudio;
+using PulseAudio.Extension.StreamRestore;
 using Notify;
 using Gee;
 
@@ -32,42 +33,51 @@
     public signal void entry_selected (string entry_name);
 }
 
-public class VolumeControl : Object
+public class VolumeControlPulse : VolumeControl
 {
 	/* this is static to ensure it being freed after @context (loop does not have ref counting) */
 	private static PulseAudio.GLibMainLoop loop;
 
+	private FocusTracker focus_tracker;
+	public bool media_playing { get; set; default = false; }
+
 	private uint _reconnect_timer = 0;
 
 	private PulseAudio.Context context;
 	private bool   _mute = true;
-	private bool   _is_playing = false;
+	public  override bool is_playing { get; private set; default = false; }
 	private double _volume = 0.0;
 	private double _mic_volume = 0.0;
 
 	/* Used by the pulseaudio stream restore extension */
-	private DBusConnection _pconn;
-	/* Need both the list and hash so we can retrieve the last known sink-input after
-	 * releasing the current active one (restoring back to the previous known role) */
-	private Gee.ArrayList<uint32> _sink_input_list = new Gee.ArrayList<uint32> ();
-	private HashMap<uint32, string> _sink_input_hash = new HashMap<uint32, string> ();
 	private bool _pulse_use_stream_restore = false;
-	private uint32 _active_sink_input = -1;
-	private string[] _valid_roles = {"multimedia", "alert", "alarm", "phone"};
-	public string stream {
+	private enum InputStreamType {
+		ALERT = 0,
+		ALARM = 1,
+		MULTIMEDIA = 2,
+		PHONE = 3
+	}
+	private InputStreamType currentstream = InputStreamType.ALERT;
+	private InputStreamType tempstream = InputStreamType.ALERT;
+	/** The name of the stream that we're currently playing */
+	public override string stream {
 		get {
-			if (_active_sink_input < 0 || _active_sink_input >= _valid_roles.length)
-				return "multimedia";
-			else
-				return _valid_roles[_active_sink_input];
+			switch (this.currentstream) {
+				case InputStreamType.ALERT:
+					return "alert";
+				case InputStreamType.ALARM:
+					return "alarm";
+				case InputStreamType.MULTIMEDIA:
+					return "multimedia";
+				case InputStreamType.PHONE:
+					return "phone";
+			}
+
+			return "alert";
 		}
 	}
-	private string? _objp_role_multimedia = null;
-	private string? _objp_role_alert = null;
-	private string? _objp_role_alarm = null;
-	private string? _objp_role_phone = null;
-	private uint _pa_volume_sig_count = 0;
 
+	/* Accounts Service Variables */
 	private DBusProxy _user_proxy;
 	private GreeterListInterface _greeter_proxy;
 	private Cancellable _mute_cancellable;
@@ -76,23 +86,38 @@
 	private uint _accountservice_volume_timer = 0;
 	private bool _send_next_local_volume = false;
 	private double _account_service_volume = 0.0;
+
+
 	private bool _active_port_headphone = false;
+	/* There is not easy way to check if the port is a headset/headphone besides
+	 * checking for the port name. On touch (with the pulseaudio droid element)
+	 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
+	 * On the desktop this is usually called 'analog-output-headphones' */
+	private string[] headphone_outputs = {"output-wired_headset", "output-wired_headphone", "analog-output-headphones"};
 
 	/** true when connected to the pulse server */
-	public bool ready { get; set; }
+	public override bool ready { get; private set; }
 
 	/** true when a microphone is active **/
-	public bool active_mic { get; private set; default = false; }
+	public override bool active_mic { get; private set; default = false; }
 
 	/** true when high volume warnings should be shown */
-	public bool high_volume {
+	public override bool high_volume {
 		get {
-			return this._volume > 0.75 && _active_port_headphone;	
+			return this._volume > 0.75 && _active_port_headphone && stream == "multimedia";
 		}
 	}
 
-	public VolumeControl ()
+	public VolumeControlPulse (FocusTracker tracker)
 	{
+		this.focus_tracker = tracker;
+		this.focus_tracker.notify["focused-appid"].connect(() => {
+			if (!this.ready)
+				return;
+
+			this.update_sink_input();
+		});
+
 		if (loop == null)
 			loop = new PulseAudio.GLibMainLoop ();
 
@@ -102,9 +127,16 @@
 		setup_accountsservice.begin ();
 
 		this.reconnect_to_pulse ();
+
+		this.notify["media-playing"].connect(() => {
+			update_sink_input();
+		});
+		this.notify["stream"].connect(() => {
+			update_stream();
+		});
 	}
 
-	~VolumeControl ()
+	~VolumeControlPulse ()
 	{
 		if (_reconnect_timer != 0) {
 			Source.remove (_reconnect_timer);
@@ -114,7 +146,10 @@
 		stop_account_service_volume_timer();
 	}
 
-	/* PulseAudio logic*/
+	/************************/
+	/*   PulseAudio logic   */
+	/************************/
+
 	private void context_events_cb (Context c, Context.SubscriptionEventType t, uint32 index)
 	{
 		switch (t & Context.SubscriptionEventType.FACILITY_MASK)
@@ -124,23 +159,7 @@
 				break;
 
 			case Context.SubscriptionEventType.SINK_INPUT:
-				switch (t & Context.SubscriptionEventType.TYPE_MASK)
-				{
-					case Context.SubscriptionEventType.NEW:
-						c.get_sink_input_info (index, handle_new_sink_input_cb);
-						break;
-
-					case Context.SubscriptionEventType.CHANGE:
-						c.get_sink_input_info (index, handle_changed_sink_input_cb);
-						break;
-
-					case Context.SubscriptionEventType.REMOVE:
-						remove_sink_input_from_list (index);
-						break;
-					default:
-						debug ("Sink input event not known.");
-						break;
-				}
+				update_sink_input ();
 				break;
 
 			case Context.SubscriptionEventType.SOURCE:
@@ -151,7 +170,14 @@
 				switch (t & Context.SubscriptionEventType.TYPE_MASK)
 				{
 					case Context.SubscriptionEventType.NEW:
-						c.get_source_output_info (index, source_output_info_cb);
+						c.get_source_output_info (index, (context, info, eol) => {
+							if (info == null)
+								return;
+
+							var role = info.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
+							if (role == "phone" || role == "production")
+								this.active_mic = true;
+						});
 						break;
 
 					case Context.SubscriptionEventType.REMOVE:
@@ -162,291 +188,205 @@
 		}
 	}
 
-	private void sink_info_cb_for_props (Context c, SinkInfo? i, int eol)
-	{
-		bool old_high_volume = this.high_volume;
-
-		if (i == null)
-			return;
-
-		if (_mute != (bool)i.mute)
-		{
-			_mute = (bool)i.mute;
-			this.notify_property ("mute");
-		}
-
-		var playing = (i.state == PulseAudio.SinkState.RUNNING);
-		if (_is_playing != playing)
-		{
-			_is_playing = playing;
-			this.notify_property ("is-playing");
-		}
-
-		/* Check if the current active port is headset/headphone */
-		/* There is not easy way to check if the port is a headset/headphone besides
-		 * checking for the port name. On touch (with the pulseaudio droid element)
-		 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
-		 * On the desktop this is usually called 'analog-output-headphones' */
-		if (i.active_port != null &&
-			(i.active_port.name == "output-wired_headset" ||
-		 	 i.active_port.name == "output-wired_headphone" ||
-			 i.active_port.name == "analog-output-headphones")) {
-			_active_port_headphone = true;
-		} else {
-			_active_port_headphone = false;
-		}
-
-		if (_pulse_use_stream_restore == false &&
-				_volume != volume_to_double (i.volume.max ()))
-		{
-			_volume = volume_to_double (i.volume.max ());
-			this.notify_property("volume");
-			start_local_volume_timer();
-		} 
-		
-		if (this.high_volume != old_high_volume) {
-			this.notify_property("high-volume");
-		}
-	}
-
-	private void source_info_cb (Context c, SourceInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		if (_mic_volume != volume_to_double (i.volume.values[0]))
-		{
-			_mic_volume = volume_to_double (i.volume.values[0]);
-			this.notify_property ("mic-volume");
-		}
-	}
-
-	private void server_info_cb_for_props (Context c, ServerInfo? i)
-	{
-		if (i == null)
-			return;
-		context.get_sink_info_by_name (i.default_sink_name, sink_info_cb_for_props);
-	}
-
 	private void update_sink ()
 	{
-		context.get_server_info (server_info_cb_for_props);
-	}
-
-	private void update_source_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
-		if (i != null)
-			context.get_source_info_by_name (i.default_source_name, source_info_cb);
+		if (!this.ready)
+			return;
+
+		context.get_server_info ((context, info) => {
+			if (info == null)
+				return;
+
+			context.get_sink_info_by_name (info.default_sink_name, (context, info, eol) => {
+				bool old_high_volume = this.high_volume;
+
+				if (info == null)
+					return;
+
+				if (_mute != (bool)info.mute)
+				{
+					_mute = (bool)info.mute;
+					this.notify_property ("mute");
+				}
+
+				this.is_playing = (info.state == PulseAudio.SinkState.RUNNING);
+
+				/* Check if the current active port is headset/headphone */
+				if (info.active_port.name in headphone_outputs) {
+					_active_port_headphone = true;
+				} else {
+					_active_port_headphone = false;
+				}
+
+				if (_pulse_use_stream_restore == false &&
+						_volume != volume_to_double (info.volume.max ()))
+				{
+					_volume = volume_to_double (info.volume.max ());
+					this.notify_property("volume");
+					start_local_volume_timer();
+				} 
+				
+				if (this.high_volume != old_high_volume) {
+					this.notify_property("high-volume");
+				}
+			});
+		});
+	}
+
+	private void update_sink_input ()
+	{
+		if (!this.ready)
+			return;
+
+		if (!this._pulse_use_stream_restore)
+			return;
+
+		this.tempstream = InputStreamType.ALERT;
+		if (this.media_playing)
+			this.tempstream = InputStreamType.MULTIMEDIA;
+
+		context.get_sink_input_info_list((context, info, eol) => {
+			var inputstream = InputStreamType.ALARM;
+
+			if (info != null) {
+				var role = info.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
+				var corked = (info.corked != 0);
+				var appid = info.proplist.gets (PulseAudio.Proplist.PROP_APPLICATION_ID);
+
+				/* Override the corked value for the phone as it's always corked */
+				if (role != null && role == "phone")
+					corked = false;
+
+				if (!corked && role != null && appid == this.focus_tracker.focused_appid) {
+					switch (role) {
+						case "phone":
+							inputstream = InputStreamType.PHONE;
+							break;
+						case "alarm":
+							inputstream = InputStreamType.ALARM;
+							break;
+						case "alert":
+							inputstream = InputStreamType.ALERT;
+							break;
+						case "multimedia":
+						default:
+							/* We treat unknown roles (i.e. 'music') as multimedia */
+							inputstream = InputStreamType.MULTIMEDIA;
+							break;
+					}
+				}
+			}
+
+			if (inputstream > this.tempstream) {
+				this.tempstream = inputstream;
+			}
+
+			if (eol != 0) {
+				if (this.currentstream != this.tempstream) {
+					this.currentstream = this.tempstream;
+					debug("Current stream: %s", this.stream);
+					this.notify_property("stream");
+				}
+			}
+		});
+	}
+
+	/* Look at a given profile or role and figure out what our volume and
+	   mute settings should be based on that. */
+	private void update_stream ()
+	{
+
+
 	}
 
 	private void update_source ()
 	{
-		context.get_server_info (update_source_get_server_info_cb);
-	}
-
-	private DBusMessage pulse_dbus_filter (DBusConnection connection, owned DBusMessage message, bool incoming)
-	{
-		if (message.get_message_type () == DBusMessageType.SIGNAL) {
-			string active_role_objp = _objp_role_alert;
-			if (_active_sink_input != -1)
-				active_role_objp = _sink_input_hash.get (_active_sink_input);
-
-			if (message.get_path () == active_role_objp && message.get_member () == "VolumeUpdated") {
-				uint sig_count = 0;
-				lock (_pa_volume_sig_count) {
-					sig_count = _pa_volume_sig_count;
-					if (_pa_volume_sig_count > 0)
-						_pa_volume_sig_count--;
-				}
-
-				/* We only care about signals if our internal count is zero */
-				if (sig_count == 0) {
-					/* Extract volume and make sure it's not a side effect of us setting it */
-					Variant body = message.get_body ();
-					Variant varray = body.get_child_value (0);
-
-					uint32 type = 0, volume = 0;
-					VariantIter iter = varray.iterator ();
-					iter.next ("(uu)", &type, &volume);
-					/* Here we need to compare integer values to avoid rounding issues, so just
-					 * using the volume values used by pulseaudio */
-					PulseAudio.Volume cvolume = double_to_volume (_volume);
-					if (volume != cvolume) {
-						/* Someone else changed the volume for this role, reflect on the indicator */
-						_volume = volume_to_double (volume);
-						this.notify_property("volume");
-						start_local_volume_timer();
-					}
-				}
-			}
-		}
-
-		return message;
-	}
-
-	private async void update_active_sink_input (uint32 index)
-	{
-		if ((index == -1) || (index != _active_sink_input && index in _sink_input_list)) {
-			string sink_input_objp = _objp_role_alert;
-			if (index != -1)
-				sink_input_objp = _sink_input_hash.get (index);
-			_active_sink_input = index;
-
-			/* Listen for role volume changes from pulse itself (external clients) */
-			try {
-				var builder = new VariantBuilder (new VariantType ("ao"));
-				builder.add ("o", sink_input_objp);
-
-				yield _pconn.call ("org.PulseAudio.Core1", "/org/pulseaudio/core1",
-						"org.PulseAudio.Core1", "ListenForSignal",
-						new Variant ("(sao)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry.VolumeUpdated", builder),
-						null, DBusCallFlags.NONE, -1);
-			} catch (GLib.Error e) {
-				warning ("unable to listen for pulseaudio dbus signals (%s)", e.message);
-			}
-
-			try {
-				var props_variant = yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
-						sink_input_objp, "org.freedesktop.DBus.Properties", "Get",
-						new Variant ("(ss)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume"),
-						null, DBusCallFlags.NONE, -1);
-				Variant tmp;
-				props_variant.get ("(v)", out tmp);
-				uint32 type = 0, volume = 0;
-				VariantIter iter = tmp.iterator ();
-				iter.next ("(uu)", &type, &volume);
-
-				_volume = volume_to_double (volume);
-				this.notify_property("volume");
-				start_local_volume_timer();
-			} catch (GLib.Error e) {
-				warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message);
-			}
-		}
-	}
-
-	private void add_sink_input_into_list (SinkInputInfo sink_input)
-	{
-		/* We're only adding ones that are not corked and with a valid role */
-		var role = sink_input.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
-
-		if (role != null && role in _valid_roles) {
-			if (sink_input.corked == 0 || role == "phone") {
-				_sink_input_list.insert (0, sink_input.index);
-				switch (role)
+		if (!this.ready)
+			return;
+
+		context.get_server_info ((context, info) => {
+			if (info == null)
+				return;
+
+			context.get_source_info_by_name (info.default_source_name, (context, info, eol) => {
+				if (info == null)
+					return;
+
+				if (_mic_volume != volume_to_double (info.volume.values[0]))
 				{
-					case "multimedia":
-						_sink_input_hash.set (sink_input.index, _objp_role_multimedia);
-						break;
-					case "alert":
-						_sink_input_hash.set (sink_input.index, _objp_role_alert);
-						break;
-					case "alarm":
-						_sink_input_hash.set (sink_input.index, _objp_role_alarm);
-						break;
-					case "phone":
-						_sink_input_hash.set (sink_input.index, _objp_role_phone);
-						break;
+					_mic_volume = volume_to_double (info.volume.values[0]);
+					this.notify_property ("mic-volume");
 				}
-				/* Only switch the active sink input in case a phone one is not active */
-				if (_active_sink_input == -1 ||
-						_sink_input_hash.get (_active_sink_input) != _objp_role_phone)
-					update_active_sink_input.begin (sink_input.index);
-			}
-		}
-	}
-
-	private void remove_sink_input_from_list (uint32 index)
-	{
-		if (index in _sink_input_list) {
-			_sink_input_list.remove (index);
-			_sink_input_hash.unset (index);
-			if (index == _active_sink_input) {
-				if (_sink_input_list.size != 0)
-					update_active_sink_input.begin (_sink_input_list.get (0));
-				else
-					update_active_sink_input.begin (-1);
-			}
-		}
-	}
-
-	private void handle_new_sink_input_cb (Context c, SinkInputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		add_sink_input_into_list (i);
-	}
-
-	private void handle_changed_sink_input_cb (Context c, SinkInputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		if (i.index in _sink_input_list) {
-			/* Phone stream is always corked, so handle it differently */
-			if (i.corked == 1 && _sink_input_hash.get (i.index) != _objp_role_phone)
-				remove_sink_input_from_list (i.index);
-		} else {
-			if (i.corked == 0)
-				add_sink_input_into_list (i);
-		}
-	}
-
-	private void source_output_info_cb (Context c, SourceOutputInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		var role = i.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE);
-		if (role == "phone" || role == "production")
-			this.active_mic = true;
+			});
+		});
 	}
 
 	private void context_state_callback (Context c)
 	{
 		switch (c.get_state ()) {
 			case Context.State.READY:
-				if (_pulse_use_stream_restore) {
-					c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
-							PulseAudio.Context.SubscriptionMask.SINK_INPUT |
-							PulseAudio.Context.SubscriptionMask.SOURCE |
-							PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
-				} else {
-					c.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
-							PulseAudio.Context.SubscriptionMask.SOURCE |
-							PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
-				}
-				c.set_subscribe_callback (context_events_cb);
-				update_sink ();
-				update_source ();
-				this.ready = true;
+				PulseAudio.Extension.StreamRestore.test(this.context, (context, version) => {
+					if (version != 0) {
+						debug("Got the stream restore extension");
+						_pulse_use_stream_restore = true;
+					} else {
+						debug("No stream restore extension found");
+					}
+
+					if (_pulse_use_stream_restore) {
+						this.context.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
+								PulseAudio.Context.SubscriptionMask.SINK_INPUT |
+								PulseAudio.Context.SubscriptionMask.SOURCE |
+								PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
+					} else {
+						this.context.subscribe (PulseAudio.Context.SubscriptionMask.SINK |
+								PulseAudio.Context.SubscriptionMask.SOURCE |
+								PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT);
+					}
+					this.context.set_subscribe_callback (context_events_cb);
+					this.ready = true;
+
+					debug("Pulse state ready");
+
+					update_sink ();
+					update_sink_input ();
+					update_source ();
+					update_stream ();
+				});
+
 				break;
 
 			case Context.State.FAILED:
 			case Context.State.TERMINATED:
+				warning("Pulse state disconnected, retrying.");
+				this.ready = false;
 				if (_reconnect_timer == 0)
-					_reconnect_timer = Timeout.add_seconds (2, reconnect_timeout);
+					_reconnect_timer = Timeout.add_seconds (2, () => {
+						_reconnect_timer = 0;
+						reconnect_to_pulse ();
+						return false; // G_SOURCE_REMOVE
+					});
+				break;
+
+			case Context.State.CONNECTING:
+			case Context.State.AUTHORIZING:
+			case Context.State.SETTING_NAME:
+				debug(@"Pulse state initializing step $((int)c.get_state())");
 				break;
 
 			default:
-				this.ready = false;
+				warning("Unknown state returned by Pulse Audio context. Not reconnecting.");
 				break;
 		}
 	}
 
-	bool reconnect_timeout ()
-	{
-		_reconnect_timer = 0;
-		reconnect_to_pulse ();
-		return false; // G_SOURCE_REMOVE
-	}
-
 	void reconnect_to_pulse ()
 	{
 		if (this.ready) {
 			this.context.disconnect ();
 			this.context = null;
 			this.ready = false;
+			this._pulse_use_stream_restore = false;
 		}
 
 		var props = new Proplist ();
@@ -455,8 +395,6 @@
 		props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
 		props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1");
 
-		reconnect_pulse_dbus ();
-
 		this.context = new PulseAudio.Context (loop.get_api(), null, props);
 		this.context.set_state_callback (context_state_callback);
 
@@ -464,60 +402,54 @@
 			warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
 	}
 
-	void sink_info_list_callback_set_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
-		if (sink != null)
-			context.set_sink_mute_by_index (sink.index, true, null);
-	}
-
-	void sink_info_list_callback_unset_mute (PulseAudio.Context context, PulseAudio.SinkInfo? sink, int eol) {
-		if (sink != null)
-			context.set_sink_mute_by_index (sink.index, false, null);
-	}
-
-	/* Mute operations */
+	/******************************/
+	/*     Mute operations        */
+	/******************************/
+
 	bool set_mute_internal (bool mute)
 	{
-		return_val_if_fail (context.get_state () == Context.State.READY, false);
+		if (!this.ready)
+			return false;
 
 		if (_mute != mute) {
 			if (mute)
-				context.get_sink_info_list (sink_info_list_callback_set_mute);
+				context.get_sink_info_list ((context, sink, eol) => {
+					if (sink != null)
+						context.set_sink_mute_by_index (sink.index, true, null);
+				});
 			else
-				context.get_sink_info_list (sink_info_list_callback_unset_mute);
+				context.get_sink_info_list ((context, sink, eol) => {
+					if (sink != null)
+						context.set_sink_mute_by_index (sink.index, false, null);
+				});
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	public void set_mute (bool mute)
-	{
-		if (set_mute_internal (mute))
-			sync_mute_to_accountsservice.begin (mute);
-	}
-
 	public void toggle_mute ()
 	{
-		this.set_mute (!this._mute);
+		this.mute = !this._mute;
 	}
 
-	public bool mute
+	public override bool mute
 	{
 		get
 		{
 			return this._mute;
 		}
-	}
-
-	public bool is_playing
-	{
-		get
+		set
 		{
-			return this._is_playing;
+			if (set_mute_internal (value))
+				sync_mute_to_accountsservice.begin (value);
 		}
 	}
 
-	/* Volume operations */
+	/******************************/
+	/*   Volume operations        */
+	/******************************/
+
 	private static PulseAudio.Volume double_to_volume (double vol)
 	{
 		double tmp = (double)(PulseAudio.Volume.NORM - PulseAudio.Volume.MUTED) * vol;
@@ -530,79 +462,41 @@
 		return tmp / (double)(PulseAudio.Volume.NORM - PulseAudio.Volume.MUTED);
 	}
 
-	private void set_volume_success_cb (Context c, int success)
-	{
-		if ((bool)success)
-			this.notify_property("volume");
-	}
-
-	private void sink_info_set_volume_cb (Context c, SinkInfo? i, int eol)
-	{
-		if (i == null)
-			return;
-
-		unowned CVolume cvol = i.volume;
-		cvol.scale (double_to_volume (_volume));
-		c.set_sink_volume_by_index (i.index, cvol, set_volume_success_cb);
-	}
-
-	private void server_info_cb_for_set_volume (Context c, ServerInfo? i)
-	{
-		if (i == null)
-		{
-			warning ("Could not get PulseAudio server info");
-			return;
-		}
-
-		context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb);
-	}
-
-	private async void set_volume_active_role ()
-	{
-		string active_role_objp = _objp_role_alert;
-
-		if (_active_sink_input != -1 && _active_sink_input in _sink_input_list)
-			active_role_objp = _sink_input_hash.get (_active_sink_input);
-
-		try {
-			var builder = new VariantBuilder (new VariantType ("a(uu)"));
-			builder.add ("(uu)", 0, double_to_volume (_volume));
-			Variant volume = builder.end ();
-
-			/* Increase the signal counter so we can handle the callback */
-			lock (_pa_volume_sig_count) {
-				_pa_volume_sig_count++;
-			}
-
-			yield _pconn.call ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry",
-					active_role_objp, "org.freedesktop.DBus.Properties", "Set",
-					new Variant ("(ssv)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume", volume),
-					null, DBusCallFlags.NONE, -1);
-
-			this.notify_property("volume");
-		} catch (GLib.Error e) {
-			lock (_pa_volume_sig_count) {
-				_pa_volume_sig_count--;
-			}
-			warning ("unable to set volume for stream obj path %s (%s)", active_role_objp, e.message);
-		}
-	}
-
-	bool set_volume_internal (double volume)
-	{
-		if (context.get_state () != Context.State.READY)
+	bool set_volume_internal (double newvolume)
+	{
+		if (!this.ready)
 			return false;
 
-		if (_volume != volume) {
+		if (_volume != newvolume) {
 			var old_high_volume = this.high_volume;
-
-			_volume = volume;
-			if (_pulse_use_stream_restore)
-				set_volume_active_role.begin ();
-			else
-				context.get_server_info (server_info_cb_for_set_volume);
-
-			this.notify_property("volume");
+			/* Ideally, we'd be able to set this when we give the value to Pulse, but
+			   we kinda have a Vala bug that's messing up capturing the variables. So
+			   we're setting it here so that the VolumeControl object can track it all
+			   the way through */
+			/* https://bugzilla.gnome.org/show_bug.cgi?id=741485 */
+			_volume = newvolume;
+
+			context.get_server_info ((context, i) => {
+				if (i == null)
+				{
+					warning ("Could not get PulseAudio server info");
+					return;
+				}
+
+				context.get_sink_info_by_name (i.default_sink_name, (context, info, eol) => {
+					if (info == null)
+						return;
+
+					unowned CVolume cvol = info.volume;
+					cvol.scale (double_to_volume (this._volume));
+					context.set_sink_volume_by_index (info.index, cvol, (context, success) => {
+						if (!(bool)success)
+							return;
+
+						this.notify_property("volume");
+					});
+				});
+			});
 
 			if (this.high_volume != old_high_volume)
 				this.notify_property("high-volume");
@@ -613,21 +507,7 @@
 		}
 	}
 
-	void set_mic_volume_success_cb (Context c, int success)
-	{
-		if ((bool)success)
-			this.notify_property ("mic-volume");
-	}
-
-	void set_mic_volume_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
-		if (i != null) {
-			unowned CVolume cvol = CVolume ();
-			cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
-			c.set_source_volume_by_name (i.default_source_name, cvol, set_mic_volume_success_cb);
-		}
-	}
-
-	public double volume {
+	public override double volume {
 		get {
 			return _volume;
 		}
@@ -638,99 +518,39 @@
 		}
 	}
 
-	public double mic_volume {
+	public override double mic_volume {
 		get {
 			return _mic_volume;
 		}
 		set {
-			return_if_fail (context.get_state () == Context.State.READY);
+			if (!this.ready)
+				return;
 
+			/* Ideally, we'd be able to set this when we give the value to Pulse, but
+			   we kinda have a Vala bug that's messing up capturing the variables. So
+			   we're setting it here so that the VolumeControl object can track it all
+			   the way through */
+			/* https://bugzilla.gnome.org/show_bug.cgi?id=741485 */
 			_mic_volume = value;
 
-			context.get_server_info (set_mic_volume_get_server_info_cb);
-		}
-	}
-
-	/* PulseAudio Dbus (Stream Restore) logic */
-	private void reconnect_pulse_dbus ()
-	{
-		unowned string pulse_dbus_server_env = Environment.get_variable ("PULSE_DBUS_SERVER");
-		string address;
-
-		/* In case of a reconnect */
-		_pulse_use_stream_restore = false;
-		_pa_volume_sig_count = 0;
-
-		if (pulse_dbus_server_env != null) {
-			address = pulse_dbus_server_env;
-		} else {
-			DBusConnection conn;
-			Variant props;
-
-			try {
-				conn = Bus.get_sync (BusType.SESSION);
-			} catch (GLib.IOError e) {
-				warning ("unable to get the dbus session bus: %s", e.message);
-				return;
-			}
-
-			try {
-				var props_variant = conn.call_sync ("org.PulseAudio1",
-						"/org/pulseaudio/server_lookup1", "org.freedesktop.DBus.Properties",
-						"Get", new Variant ("(ss)", "org.PulseAudio.ServerLookup1", "Address"),
-						null, DBusCallFlags.NONE, -1);
-				props_variant.get ("(v)", out props);
-				address = props.get_string ();
-			} catch (GLib.Error e) {
-				warning ("unable to get pulse unix socket: %s", e.message);
-				return;
-			}
-		}
-
-		stdout.printf ("PulseAudio dbus unix socket: %s\n", address);
-		try {
-			_pconn = new DBusConnection.for_address_sync (address, DBusConnectionFlags.AUTHENTICATION_CLIENT);
-		} catch (GLib.Error e) {
-			/* If it fails, it means the dbus pulse extension is not available */
-			return;
-		}
-
-		/* For pulse dbus related events */
-		_pconn.add_filter (pulse_dbus_filter);
-
-		/* Check if the 4 currently supported media roles are already available in StreamRestore
-		 * Roles: multimedia, alert, alarm and phone */
-		_objp_role_multimedia = stream_restore_get_object_path ("sink-input-by-media-role:multimedia");
-		_objp_role_alert = stream_restore_get_object_path ("sink-input-by-media-role:alert");
-		_objp_role_alarm = stream_restore_get_object_path ("sink-input-by-media-role:alarm");
-		_objp_role_phone = stream_restore_get_object_path ("sink-input-by-media-role:phone");
-
-		/* Only use stream restore if every used role is available */
-		if (_objp_role_multimedia != null && _objp_role_alert != null && _objp_role_alarm != null && _objp_role_phone != null) {
-			stdout.printf ("Using PulseAudio DBUS Stream Restore module\n");
-			/* Restore volume and update default entry */
-			update_active_sink_input.begin (-1);
-			_pulse_use_stream_restore = true;
-		}
-	}
-
-	private string? stream_restore_get_object_path (string name) {
-		string? objp = null;
-		try {
-			Variant props_variant = _pconn.call_sync ("org.PulseAudio.Ext.StreamRestore1",
-					"/org/pulseaudio/stream_restore1", "org.PulseAudio.Ext.StreamRestore1",
-					"GetEntryByName", new Variant ("(s)", name), null, DBusCallFlags.NONE, -1);
-			/* Workaround for older versions of vala that don't provide get_objv */
-			VariantIter iter = props_variant.iterator ();
-			iter.next ("o", &objp);
-			stdout.printf ("Found obj path %s for restore data named %s\n", objp, name);
-		} catch (GLib.Error e) {
-			warning ("unable to find stream restore data for: %s", name);
-		}
-		return objp;
-	}
-
+			context.get_server_info ((context, info) => {
+				if (info == null)
+					return;
+
+				unowned CVolume cvol = CVolume ();
+				cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
+				context.set_source_volume_by_name (info.default_source_name, cvol, (context, success) => {
+					if ((bool)success)
+						this.notify_property ("mic-volume");
+				});
+			});
+		}
+	}
+
+	/******************************/
 	/* AccountsService operations */
+	/******************************/
+
 	private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[]? invalidated_properties)
 	{
 		Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d"));
 
=== added file 'src/volume-control.vala'
--- src/volume-control.vala	1970-01-01 00:00:00 +0000
+++ src/volume-control.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,31 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public abstract class VolumeControl : Object
+{
+	public virtual string stream { get { return ""; } }
+	public virtual bool ready { get { return false; } set { } }
+	public virtual bool active_mic { get { return false; } set { } }
+	public virtual bool high_volume { get { return false; } }
+	public virtual bool mute { get { return false; } set { } }
+	public virtual bool is_playing { get { return false; } protected set { } }
+	public virtual double volume { get { return 0.0; } set { } }
+	public virtual double mic_volume { get { return 0.0; } set { } }
+}
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-02-04 19:36:53 +0000
+++ tests/CMakeLists.txt	2015-02-14 02:38:32 +0000
@@ -64,6 +64,17 @@
 vala_add(vala-mocks
 	media-player-mock.vala
 )
+vala_add(vala-mocks
+	focus-tracker-mock.vala
+)
+
+vala_add(vala-mocks
+	media-player-list-mock.vala
+)
+
+vala_add(vala-mocks
+	volume-control-mock.vala
+)
 
 vala_finish(vala-mocks
 	SOURCES
@@ -160,6 +171,7 @@
 	volume-control-test
 	indicator-sound-service-lib
 	pulse-mock
+	vala-mocks-lib
 	gtest
 	${TEST_LIBRARIES}
 )
@@ -184,6 +196,24 @@
 add_test(sound-menu-test sound-menu-test)
 
 ###########################
+# Notification Test
+###########################
+
+include_directories(${CMAKE_SOURCE_DIR}/src)
+add_executable (notifications-test notifications-test.cc)
+target_link_libraries (
+	notifications-test
+	indicator-sound-service-lib
+	vala-mocks-lib
+	pulse-mock
+	gtest
+	${SOUNDSERVICE_LIBRARIES}
+	${TEST_LIBRARIES}
+)
+
+add_test(notifications-test notifications-test)
+
+###########################
 # Accounts Service User
 ###########################
 
 
=== added file 'tests/focus-tracker-mock.vala'
--- tests/focus-tracker-mock.vala	1970-01-01 00:00:00 +0000
+++ tests/focus-tracker-mock.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,27 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public class FocusTrackerMock : FocusTracker {
+	public override string focused_appid { get; private set; default = "unknown"; }
+
+	public void mock_set_appid (string newappid) {
+		this.focused_appid = newappid;
+	}
+}
 
=== added file 'tests/gtest-gvariant.h'
--- tests/gtest-gvariant.h	1970-01-01 00:00:00 +0000
+++ tests/gtest-gvariant.h	2015-02-14 02:38:32 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+
+namespace GTestGVariant {
+
+testing::AssertionResult expectVariantEqual (const gchar * expectStr, const gchar * haveStr, GVariant * expect, GVariant * have)
+{
+	if (expect == nullptr && have == nullptr) {
+		auto result = testing::AssertionSuccess();
+		return result;
+	}
+
+	if (expect == nullptr || have == nullptr) {
+		gchar * havePrint;
+		if (have == nullptr) {
+			havePrint = g_strdup("(nullptr)");
+		} else {
+			havePrint = g_variant_print(have, TRUE);
+		}
+
+		auto result = testing::AssertionFailure();
+		result <<
+			"    Result: " << haveStr << std::endl <<
+			"     Value: " << havePrint << std::endl <<
+			"  Expected: " << expectStr << std::endl;
+
+		g_free(havePrint);
+		return result;
+	}
+
+	if (g_variant_equal(expect, have)) {
+		auto result = testing::AssertionSuccess();
+		return result;
+	} else {
+		gchar * havePrint = g_variant_print(have, TRUE);
+		gchar * expectPrint = g_variant_print(expect, TRUE);
+
+		auto result = testing::AssertionFailure();
+		result <<
+			"    Result: " << haveStr << std::endl <<
+			"     Value: " << havePrint << std::endl <<
+			"  Expected: " << expectStr << std::endl <<
+			"  Expected: " << expectPrint << std::endl;
+
+		g_free(havePrint);
+		g_free(expectPrint);
+
+		return result;
+	}
+}
+
+testing::AssertionResult expectVariantEqual (const gchar * expectStr, const gchar * haveStr, std::shared_ptr<GVariant> expect, std::shared_ptr<GVariant> have)
+{
+	return expectVariantEqual(expectStr, haveStr, expect.get(), have.get());
+}
+
+testing::AssertionResult expectVariantEqual (const gchar * expectStr, const gchar * haveStr, const char * expect, std::shared_ptr<GVariant> have)
+{
+	auto expectv = std::shared_ptr<GVariant>([expect] {
+			auto variant = g_variant_parse(nullptr, expect, nullptr, nullptr, nullptr);
+			if (variant != nullptr)
+				g_variant_ref_sink(variant);
+			return variant;
+		}(),
+		[](GVariant * variant) {
+			if (variant != nullptr)
+				g_variant_unref(variant);
+		});
+
+	return expectVariantEqual(expectStr, haveStr, expectv, have);
+}
+
+testing::AssertionResult expectVariantEqual (const gchar * expectStr, const gchar * haveStr, const char * expect, GVariant * have)
+{
+	auto havep = std::shared_ptr<GVariant>([have] {
+			if (have != nullptr)
+				g_variant_ref_sink(have);
+			return have;
+		}(),
+		[](GVariant * variant) {
+			if (variant != nullptr)
+				g_variant_unref(variant);
+		});
+
+	return expectVariantEqual(expectStr, haveStr, expect, havep);
+}
+
+}; // ns GTestGVariant 
+
+#define EXPECT_GVARIANT_EQ(expect, have) \
+	EXPECT_PRED_FORMAT2(GTestGVariant::expectVariantEqual, expect, have)
 
=== modified file 'tests/indicator-test.cc'
--- tests/indicator-test.cc	2015-02-04 17:43:08 +0000
+++ tests/indicator-test.cc	2015-02-14 02:38:32 +0000
@@ -22,6 +22,7 @@
 
 #include "indicator-fixture.h"
 #include "accounts-service-mock.h"
+#include "notifications-mock.h"
 
 class IndicatorTest : public IndicatorFixture
 {
@@ -32,6 +33,7 @@
 	}
 
 	std::shared_ptr<AccountsServiceMock> as;
+	std::shared_ptr<NotificationsMock> notification;
 
 	virtual void SetUp() override
 	{
@@ -45,12 +47,16 @@
 		as = std::make_shared<AccountsServiceMock>();
 		addMock(*as);
 
+		notification = std::make_shared<NotificationsMock>();
+		addMock(*notification);
+
 		IndicatorFixture::SetUp();
 	}
 
 	virtual void TearDown() override
 	{
 		as.reset();
+		notification.reset();
 
 		IndicatorFixture::TearDown();
 	}
 
=== added file 'tests/media-player-list-mock.vala'
--- tests/media-player-list-mock.vala	1970-01-01 00:00:00 +0000
+++ tests/media-player-list-mock.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public class MediaPlayerListMock : MediaPlayerList {
+	public override MediaPlayerList.Iterator iterator () { return new MediaPlayerList.Iterator(); }
+
+	public override void sync (string[] ids) { return; }
+}
+
 
=== added file 'tests/notifications-mock.h'
--- tests/notifications-mock.h	1970-01-01 00:00:00 +0000
+++ tests/notifications-mock.h	2015-02-14 02:38:32 +0000
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <type_traits>
+
+#include <libdbustest/dbus-test.h>
+
+class NotificationsMock
+{
+		DbusTestDbusMock * mock = nullptr;
+		DbusTestDbusMockObject * baseobj = nullptr;
+
+	public:
+		NotificationsMock (std::vector<std::string> capabilities = {"body", "body-markup", "icon-static", "image/svg+xml", "x-canonical-private-synchronous", "x-canonical-append", "x-canonical-private-icon-only", "x-canonical-truncation", "private-synchronous", "append", "private-icon-only", "truncation"}) {
+			mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications");
+			dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION);
+			dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notify");
+
+			baseobj =dbus_test_dbus_mock_get_object(mock, "/org/freedesktop/Notifications", "org.freedesktop.Notifications", nullptr);
+
+			std::string capspython("ret = ");
+			capspython += vector2py(capabilities);
+			dbus_test_dbus_mock_object_add_method(mock, baseobj,
+				"GetCapabilities", nullptr, G_VARIANT_TYPE("as"),
+				capspython.c_str(), nullptr);
+
+			dbus_test_dbus_mock_object_add_method(mock, baseobj,
+				"GetServerInformation", nullptr, G_VARIANT_TYPE("(ssss)"),
+				"ret = ['notification-mock', 'Testing harness', '1.0', '1.1']", nullptr);
+
+			dbus_test_dbus_mock_object_add_method(mock, baseobj,
+				"Notify", G_VARIANT_TYPE("(susssasa{sv}i)"), G_VARIANT_TYPE("u"),
+				"ret = 10", nullptr);
+
+			dbus_test_dbus_mock_object_add_method(mock, baseobj,
+				"CloseNotification", G_VARIANT_TYPE("u"), nullptr,
+				"", nullptr);
+		}
+
+		~NotificationsMock () {
+			g_debug("Destroying the Notifications Mock");
+			g_clear_object(&mock);
+		}
+
+		std::string vector2py (std::vector<std::string> vect) {
+			std::string retval("[ ");
+
+			std::for_each(vect.begin(), vect.end() - 1, [&retval](std::string entry) {
+				retval += "'";
+				retval += entry;
+				retval += "', ";
+			});
+
+			retval += "'";
+			retval += *(vect.end() - 1);
+			retval += "']";
+
+			return retval;
+		}
+
+		operator std::shared_ptr<DbusTestTask> () {
+			std::shared_ptr<DbusTestTask> retval(DBUS_TEST_TASK(g_object_ref(mock)), [](DbusTestTask * task) { g_clear_object(&task); });
+			return retval;
+		}
+
+		operator DbusTestTask* () {
+			return DBUS_TEST_TASK(mock);
+		}
+
+		operator DbusTestDbusMock* () {
+			return mock;
+		}
+
+		struct Notification {
+			std::string app_name;
+			unsigned int replace_id;
+			std::string app_icon;
+			std::string summary;
+			std::string body;
+			std::vector<std::string> actions;
+			std::map<std::string, std::shared_ptr<GVariant>> hints;
+			int timeout;
+		};
+
+		std::shared_ptr<GVariant> childGet (GVariant * tuple, gsize index) {
+			return std::shared_ptr<GVariant>(g_variant_get_child_value(tuple, index),
+				[](GVariant * v){ if (v != nullptr) g_variant_unref(v); });
+		}
+
+		std::vector<Notification> getNotifications (void) {
+			std::vector<Notification> notifications;
+
+			unsigned int cnt, i;
+			auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, baseobj, "Notify", &cnt, nullptr);
+
+			for (i = 0; i < cnt; i++) {
+				auto call = calls[i];
+				Notification notification;
+
+				notification.app_name = g_variant_get_string(childGet(call.params, 0).get(), nullptr);
+				notification.replace_id = g_variant_get_uint32(childGet(call.params, 1).get());
+				notification.app_icon = g_variant_get_string(childGet(call.params, 2).get(), nullptr);
+				notification.summary = g_variant_get_string(childGet(call.params, 3).get(), nullptr);
+				notification.body = g_variant_get_string(childGet(call.params, 4).get(), nullptr);
+				notification.timeout = g_variant_get_int32(childGet(call.params, 7).get());
+
+				auto vactions = childGet(call.params, 5);
+				GVariantIter iactions = {0};
+				g_variant_iter_init(&iactions, vactions.get());
+				const gchar * action = nullptr;
+				while (g_variant_iter_loop(&iactions, "&s", &action)) {
+					std::string saction(action);
+					notification.actions.push_back(saction);
+				}
+
+				auto vhints = childGet(call.params, 6);
+				GVariantIter ihints = {0};
+				g_variant_iter_init(&ihints, vhints.get());
+				const gchar * hint_key = nullptr;
+				GVariant * hint_value = nullptr;
+				while (g_variant_iter_loop(&ihints, "{&sv}", &hint_key, &hint_value)) {
+					std::string key(hint_key);
+					std::shared_ptr<GVariant> value(g_variant_ref(hint_value), [](GVariant * v){ if (v != nullptr) g_variant_unref(v); });
+					notification.hints[key] = value;
+				}
+
+				notifications.push_back(notification);
+			}
+
+			return notifications;
+		}
+
+		bool clearNotifications (void) {
+			return dbus_test_dbus_mock_object_clear_method_calls(mock, baseobj, nullptr);
+		}
+};
 
=== added file 'tests/notifications-test.cc'
--- tests/notifications-test.cc	1970-01-01 00:00:00 +0000
+++ tests/notifications-test.cc	2015-02-14 02:38:32 +0000
@@ -0,0 +1,348 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <memory>
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+#include <libdbustest/dbus-test.h>
+#include <libnotify/notify.h>
+
+#include "notifications-mock.h"
+#include "gtest-gvariant.h"
+
+extern "C" {
+#include "indicator-sound-service.h"
+#include "vala-mocks.h"
+}
+
+class NotificationsTest : public ::testing::Test
+{
+	protected:
+		DbusTestService * service = NULL;
+
+		GDBusConnection * session = NULL;
+		std::shared_ptr<NotificationsMock> notifications;
+
+		virtual void SetUp() {
+			g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
+			g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
+
+			service = dbus_test_service_new(NULL);
+			dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SESSION);
+
+			/* Useful for debugging test failures, not needed all the time (until it fails) */
+			#if 0
+			auto bustle = std::shared_ptr<DbusTestTask>([]() {
+				DbusTestTask * bustle = DBUS_TEST_TASK(dbus_test_bustle_new("notifications-test.bustle"));
+				dbus_test_task_set_name(bustle, "Bustle");
+				dbus_test_task_set_bus(bustle, DBUS_TEST_SERVICE_BUS_SESSION);
+				return bustle;
+			}(), [](DbusTestTask * bustle) {
+				g_clear_object(&bustle);
+			});
+			dbus_test_service_add_task(service, bustle.get());
+			#endif
+
+			notifications = std::make_shared<NotificationsMock>();
+
+			dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+			dbus_test_service_start_tasks(service);
+
+			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+			ASSERT_NE(nullptr, session);
+			g_dbus_connection_set_exit_on_close(session, FALSE);
+			g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
+
+			/* This is done in main.c */
+			notify_init("indicator-sound");
+		}
+
+		virtual void TearDown() {
+			if (notify_is_initted())
+				notify_uninit();
+
+			notifications.reset();
+			g_clear_object(&service);
+
+			g_object_unref(session);
+
+			unsigned int cleartry = 0;
+			while (session != NULL && cleartry < 100) {
+				loop(100);
+				cleartry++;
+			}
+
+			ASSERT_EQ(nullptr, session);
+		}
+
+		static gboolean timeout_cb (gpointer user_data) {
+			GMainLoop * loop = static_cast<GMainLoop *>(user_data);
+			g_main_loop_quit(loop);
+			return G_SOURCE_REMOVE;
+		}
+
+		void loop (unsigned int ms) {
+			GMainLoop * loop = g_main_loop_new(NULL, FALSE);
+			g_timeout_add(ms, timeout_cb, loop);
+			g_main_loop_run(loop);
+			g_main_loop_unref(loop);
+		}
+
+		static int unref_idle (gpointer user_data) {
+			g_variant_unref(static_cast<GVariant *>(user_data));
+			return G_SOURCE_REMOVE;
+		}
+
+		std::shared_ptr<MediaPlayerList> playerListMock () {
+			auto playerList = std::shared_ptr<MediaPlayerList>(
+				MEDIA_PLAYER_LIST(media_player_list_mock_new()),
+				[](MediaPlayerList * list) {
+					g_clear_object(&list);
+				});
+			return playerList;
+		}
+
+		std::shared_ptr<VolumeControl> volumeControlMock () {
+			auto volumeControl = std::shared_ptr<VolumeControl>(
+				VOLUME_CONTROL(volume_control_mock_new()),
+				[](VolumeControl * control){
+					g_clear_object(&control);
+				});
+			return volumeControl;
+		}
+
+		std::shared_ptr<IndicatorSoundService> standardService (std::shared_ptr<VolumeControl> volumeControl, std::shared_ptr<MediaPlayerList> playerList) {
+			auto soundService = std::shared_ptr<IndicatorSoundService>(
+				indicator_sound_service_new(playerList.get(), volumeControl.get(), nullptr),
+				[](IndicatorSoundService * service){
+					g_clear_object(&service);
+				});
+
+			return soundService;
+		}
+};
+
+TEST_F(NotificationsTest, BasicObject) {
+	auto soundService = standardService(volumeControlMock(), playerListMock());
+
+	/* Give some time settle */
+	loop(50);
+
+	/* Auto free */
+}
+
+TEST_F(NotificationsTest, VolumeChanges) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set a volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.50);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+	EXPECT_EQ("indicator-sound", notev[0].app_name);
+	EXPECT_EQ("Volume", notev[0].summary);
+	EXPECT_EQ(0, notev[0].actions.size());
+	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
+	EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]);
+
+	/* Set a different volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.60);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+	EXPECT_GVARIANT_EQ("@i 60", notev[0].hints["value"]);
+
+	/* Set the same volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.60);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(0, notev.size());
+
+	/* Change just a little */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.60001);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(0, notev.size());
+}
+
+TEST_F(NotificationsTest, StreamChanges) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set a volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.5);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+
+	/* Change Streams, no volume change */
+	notifications->clearNotifications();
+	volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "alarm");
+	volume_control_set_volume(volumeControl.get(), 0.5);
+	loop(50);
+	notev = notifications->getNotifications();
+	EXPECT_EQ(0, notev.size());
+
+	/* Change Streams, volume change */
+	notifications->clearNotifications();
+	volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "alert");
+	volume_control_set_volume(volumeControl.get(), 0.60);
+	loop(50);
+	notev = notifications->getNotifications();
+	EXPECT_EQ(0, notev.size());
+
+	/* Change Streams, no volume change, volume up */
+	notifications->clearNotifications();
+	volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "multimedia");
+	volume_control_set_volume(volumeControl.get(), 0.60);
+	loop(50);
+	volume_control_set_volume(volumeControl.get(), 0.65);
+	notev = notifications->getNotifications();
+	EXPECT_EQ(1, notev.size());
+	EXPECT_GVARIANT_EQ("@i 65", notev[0].hints["value"]);
+}
+
+TEST_F(NotificationsTest, IconTesting) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set an initial volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.5);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+
+	/* Generate a set of notifications */
+	notifications->clearNotifications();
+	for (float i = 0.0; i < 1.01; i += 0.1) {
+		volume_control_set_volume(volumeControl.get(), i);
+	}
+
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(11, notev.size());
+
+	EXPECT_EQ("audio-volume-muted",  notev[0].app_icon);
+	EXPECT_EQ("audio-volume-low",    notev[1].app_icon);
+	EXPECT_EQ("audio-volume-low",    notev[2].app_icon);
+	EXPECT_EQ("audio-volume-medium", notev[3].app_icon);
+	EXPECT_EQ("audio-volume-medium", notev[4].app_icon);
+	EXPECT_EQ("audio-volume-medium", notev[5].app_icon);
+	EXPECT_EQ("audio-volume-medium", notev[6].app_icon);
+	EXPECT_EQ("audio-volume-high",   notev[7].app_icon);
+	EXPECT_EQ("audio-volume-high",   notev[8].app_icon);
+	EXPECT_EQ("audio-volume-high",   notev[9].app_icon);
+	EXPECT_EQ("audio-volume-high",   notev[10].app_icon);
+}
+
+TEST_F(NotificationsTest, ServerRestart) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set a volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.50);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+
+	/* Restart server without sync notifications */
+	notifications->clearNotifications();
+	dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
+	notifications.reset();
+
+	loop(50);
+
+	notifications = std::make_shared<NotificationsMock>(std::vector<std::string>({"body", "body-markup", "icon-static"}));
+	dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+	dbus_test_task_run((DbusTestTask*)*notifications);
+
+	/* Change the volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.60);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(0, notev.size());
+
+	/* Put a good server back */
+	dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
+	notifications.reset();
+
+	loop(50);
+
+	notifications = std::make_shared<NotificationsMock>();
+	dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+	dbus_test_task_run((DbusTestTask*)*notifications);
+
+	/* Change the volume again */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.70);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+}
+
+TEST_F(NotificationsTest, HighVolume) {
+	auto volumeControl = volumeControlMock();
+	auto soundService = standardService(volumeControl, playerListMock());
+
+	/* Set a volume */
+	notifications->clearNotifications();
+	volume_control_set_volume(volumeControl.get(), 0.50);
+	loop(50);
+	auto notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+	EXPECT_EQ("Volume", notev[0].summary);
+	EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]);
+
+	/* Set high volume with volume change */
+	notifications->clearNotifications();
+	volume_control_mock_set_mock_high_volume(VOLUME_CONTROL_MOCK(volumeControl.get()), TRUE);
+	volume_control_set_volume(volumeControl.get(), 0.90);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */
+	EXPECT_EQ("Volume", notev[0].summary);
+	EXPECT_EQ("High volume", notev[0].body);
+	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
+
+	/* Move it back */
+	volume_control_mock_set_mock_high_volume(VOLUME_CONTROL_MOCK(volumeControl.get()), FALSE);
+	volume_control_set_volume(volumeControl.get(), 0.50);
+	loop(50);
+
+	/* Set high volume without level change */
+	/* NOTE: This can happen if headphones are plugged in */
+	notifications->clearNotifications();
+	volume_control_mock_set_mock_high_volume(VOLUME_CONTROL_MOCK(volumeControl.get()), TRUE);
+	loop(50);
+	notev = notifications->getNotifications();
+	ASSERT_EQ(1, notev.size());
+	EXPECT_EQ("Volume", notev[0].summary);
+	EXPECT_EQ("High volume", notev[0].body);
+	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
+}
 
=== modified file 'tests/pa-mock.cpp'
--- tests/pa-mock.cpp	2015-01-29 14:34:50 +0000
+++ tests/pa-mock.cpp	2015-02-14 02:38:32 +0000
@@ -23,6 +23,7 @@
 
 #include <pulse/pulseaudio.h>
 #include <pulse/glib-mainloop.h>
+#include <pulse/ext-stream-restore.h>
 #include <gio/gio.h>
 #include <math.h>
 
@@ -280,6 +281,12 @@
 	return dummy_operation();
 }
 
+pa_operation *
+pa_context_get_sink_input_info_list (pa_context *c, pa_sink_input_info_cb_t cb, void * userdata)
+{
+	return pa_context_get_sink_input_info (c, 0, cb, userdata);
+}
+
 pa_operation*
 pa_context_get_source_info_by_name (pa_context *c, const char * name, pa_source_info_cb_t cb, void *userdata)
 {
@@ -569,3 +576,18 @@
 	return cvol;
 }
 
+/* *******************************
+ * ext-stream-restore.h
+ * *******************************/
+
+pa_operation *
+pa_ext_stream_restore_test (pa_context * c, pa_ext_stream_restore_test_cb_t callback, void * userdata)
+{
+	reinterpret_cast<PAMockContext*>(c)->idleOnce(
+	[c, callback, userdata]() {
+		if (callback != nullptr)
+			callback(c, 1, userdata);
+	});
+
+	return dummy_operation();
+}
 
=== added file 'tests/volume-control-mock.vala'
--- tests/volume-control-mock.vala	1970-01-01 00:00:00 +0000
+++ tests/volume-control-mock.vala	2015-02-14 02:38:32 +0000
@@ -0,0 +1,43 @@
+/*
+ * -*- Mode:Vala; indent-tabs-mode:t; tab-width:4; encoding:utf8 -*-
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * 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; version 3.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+public class VolumeControlMock : VolumeControl
+{
+	public string mock_stream { get; set; default = "multimedia"; }
+	public override string stream { get { return mock_stream; } }
+	public override bool ready { get; set; }
+	public override bool active_mic { get; set; }
+	public bool mock_high_volume { get; set; }
+	public override bool high_volume { get { return mock_high_volume; } }
+	public bool mock_mute { get; set; }
+	public override bool mute { get { return mock_mute; } set { } }
+	public bool mock_is_playing { get; set; }
+	public override bool is_playing { get { return mock_is_playing; } set { } }
+	public override double volume { get; set; }
+	public override double mic_volume { get; set; }
+
+	public VolumeControlMock() { 
+		ready = true;
+		this.notify["mock-stream"].connect(() => this.notify_property("stream"));
+		this.notify["mock-high-volume"].connect(() => this.notify_property("high-volume"));
+		this.notify["mock-mute"].connect(() => this.notify_property("mute"));
+		this.notify["mock-is-playing"].connect(() => this.notify_property("is-playing"));
+	}
+}
 
=== modified file 'tests/volume-control-test.cc'
--- tests/volume-control-test.cc	2015-01-27 17:42:26 +0000
+++ tests/volume-control-test.cc	2015-02-14 02:38:32 +0000
@@ -23,6 +23,7 @@
 
 extern "C" {
 #include "indicator-sound-service.h"
+#include "vala-mocks.h"
 }
 
 class VolumeControlTest : public ::testing::Test
@@ -71,13 +72,14 @@
 };
 
 TEST_F(VolumeControlTest, BasicObject) {
-	VolumeControl * control = volume_control_new();
+	FocusTrackerMock * focustracker = focus_tracker_mock_new();
+	VolumeControlPulse * control = volume_control_pulse_new(FOCUS_TRACKER(focustracker));
 
 	/* Setup the PA backend */
 	loop(100);
 
 	/* Ready */
-	EXPECT_TRUE(volume_control_get_ready(control));
+	EXPECT_TRUE(volume_control_get_ready(VOLUME_CONTROL(control)));
 
 	g_clear_object(&control);
 }
 
=== added file 'vapi/libpulse-ext-stream-restore.vapi'
--- vapi/libpulse-ext-stream-restore.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libpulse-ext-stream-restore.vapi	2015-02-14 02:38:32 +0000
@@ -0,0 +1,22 @@
+
+using GLib;
+using PulseAudio;
+
+[CCode (cheader_filename="pulse/ext-stream-restore.h")]
+namespace PulseAudio.Extension.StreamRestore {
+	public struct Info {
+		string name;
+		PulseAudio.ChannelMap channel_map;
+		PulseAudio.CVolume volume;
+		string device;
+		int mute;
+	}
+
+	public delegate void TestCb (PulseAudio.Context context, uint32 version);
+	[CCode (cname="pa_ext_stream_restore_test")]
+	PulseAudio.Operation? test (PulseAudio.Context context, TestCb? callback = null);
+
+	public delegate void ReadCb (PulseAudio.Context context, PulseAudio.Extension.StreamRestore.Info[] streams, int eol);
+	[CCode (cname="pa_ext_stream_restore_read")]
+	PulseAudio.Operation? read (PulseAudio.Context context, ReadCb? callback = null);
+}