From 1a84c82b98727da4cab72bd1b57c392c0ff3f04f Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 18 Sep 2014 05:26:26 -0300 Subject: Adding support for setting volume per media roles (only used by touch atm) --- src/CMakeLists.txt | 1 + src/volume-control.vala | 245 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 241 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 98bc7c4..3cab736 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,6 +21,7 @@ vala_init(indicator-sound-service accounts-service PACKAGES config + gee-1.0 gio-2.0 gio-unix-2.0 libxml-2.0 diff --git a/src/volume-control.vala b/src/volume-control.vala index 2efa186..cfc865e 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -19,6 +19,7 @@ */ using PulseAudio; +using Gee; [CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")] extern unowned PulseAudio.CVolume? vol_set (PulseAudio.CVolume? cv, uint channels, PulseAudio.Volume v); @@ -43,6 +44,18 @@ public class VolumeControl : Object private double _volume = 0.0; private double _mic_volume = 0.0; + /* Used by the pulseaudio stream restore extension */ + private DBusConnection _pconn; + private Gee.ArrayList _sink_input_list = new Gee.ArrayList (); + private HashMap _sink_input_hash = new HashMap (); + private bool _pulse_use_stream_restore = false; + private uint32 _active_sink_input = -1; + private string[] _valid_roles = {"multimedia", "alert", "alarm", "phone"}; + 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 DBusProxy _user_proxy; private GreeterListInterface _greeter_proxy; private Cancellable _mute_cancellable; @@ -92,6 +105,26 @@ public class VolumeControl : Object update_sink (); 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: + stdout.printf ("Sink input event not known\n"); + break; + } + break; + case Context.SubscriptionEventType.SOURCE: update_source (); break; @@ -129,7 +162,8 @@ public class VolumeControl : Object this.notify_property ("is-playing"); } - if (_volume != volume_to_double (i.volume.values[0])) + if (_pulse_use_stream_restore == false && + _volume != volume_to_double (i.volume.values[0])) { _volume = volume_to_double (i.volume.values[0]); volume_changed (_volume); @@ -170,6 +204,100 @@ public class VolumeControl : Object context.get_server_info (update_source_get_server_info_cb); } + private void update_active_sink_input (uint32 index) + { + if (index != _active_sink_input && (index == -1 || 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; + + uint32 type = 0; + uint32 volume = 0; + + try { + var props_variant = _pconn.call_sync ("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 = null; + props_variant.get ("(v)", out tmp); + VariantIter iter = tmp.iterator (); + iter.next ("(uu)", &type, &volume); + + _volume = volume_to_double (volume); + volume_changed (_volume); + } 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 i) + { + /* We're only adding ones that are not corked and with a valid role */ + var role = i.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE); + + if (role != null && role in _valid_roles) { + if (i.corked == 0 || role == "phone") { + _sink_input_list.insert (0, i.index); + switch (role) + { + case "multimedia": + _sink_input_hash.set (i.index, _objp_role_multimedia); + break; + case "alert": + _sink_input_hash.set (i.index, _objp_role_alert); + break; + case "alarm": + _sink_input_hash.set (i.index, _objp_role_alarm); + break; + case "phone": + _sink_input_hash.set (i.index, _objp_role_phone); + break; + } + if (_sink_input_hash.get (_active_sink_input) != _objp_role_phone) + update_active_sink_input (i.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 (_sink_input_list.get (0)); + else + update_active_sink_input (-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) { + if (i.corked == 1) + 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) @@ -184,9 +312,16 @@ public class VolumeControl : Object { switch (c.get_state ()) { case Context.State.READY: - c.subscribe (PulseAudio.Context.SubscriptionMask.SINK | - PulseAudio.Context.SubscriptionMask.SOURCE | - PulseAudio.Context.SubscriptionMask.SOURCE_OUTPUT); + 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 (); @@ -226,11 +361,14 @@ public class VolumeControl : Object props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control"); props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1"); + reconnect_pulse_stream_restore (); + this.context = new PulseAudio.Context (loop.get_api(), null, props); this.context.set_state_callback (context_state_callback); if (context.connect(null, Context.Flags.NOFAIL, null) < 0) 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) { @@ -325,13 +463,39 @@ public class VolumeControl : Object context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb); } + private void set_volume_active_role () + { + string active_role_objp = _objp_role_alert; + + if (_active_sink_input != -1) + 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 (); + + _pconn.call_sync ("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); + + volume_changed (_volume); + } catch (GLib.Error e) { + warning ("unable to set volume for stream obj path %s (%s)", active_role_objp, e.message); + } + } + bool set_volume_internal (double volume) { return_val_if_fail (context.get_state () == Context.State.READY, false); if (_volume != volume) { _volume = volume; - context.get_server_info (server_info_cb_for_set_volume); + if (_pulse_use_stream_restore) + set_volume_active_role (); + else + context.get_server_info (server_info_cb_for_set_volume); return true; } else { return false; @@ -377,6 +541,77 @@ public class VolumeControl : Object return _mic_volume; } + /* PulseAudio Stream Restore logic */ + private void reconnect_pulse_stream_restore () + { + unowned string pulse_dbus_server_env = Environment.get_variable ("PULSE_DBUS_SERVER"); + string address; + + /* In case of a reconnect */ + _pulse_use_stream_restore = false; + + 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; + } + + /* 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) + _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; + } + /* AccountsService operations */ private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) { -- cgit v1.2.3 From d1bf5cc6e6f14f7a3af64873222ffed4cb0517f5 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 23 Sep 2014 02:56:30 -0300 Subject: volume-role: fix handling of the first sink-input and startup --- src/volume-control.vala | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index cfc865e..da64ca8 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -206,7 +206,7 @@ public class VolumeControl : Object private void update_active_sink_input (uint32 index) { - if (index != _active_sink_input && (index == -1 || index in _sink_input_list)) { + 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); @@ -256,7 +256,9 @@ public class VolumeControl : Object _sink_input_hash.set (i.index, _objp_role_phone); break; } - if (_sink_input_hash.get (_active_sink_input) != _objp_role_phone) + /* 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 (i.index); } } @@ -290,11 +292,12 @@ public class VolumeControl : Object return; if (i.index in _sink_input_list) { - if (i.corked == 1) - remove_sink_input_from_list(i.index); + /* 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); + add_sink_input_into_list (i); } } @@ -368,7 +371,6 @@ public class VolumeControl : Object if (context.connect(null, Context.Flags.NOFAIL, null) < 0) 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) { @@ -592,8 +594,12 @@ public class VolumeControl : Object _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) + 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 (-1); _pulse_use_stream_restore = true; + } } private string? stream_restore_get_object_path (string name) { -- cgit v1.2.3 From 404f17daa6cb76f421016aff55bbe381497f1b38 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Tue, 23 Sep 2014 03:22:23 -0300 Subject: Adding TODO entry --- src/volume-control.vala | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index da64ca8..a40cc61 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -588,6 +588,7 @@ public class VolumeControl : Object /* Check if the 4 currently supported media roles are already available in StreamRestore * Roles: multimedia, alert, alarm and phone */ + /* TODO: Watch for change events in case someone else change the volume for a specific role */ _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"); -- cgit v1.2.3 From 181791b0e1a673291b598da4f4fe0601ee975dd7 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 25 Sep 2014 02:51:36 -0300 Subject: volume-role: making sure we reflect changes done by pulse (via signals) --- src/volume-control.vala | 55 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index a40cc61..712256e 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -204,6 +204,33 @@ public class VolumeControl : Object 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") { + /* 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); + 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); + volume_changed (_volume); + } + } + } + + return message; + } + private void update_active_sink_input (uint32 index) { if ((index == -1) || (index != _active_sink_input && index in _sink_input_list)) { @@ -212,16 +239,14 @@ public class VolumeControl : Object sink_input_objp = _sink_input_hash.get (index); _active_sink_input = index; - uint32 type = 0; - uint32 volume = 0; - try { var props_variant = _pconn.call_sync ("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 = null; + Variant tmp; props_variant.get ("(v)", out tmp); + uint32 type = 0, volume = 0; VariantIter iter = tmp.iterator (); iter.next ("(uu)", &type, &volume); @@ -230,6 +255,19 @@ public class VolumeControl : Object } catch (GLib.Error e) { warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message); } + + /* Listen for role volume changes from pulse itself (external clients) */ + try { + var builder = new VariantBuilder (new VariantType ("ao")); + builder.add ("o", sink_input_objp); + + _pconn.call_sync ("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); + } } } @@ -364,7 +402,7 @@ public class VolumeControl : Object props.sets (Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control"); props.sets (Proplist.PROP_APPLICATION_VERSION, "0.1"); - reconnect_pulse_stream_restore (); + reconnect_pulse_dbus (); this.context = new PulseAudio.Context (loop.get_api(), null, props); this.context.set_state_callback (context_state_callback); @@ -543,8 +581,8 @@ public class VolumeControl : Object return _mic_volume; } - /* PulseAudio Stream Restore logic */ - private void reconnect_pulse_stream_restore () + /* PulseAudio Dbus (Stream Restore) logic */ + private void reconnect_pulse_dbus () { unowned string pulse_dbus_server_env = Environment.get_variable ("PULSE_DBUS_SERVER"); string address; @@ -586,6 +624,9 @@ public class VolumeControl : Object 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 */ /* TODO: Watch for change events in case someone else change the volume for a specific role */ -- cgit v1.2.3 From e635fc82d48a055e42bcd10753dfff929ce663a6 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 25 Sep 2014 02:52:58 -0300 Subject: volume-role: removing TODO --- src/volume-control.vala | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index 712256e..995139d 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -629,7 +629,6 @@ public class VolumeControl : Object /* Check if the 4 currently supported media roles are already available in StreamRestore * Roles: multimedia, alert, alarm and phone */ - /* TODO: Watch for change events in case someone else change the volume for a specific role */ _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"); -- cgit v1.2.3 From 55ca77b7f0d2d5220f8a24813806b6d9222f86da Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Mon, 29 Sep 2014 18:18:27 -0300 Subject: Review changes --- src/volume-control.vala | 74 +++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index 995139d..9f31d67 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -46,6 +46,8 @@ public class VolumeControl : Object /* 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 _sink_input_list = new Gee.ArrayList (); private HashMap _sink_input_hash = new HashMap (); private bool _pulse_use_stream_restore = false; @@ -120,7 +122,7 @@ public class VolumeControl : Object remove_sink_input_from_list (index); break; default: - stdout.printf ("Sink input event not known\n"); + debug ("Sink input event not known."); break; } break; @@ -204,8 +206,8 @@ public class VolumeControl : Object context.get_server_info (update_source_get_server_info_cb); } - private DBusMessage pulse_dbus_filter (DBusConnection connection, owned DBusMessage message, bool incoming) - { + 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) @@ -219,6 +221,8 @@ public class VolumeControl : Object 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 */ @@ -229,9 +233,9 @@ public class VolumeControl : Object } return message; - } + } - private void update_active_sink_input (uint32 index) + 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; @@ -239,8 +243,21 @@ public class VolumeControl : Object 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 = _pconn.call_sync ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry", + 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); @@ -255,49 +272,36 @@ public class VolumeControl : Object } catch (GLib.Error e) { warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message); } - - /* Listen for role volume changes from pulse itself (external clients) */ - try { - var builder = new VariantBuilder (new VariantType ("ao")); - builder.add ("o", sink_input_objp); - - _pconn.call_sync ("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); - } } } - private void add_sink_input_into_list (SinkInputInfo i) + 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 = i.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE); + var role = sink_input.proplist.gets (PulseAudio.Proplist.PROP_MEDIA_ROLE); if (role != null && role in _valid_roles) { - if (i.corked == 0 || role == "phone") { - _sink_input_list.insert (0, i.index); + if (sink_input.corked == 0 || role == "phone") { + _sink_input_list.insert (0, sink_input.index); switch (role) { case "multimedia": - _sink_input_hash.set (i.index, _objp_role_multimedia); + _sink_input_hash.set (sink_input.index, _objp_role_multimedia); break; case "alert": - _sink_input_hash.set (i.index, _objp_role_alert); + _sink_input_hash.set (sink_input.index, _objp_role_alert); break; case "alarm": - _sink_input_hash.set (i.index, _objp_role_alarm); + _sink_input_hash.set (sink_input.index, _objp_role_alarm); break; case "phone": - _sink_input_hash.set (i.index, _objp_role_phone); + _sink_input_hash.set (sink_input.index, _objp_role_phone); break; } /* 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 (i.index); + update_active_sink_input.begin (sink_input.index); } } } @@ -309,9 +313,9 @@ public class VolumeControl : Object _sink_input_hash.unset (index); if (index == _active_sink_input) { if (_sink_input_list.size != 0) - update_active_sink_input (_sink_input_list.get (0)); + update_active_sink_input.begin (_sink_input_list.get (0)); else - update_active_sink_input (-1); + update_active_sink_input.begin (-1); } } } @@ -503,11 +507,16 @@ public class VolumeControl : Object context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb); } + /* This call can be async once we are sure we are not allowing multiple set volume calls + * in sequence (with a minimal volume delta, not with steps), as this can cause issues + * when handling the volume updated signal from PulseAudio (_volume can get set before + * the signal from a previous set gets handled at pulse_dbus_filter, generating an extra + * volume_updated signal) */ private void set_volume_active_role () { string active_role_objp = _objp_role_alert; - if (_active_sink_input != -1) + if (_active_sink_input != -1 && _active_sink_input in _sink_input_list) active_role_objp = _sink_input_hash.get (_active_sink_input); try { @@ -519,7 +528,6 @@ public class VolumeControl : Object active_role_objp, "org.freedesktop.DBus.Properties", "Set", new Variant ("(ssv)", "org.PulseAudio.Ext.StreamRestore1.RestoreEntry", "Volume", volume), null, DBusCallFlags.NONE, -1); - volume_changed (_volume); } catch (GLib.Error e) { warning ("unable to set volume for stream obj path %s (%s)", active_role_objp, e.message); @@ -638,7 +646,7 @@ public class VolumeControl : Object 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 (-1); + update_active_sink_input.begin (-1); _pulse_use_stream_restore = true; } } -- cgit v1.2.3 From 63ca813774ae6856c855397f999d2677b7408a9d Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Wed, 1 Oct 2014 00:40:44 -0300 Subject: Using a signal counter so we can set the volume asynchronously --- src/volume-control.vala | 58 +++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/volume-control.vala b/src/volume-control.vala index 9f31d67..7f8b55b 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -57,6 +57,7 @@ public class VolumeControl : Object 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; private DBusProxy _user_proxy; private GreeterListInterface _greeter_proxy; @@ -214,20 +215,30 @@ public class VolumeControl : Object active_role_objp = _sink_input_hash.get (_active_sink_input); if (message.get_path () == active_role_objp && message.get_member () == "VolumeUpdated") { - /* 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); + 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--; + } - 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); - volume_changed (_volume); + /* 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); + volume_changed (_volume); + } } } } @@ -507,12 +518,7 @@ public class VolumeControl : Object context.get_sink_info_by_name (i.default_sink_name, sink_info_set_volume_cb); } - /* This call can be async once we are sure we are not allowing multiple set volume calls - * in sequence (with a minimal volume delta, not with steps), as this can cause issues - * when handling the volume updated signal from PulseAudio (_volume can get set before - * the signal from a previous set gets handled at pulse_dbus_filter, generating an extra - * volume_updated signal) */ - private void set_volume_active_role () + private async void set_volume_active_role () { string active_role_objp = _objp_role_alert; @@ -524,12 +530,21 @@ public class VolumeControl : Object builder.add ("(uu)", 0, double_to_volume (_volume)); Variant volume = builder.end (); - _pconn.call_sync ("org.PulseAudio.Ext.StreamRestore1.RestoreEntry", + /* 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); + volume_changed (_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); } } @@ -541,7 +556,7 @@ public class VolumeControl : Object if (_volume != volume) { _volume = volume; if (_pulse_use_stream_restore) - set_volume_active_role (); + set_volume_active_role.begin (); else context.get_server_info (server_info_cb_for_set_volume); return true; @@ -597,6 +612,7 @@ public class VolumeControl : Object /* 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; -- cgit v1.2.3