Merge Trunk

1 files changed, 55 insertions, 143 deletions

diff --git a/src/service.vala b/src/service.vala
index 3d14d5e..4d64502 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -17,28 +17,29 @@
  *      Lars Uebernickel <lars.uebernickel@canonical.com>
  */
 
-/* Icon.serialize() is not yet in gio-2.0.vapi; remove this when it is */
-extern Variant? g_icon_serialize (Icon icon);
-
 public class IndicatorSound.Service {
 	public Service () {
 		this.settings = new Settings ("com.canonical.indicator.sound");
 
 		this.volume_control = new VolumeControl ();
-		this.volume_control.notify["active-mic"].connect (active_mic_changed);
 
 		this.players = new MediaPlayerList ();
 		this.players.player_added.connect (this.player_added);
 		this.players.player_removed.connect (this.player_removed);
 
 		this.actions = new SimpleActionGroup ();
-		this.actions.add_entries (action_entries, this);
+		this.actions.add_action_entries (action_entries, this);
 		this.actions.add_action (this.create_mute_action ());
 		this.actions.add_action (this.create_volume_action ());
 		this.actions.add_action (this.create_mic_volume_action ());
 
-		this.menu = create_menu ();
-		this.root_menu = create_root_menu (this.menu);
+		this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
+		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings"));
+		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings"));
+
+		this.menus.@foreach ( (profile, menu) => {
+			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
+		});
 
 		this.players.sync (settings.get_strv ("interested-media-players"));
 		this.settings.changed["interested-media-players"].connect ( () => {
@@ -62,20 +63,20 @@ public class IndicatorSound.Service {
 	}
 
 	const ActionEntry[] action_entries = {
-		{ "root", null, null, "{ 'icon': <'audio-volume-high-panel'> }", null },
-		{ "settings", activate_settings, null, null, null },
+		{ "root", null, null, "@a{sv} {}", null },
+		{ "desktop-settings", activate_desktop_settings, null, null, null },
+		{ "phone-settings", activate_phone_settings, null, null, null },
 	};
 
 	MainLoop loop;
 	SimpleActionGroup actions;
-	Menu root_menu;
-	Menu menu;
+	HashTable<string, SoundMenu> menus;
 	Settings settings;
 	VolumeControl volume_control;
 	MediaPlayerList players;
 	uint player_action_update_id;
 
-	void activate_settings (SimpleAction action, Variant? param) {
+	void activate_desktop_settings (SimpleAction action, Variant? param) {
 		var env = Environment.get_variable ("DESKTOP_SESSION");
 		string cmd;
 		if (env == "unity")
@@ -92,55 +93,19 @@ public class IndicatorSound.Service {
 		}
 	}
 
-	static Menu create_root_menu (Menu submenu) {
-		var root = new MenuItem (null, "indicator.root");
-		root.set_attribute ("x-canonical-type", "s", "com.canonical.indicator.root");
-		root.set_submenu (submenu);
-
-		var menu = new Menu ();
-		menu.append_item (root);
-
-		return menu;
-	}
-
-	static Menu create_menu () {
-		var volume_section = new Menu ();
-		volume_section.append (_("Mute"), "indicator.mute");
-
-		var slider = new MenuItem (null, "indicator.volume");
-		slider.set_attribute ("x-canonical-type", "s", "com.canonical.unity.slider");
-		slider.set_attribute_value ("min-icon", g_icon_serialize (new ThemedIcon ("audio-volume-low-zero-panel")));
-		slider.set_attribute_value ("max-icon", g_icon_serialize (new ThemedIcon ("audio-volume-high-panel")));
-		slider.set_attribute ("min-value", "d", 0.0);
-		slider.set_attribute ("max-value", "d", 1.0);
-		slider.set_attribute ("step", "d", 0.01);
-		volume_section.append_item (slider);
-
-		var menu = new Menu ();
-		menu.append_section (null, volume_section);
-		menu.append (_("Sound Settings…"), "indicator.settings");
-
-		return menu;
+	void activate_phone_settings (SimpleAction action, Variant? param) {
+		try {
+			Process.spawn_command_line_async ("system-settings sound");
+		} catch (Error e) {
+			warning ("unable to launch sound settings: %s", e.message);
+		}
 	}
 
-	void active_mic_changed () {
-		var volume_section = this.menu.get_item_link (0, "section") as Menu;
-		if (this.volume_control.active_mic) {
-			if (volume_section.get_n_items () < 3) {
-				var slider = new MenuItem (null, "indicator.mic-volume");
-				slider.set_attribute ("x-canonical-type", "s", "com.canonical.unity.slider");
-				slider.set_attribute_value ("min-icon", g_icon_serialize (new ThemedIcon ("audio-input-microphone-low-zero-panel")));
-				slider.set_attribute_value ("max-icon", g_icon_serialize (new ThemedIcon ("audio-input-microphone-high-panel")));
-				slider.set_attribute ("min-value", "d", 0.0);
-				slider.set_attribute ("max-value", "d", 1.0);
-				slider.set_attribute ("step", "d", 0.01);
-				volume_section.append_item (slider);
-			}
-		}
-		else {
-			if (volume_section.get_n_items () > 2)
-				volume_section.remove (2);
-		}
+	/* Returns a serialized version of @icon_name suited for the panel */
+	static Variant serialize_themed_icon (string icon_name)
+	{
+		var icon = new ThemedIcon.with_default_fallbacks (icon_name);
+		return g_icon_serialize (icon);
 	}
 
 	void update_root_icon () {
@@ -157,8 +122,20 @@ public class IndicatorSound.Service {
 		else
 			icon  = "audio-volume-high-panel";
 
-		var root_action = this.actions.lookup ("root") as SimpleAction;
-		root_action.set_state (new Variant.parsed ("{ 'icon': <%s> }", icon));
+		string accessible_name;
+		if (this.volume_control.mute) {
+			accessible_name = "Volume (muted)";
+		} else {
+			int volume_int = (int)(volume * 100);
+			accessible_name = @"Volume ($volume_int%)";
+		}
+
+		var root_action = actions.lookup_action ("root") as SimpleAction;
+		var builder = new VariantBuilder (new VariantType ("a{sv}"));
+		builder.add ("{sv}", "accessible-desc", new Variant.string (accessible_name));
+		builder.add ("{sv}", "icon", serialize_themed_icon (icon));
+		builder.add ("{sv}", "visible", new Variant.boolean (true));
+		root_action.set_state (builder.end());
 	}
 
 	Action create_mute_action () {
@@ -181,7 +158,7 @@ public class IndicatorSound.Service {
 	}
 
 	void volume_changed (double volume) {
-		var volume_action = this.actions.lookup ("volume") as SimpleAction;
+		var volume_action = this.actions.lookup_action ("volume") as SimpleAction;
 		volume_action.set_state (volume);
 
 		this.update_root_icon ();
@@ -220,10 +197,11 @@ public class IndicatorSound.Service {
 	void bus_acquired (DBusConnection connection, string name) {
 		try {
 			connection.export_action_group ("/com/canonical/indicator/sound", this.actions);
-			connection.export_menu_model ("/com/canonical/indicator/sound/desktop", this.root_menu);
 		} 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) {
@@ -245,7 +223,7 @@ public class IndicatorSound.Service {
 
 	bool update_player_actions () {
 		foreach (var player in this.players) {
-			SimpleAction? action = this.actions.lookup (player.id) as SimpleAction;
+			SimpleAction? action = this.actions.lookup_action (player.id) as SimpleAction;
 			if (action != null)
 				action.set_state (this.action_state_for_player (player));
 		}
@@ -266,61 +244,16 @@ public class IndicatorSound.Service {
 		this.settings.set_value ("interested-media-players", builder.end ());
 	}
 
-	void update_playlists (MediaPlayer player) {
-		int index = find_player_section (player);
-		if (index < 0)
-			return;
-
-		var section = this.menu.get_item_link (index, Menu.LINK_SECTION) as Menu;
-
-		/* if a section has three items, the playlists menu is in it */
-		if (section.get_n_items () == 3)
-			section.remove (2);
-
-		if (!player.is_running)
-			return;
-
-		var count = player.get_n_playlists ();
-		if (count == 0)
-			return;
-
-		var playlists_section = new Menu ();
-		for (int i = 0; i < count; i++) {
-			var playlist_id = player.get_playlist_id (i);
-			playlists_section.append (player.get_playlist_name (i),
-									  @"indicator.play-playlist.$(player.id)::$playlist_id");
-								   
-		}
-
-		var submenu = new Menu ();
-		submenu.append_section (null, playlists_section);
-		section.append_submenu ("Choose Playlist", submenu);
-	}
-
 	void player_added (MediaPlayer player) {
-		var player_item = new MenuItem (player.name, "indicator." + player.id);
-		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
-		player_item.set_attribute_value ("icon", g_icon_serialize (player.icon));
-
-		var playback_item = new MenuItem (null, null);
-		playback_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.playback-item");
-		playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id);
-		playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id);
-		playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id);
-
-		var section = new Menu ();
-		section.append_item (player_item);
-		section.append_item (playback_item);
-
-		this.menu.insert_section (this.menu.get_n_items () -1, null, section);
+		this.menus.@foreach ( (profile, menu) => menu.add_player (player));
 
 		SimpleAction action = new SimpleAction.stateful (player.id, null, this.action_state_for_player (player));
 		action.activate.connect ( () => { player.launch (); });
-		this.actions.insert (action);
+		this.actions.add_action (action);
 
 		var play_action = new SimpleAction.stateful ("play." + player.id, null, player.state);
 		play_action.activate.connect ( () => player.play_pause () );
-		this.actions.insert (play_action);
+		this.actions.add_action (play_action);
 		player.notify.connect ( (object, pspec) => {
 			if (pspec.name == "state")
 				play_action.set_state (player.state);
@@ -328,50 +261,29 @@ public class IndicatorSound.Service {
 
 		var next_action = new SimpleAction ("next." + player.id, null);
 		next_action.activate.connect ( () => player.next () );
-		this.actions.insert (next_action);
+		this.actions.add_action (next_action);
 
 		var prev_action = new SimpleAction ("previous." + player.id, null);
 		prev_action.activate.connect ( () => player.previous () );
-		this.actions.insert (prev_action);
+		this.actions.add_action (prev_action);
 
 		var playlist_action = new SimpleAction ("play-playlist." + player.id, VariantType.STRING);
 		playlist_action.activate.connect ( (parameter) => player.activate_playlist_by_name (parameter.get_string ()) );
-		this.actions.insert (playlist_action);
+		this.actions.add_action (playlist_action);
 
 		player.notify.connect (this.eventually_update_player_actions);
 
-		player.playlists_changed.connect (this.update_playlists);
-		player.notify["is-running"].connect ( () => this.update_playlists (player) );
-		update_playlists (player);
-
 		this.update_preferred_players ();
 	}
 
-	/* returns the position in this.menu of the section that's associated with @player */
-	int find_player_section (MediaPlayer player) {
-		string action_name = @"indicator.$(player.id)";
-		int n = this.menu.get_n_items () -1;
-		for (int i = 1; i < n; i++) {
-			var section = this.menu.get_item_link (i, Menu.LINK_SECTION);
-			string action;
-			section.get_item_attribute (0, "action", "s", out action);
-			if (action == action_name)
-				return i;
-		}
-
-		return -1;
-	}
-
 	void player_removed (MediaPlayer player) {
-		this.actions.remove (player.id);
-		this.actions.remove ("play." + player.id);
-		this.actions.remove ("next." + player.id);
-		this.actions.remove ("previous." + player.id);
-		this.actions.remove ("play-playlist." + player.id);
-
-		int index = this.find_player_section (player);
-		if (index >= 0)
-			this.menu.remove (index);
+		this.actions.remove_action (player.id);
+		this.actions.remove_action ("play." + player.id);
+		this.actions.remove_action ("next." + player.id);
+		this.actions.remove_action ("previous." + player.id);
+		this.actions.remove_action ("play-playlist." + player.id);
+
+		this.menus.@foreach ( (profile, menu) => menu.remove_player (player));
 
 		this.update_preferred_players ();
 	}