From 2a6cae12898e132e9c50973999d85b0e80a33f4a Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Thu, 3 Mar 2016 16:13:56 +0100 Subject: Added is_external_mic function to check for an external microphone --- src/volume-control-pulse.vala | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala index 92f12a3..9d572a3 100644 --- a/src/volume-control-pulse.vala +++ b/src/volume-control-pulse.vala @@ -141,6 +141,19 @@ public class VolumeControlPulse : VolumeControl return ret_output; } + private bool is_external_mic (SourceInfo? sink) { + if (sink.active_port != null && + ( (sink.active_port.name.contains ("headphone") || + sink.active_port.name.contains ("headset") || + sink.active_port.name.contains ("mic") ) && + (!sink.active_port.name.contains ("internal") && + !sink.active_port.name.contains ("builtin")) )) { + return true; + } + return false; + } + + /* PulseAudio logic*/ private void context_events_cb (Context c, Context.SubscriptionEventType t, uint32 index) { @@ -232,12 +245,7 @@ public class VolumeControlPulse : VolumeControl if (i == null) return; - if (i.active_port != null && - ( (i.active_port.name.contains ("headphone") || - i.active_port.name.contains ("headset") || - i.active_port.name.contains ("mic") ) && - (!i.active_port.name.contains ("internal") && - !i.active_port.name.contains ("builtin")) )) { + if (is_external_mic (i)) { this.active_mic = true; _external_mic_detected = true; } else { -- cgit v1.2.3