Merge lp:~ted/indicator-sound/upstart-job into lp:indicator-sound/13.10

[Ted Gould]

Switch from D-Bus activation to Upstart User Session

Switching around the config files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:355
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/11

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/30/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Needs to be synced with pete's cmake changes.

Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

review: Needs Fixing

[lp:~ted/indicator-sound/upstart-job]

356. By Ted Gould on 2013-08-27

Merge Trunk

[Ted Gould (ted)]

On Tue, 2013-08-27 at 14:42 +0000, Charles Kerr wrote:

> Needs to be synced with pete's cmake changes.
>
> Ted, why didn't you do that when you submitted this MP in mid-July? ;-)

Sorry forgot to push the last version ;-) Fixed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:356
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/43/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/43/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-sound/upstart-job]

357. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/44/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-sound-ci/44/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-sound/upstart-job]

358. By Ted Gould on 2013-10-29

Merge trunk

359. By Ted Gould on 2013-10-29

Adding an XDG Autostart file

360. By Ted Gould on 2013-10-29

Forgot a var

Unmerged revisions

360. By Ted Gould on 2013-10-29

Forgot a var

359. By Ted Gould on 2013-10-29

Adding an XDG Autostart file

358. By Ted Gould on 2013-10-29

Merge trunk

357. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

356. By Ted Gould on 2013-08-27

Merge Trunk

355. By Ted Gould on 2013-07-12

Fixing directory

354. By Ted Gould on 2013-07-12

Switch from being dbus activated to being an upstart job

=== modified file '.bzrignore'
--- .bzrignore	2013-08-16 03:58:55 +0000
+++ .bzrignore	2013-10-29 00:52:35 +0000
@@ -1,7 +1,7 @@
 /po/POTFILES
 /po/stamp-it
 
-/data/indicator-sound.service
+/data/indicator-sound.conf
 
 /src/indicator-sound-service
 /src/indicator_sound_service_vala.stamp

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-08-16 03:13:41 +0000
+++ data/CMakeLists.txt	2013-10-29 00:52:35 +0000
@@ -17,23 +17,43 @@
 )
 
 ###########################
-# Dbus Service
-###########################
-
-set(
-  INDICATOR_SOUND_SERVICE
-  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.service"
-)
-
-configure_file(
-  "indicator-sound.service.in"
-  ${INDICATOR_SOUND_SERVICE}
-  @ONLY
-)
-
-install(
-  FILES "${INDICATOR_SOUND_SERVICE}"
-  DESTINATION "${CMAKE_INSTALL_DATADIR}/dbus-1/services/"
+# Upstart Job
+###########################
+
+set(
+  INDICATOR_SOUND_CONF
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.conf"
+)
+
+configure_file(
+  "indicator-sound.conf.in"
+  ${INDICATOR_SOUND_CONF}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_CONF}"
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/upstart/sessions/"
+)
+
+###########################
+# XDG Autostart
+###########################
+
+set(
+  INDICATOR_SOUND_XDG_AUTOSTART
+  "${CMAKE_CURRENT_BINARY_DIR}/indicator-sound.desktop"
+)
+
+configure_file(
+  "indicator-sound.desktop.in"
+  ${INDICATOR_SOUND_CONF}
+  @ONLY
+)
+
+install(
+  FILES "${INDICATOR_SOUND_XDG_AUTOSTART}"
+  DESTINATION "/etc/xdg/autostart"
 )
 
 ###########################

=== modified file 'data/com.canonical.indicator.sound'
--- data/com.canonical.indicator.sound	2013-10-02 19:14:14 +0000
+++ data/com.canonical.indicator.sound	2013-10-29 00:52:35 +0000
@@ -11,3 +11,10 @@
 
 [desktop_greeter]
 ObjectPath=/com/canonical/indicator/sound/desktop_greeter
+
+[ubiquity]
+ObjectPath=/com/canonical/indicator/sound/desktop_greeter
+
+[phone_greeter]
+ObjectPath=/com/canonical/indicator/sound/desktop_greeter
+

=== added file 'data/indicator-sound.conf.in'
--- data/indicator-sound.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sound.conf.in	2013-10-29 00:52:35 +0000
@@ -0,0 +1,11 @@
+description "Indicator Sound Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet.  Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service

=== added file 'data/indicator-sound.desktop.in'
--- data/indicator-sound.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-sound.desktop.in	2013-10-29 00:52:35 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Sound
+Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-sound.service.in'
--- data/indicator-sound.service.in	2013-08-16 03:58:55 +0000
+++ data/indicator-sound.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.sound
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/indicator-sound/indicator-sound-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-11 04:27:51 +0000
+++ debian/changelog	2013-10-29 00:52:35 +0000
@@ -1,3 +1,10 @@
+indicator-sound (12.10.2+13.10.20131011-0ubuntu2) UNRELEASED; urgency=low
+
+  * Define "ubiquity" indicator profile, reusing the greeter object. (LP:
+    #1241539)
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Fri, 18 Oct 2013 13:10:03 +0100
+
 indicator-sound (12.10.2+13.10.20131011-0ubuntu1) saucy; urgency=low
 
   [ Lars Uebernickel ]

=== modified file 'src/service.vala'
--- src/service.vala	2013-10-09 13:01:14 +0000
+++ src/service.vala	2013-10-29 00:52:35 +0000
@@ -34,9 +34,9 @@
 		this.actions.add_action (this.create_mic_volume_action ());
 
 		this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
-		this.menus.insert ("desktop_greeter", new SoundMenu (true, null));
-		this.menus.insert ("desktop", new SoundMenu (true, "indicator.desktop-settings"));
-		this.menus.insert ("phone", new SoundMenu (false, "indicator.phone-settings"));
+		this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE));
+		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
+		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 		this.menus.@foreach ( (profile, menu) => {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
@@ -120,9 +120,7 @@
 	void activate_desktop_settings (SimpleAction action, Variant? param) {
 		var env = Environment.get_variable ("DESKTOP_SESSION");
 		string cmd;
-		if (env == "unity")
-			cmd = "gnome-control-center sound-nua";
-		else if (env == "xubuntu" || env == "ubuntustudio")
+		if (env == "xubuntu" || env == "ubuntustudio")
 			cmd = "pavucontrol";
 		else
 			cmd = "gnome-control-center sound";
@@ -177,10 +175,10 @@
 	}
 
 	Action create_mute_action () {
-		var mute_action = new SimpleAction.stateful ("mute", null, this.volume_control.mute);
+		var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute));
 
 		mute_action.activate.connect ( (action, param) => {
-			action.change_state (!action.get_state ().get_boolean ());
+			action.change_state (new Variant.boolean (!action.get_state ().get_boolean ()));
 		});
 
 		mute_action.change_state.connect ( (action, val) => {
@@ -188,7 +186,7 @@
 		});
 
 		this.volume_control.notify["mute"].connect ( () => {
-			mute_action.set_state (this.volume_control.mute);
+			mute_action.set_state (new Variant.boolean (this.volume_control.mute));
 			this.update_root_icon ();
 		});
 
@@ -197,13 +195,13 @@
 
 	void volume_changed (double volume) {
 		var volume_action = this.actions.lookup_action ("volume") as SimpleAction;
-		volume_action.set_state (volume);
+		volume_action.set_state (new Variant.double (volume));
 
 		this.update_root_icon ();
 	}
 
 	Action create_volume_action () {
-		var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, this.volume_control.get_volume ());
+		var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (this.volume_control.get_volume ()));
 
 		volume_action.change_state.connect ( (action, val) => {
 			volume_control.set_volume (val.get_double ());
@@ -223,14 +221,14 @@
 	}
 
 	Action create_mic_volume_action () {
-		var volume_action = new SimpleAction.stateful ("mic-volume", null, this.volume_control.get_mic_volume ());
+		var volume_action = new SimpleAction.stateful ("mic-volume", null, new Variant.double (this.volume_control.get_mic_volume ()));
 
 		volume_action.change_state.connect ( (action, val) => {
 			volume_control.set_mic_volume (val.get_double ());
 		});
 
 		this.volume_control.mic_volume_changed.connect ( (volume) => {
-			volume_action.set_state (volume);
+			volume_action.set_state (new Variant.double (volume));
 		});
 
 		this.volume_control.bind_property ("ready", volume_action, "enabled", BindingFlags.SYNC_CREATE);

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2013-10-28 23:54:31 +0000
+++ src/sound-menu.vala	2013-10-29 00:52:35 +0000
@@ -22,14 +22,20 @@
 
 class SoundMenu: Object
 {
-	public SoundMenu (bool show_mute, string? settings_action) {
+	public enum DisplayFlags {
+		NONE = 0,
+		SHOW_MUTE = 1,
+		HIDE_INACTIVE_PLAYERS = 2
+	}
+
+	public SoundMenu (string? settings_action, DisplayFlags flags) {
 		/* A sound menu always has at least two sections: the volume section (this.volume_section)
 		 * at the start of the menu, and the settings section at the end. Between those two,
 		 * it has a dynamic amount of player sections, one for each registered player.
 		 */
 
 		this.volume_section = new Menu ();
-		if (show_mute)
+		if ((flags & DisplayFlags.SHOW_MUTE) != 0)
 			volume_section.append (_("Mute"), "indicator.mute");
 		volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.01,
 																  "audio-volume-low-zero-panel",
@@ -51,6 +57,9 @@
 
 		this.root = new Menu ();
 		root.append_item (root_item);
+
+		this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0;
+		this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal);
 	}
 
 	public void export (DBusConnection connection, string object_path) {
@@ -81,6 +90,7 @@
 	}
 
 	public void add_player (MediaPlayer player) {
+<<<<<<< TREE
 		/* Add new players to the end of the player sections, just before the settings */
 		var player_item = new MenuItem (player.name, "indicator." + player.id);
 		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
@@ -99,22 +109,32 @@
 		var section = new Menu ();
 		section.append_item (player_item);
 		section.append_item (playback_item);
+=======
+		if (this.notify_handlers.contains (player))
+			return;
+
+		if (player.is_running || !this.hide_inactive)
+			this.insert_player_section (player);
+		this.update_playlists (player);
+
+		var handler_id = player.notify["is-running"].connect ( () => {
+			if (this.hide_inactive) {
+				if (player.is_running)
+					this.insert_player_section (player);
+				else
+					this.remove_player_section (player);
+			}
+			this.update_playlists (player);
+		});
+		this.notify_handlers.insert (player, handler_id);
+>>>>>>> MERGE-SOURCE
 
 		player.playlists_changed.connect (this.update_playlists);
-		player.notify["is-running"].connect ( () => this.update_playlists (player) );
-		update_playlists (player);
-
-		if (settings_shown) {
-			this.menu.insert_section (this.menu.get_n_items () -1, null, section);
-		} else {
-			this.menu.append_section (null, section);
-		}
 	}
 
 	public void remove_player (MediaPlayer player) {
-		int index = this.find_player_section (player);
-		if (index >= 0)
-			this.menu.remove (index);
+		this.remove_player_section (player);
+		this.notify_handlers.remove (player);
 	}
 
 	Menu root;
@@ -122,6 +142,8 @@
 	Menu volume_section;
 	bool mic_volume_shown;
 	bool settings_shown = false;
+	bool hide_inactive;
+	HashTable<MediaPlayer, ulong> notify_handlers;
 
 	/* returns the position in this.menu of the section that's associated with @player */
 	int find_player_section (MediaPlayer player) {
@@ -138,6 +160,41 @@
 		return -1;
 	}
 
+	void insert_player_section (MediaPlayer player) {
+		var section = new Menu ();
+		Icon icon;
+
+		icon = player.icon;
+		if (icon == null)
+			icon = new ThemedIcon.with_default_fallbacks ("application-default-icon");
+
+		var player_item = new MenuItem (player.name, "indicator." + player.id);
+		player_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.media-player");
+		if (icon != null)
+			player_item.set_attribute_value ("icon", g_icon_serialize (icon));
+		section.append_item (player_item);
+
+		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);
+		section.append_item (playback_item);
+
+		/* Add new players to the end of the player sections, just before the settings */
+		if (settings_shown) {
+			this.menu.insert_section (this.menu.get_n_items () -1, null, section);
+		} else {
+			this.menu.append_section (null, section);
+		}
+	}
+
+	void remove_player_section (MediaPlayer player) {
+		int index = this.find_player_section (player);
+		if (index >= 0)
+			this.menu.remove (index);
+	}
+
 	void update_playlists (MediaPlayer player) {
 		int index = find_player_section (player);
 		if (index < 0)

=== modified file 'src/volume-control.vala'
--- src/volume-control.vala	2013-10-28 23:49:19 +0000
+++ src/volume-control.vala	2013-10-29 00:52:35 +0000
@@ -128,12 +128,14 @@
 		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);
+	}
+
 	private void update_source ()
 	{
-		context.get_server_info ( (c, i) => {
-			if (i != null)
-				context.get_source_info_by_name (i.default_source_name, source_info_cb);
-		});
+		context.get_server_info (update_source_get_server_info_cb);
 	}
 
 	private void source_output_info_cb (Context c, SourceOutputInfo? i, int eol)
@@ -199,15 +201,25 @@
 			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 */
 	public void set_mute (bool mute)
 	{
 		return_if_fail (context.get_state () == Context.State.READY);
 
-		context.get_sink_info_list ((context, sink, eol) => {
-			if (sink != null)
-				context.set_sink_mute_by_index (sink.index, mute, null);
-		});
+		if (mute)
+			context.get_sink_info_list (sink_info_list_callback_set_mute);
+		else
+			context.get_sink_info_list (sink_info_list_callback_unset_mute);
 	}
 
 	public void toggle_mute ()
@@ -277,19 +289,21 @@
 			mic_volume_changed (_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 void set_mic_volume (double volume)
 	{
 		return_if_fail (context.get_state () == Context.State.READY);
 
 		_mic_volume = volume;
 
-		context.get_server_info ( (c, 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);
-			}
-		});
+		context.get_server_info (set_mic_volume_get_server_info_cb);
 	}
 
 	public double get_volume ()