ckaczor/WorkIndicator
1
0
Fork 0
mirror of https://github.com/ckaczor/WorkIndicator.git synced 2026-01-13 17:23:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle multiple microphones/sessions better

Browse Source
This commit is contained in:
Chris Kaczor
2021-04-28 11:54:36 -04:00
parent e1ca9f67ac
commit c284b92e16
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
AudioWatcher.cs
View File

@@ -1,6 +1,7 @@
using CSCore.CoreAudioAPI; using CSCore.CoreAudioAPI;
using System; using System;
using System.Diagnostics; using System.Collections.Generic;
using System.Linq;
using System.Threading; using System.Threading;
namespace WorkIndicator namespace WorkIndicator
@@ -11,7 +12,7 @@ namespace WorkIndicator
private static ManualResetEvent _manualResetEvent; private static ManualResetEvent _manualResetEvent;
private static int _activeSessionCount; private static readonly Dictionary<string, int> ActiveSessions = new Dictionary<string, int>();
public static event MicrophoneInUseChangedDelegate MicrophoneInUseChanged; public static event MicrophoneInUseChangedDelegate MicrophoneInUseChanged;
@@ -29,13 +30,11 @@ namespace WorkIndicator
var sessionEnumerator = sessionManager.GetSessionEnumerator(); var sessionEnumerator = sessionManager.GetSessionEnumerator();
sessionManager.SessionCreated += HandleAudioSessionCreated; sessionManager.SessionCreated += (sessionSender, sessionCreatedEventArgs) => HandleDeviceSession(device, sessionCreatedEventArgs.NewSession);
foreach (var audioSessionControl in sessionEnumerator) foreach (var audioSessionControl in sessionEnumerator)
{ {
HandleAudioStateChanged(audioSessionControl, new AudioSessionStateChangedEventArgs(audioSessionControl.SessionState)); HandleDeviceSession(device, audioSessionControl);
audioSessionControl.StateChanged += HandleAudioStateChanged;
} }
} }
@@ -46,29 +45,34 @@ namespace WorkIndicator
thread.Start(); thread.Start();
} }
private static void HandleDeviceSession(MMDevice device, AudioSessionControl audioSessionControl)
{
var deviceId = device.DeviceID + audioSessionControl.GroupingParam;
if (!ActiveSessions.ContainsKey(deviceId))
ActiveSessions[deviceId] = 0;
HandleAudioStateChanged(deviceId, audioSessionControl.SessionState);
audioSessionControl.StateChanged += (sender, sessionStateChangedEventArgs) =>
HandleAudioStateChanged(deviceId, sessionStateChangedEventArgs.NewState);
}
public static void Stop() public static void Stop()
{ {
_manualResetEvent?.Set(); _manualResetEvent?.Set();
} }
private static void HandleAudioSessionCreated(object sender, SessionCreatedEventArgs e) private static void HandleAudioStateChanged(string deviceId, AudioSessionState newState)
{ {
HandleAudioStateChanged(null, new AudioSessionStateChangedEventArgs(e.NewSession.SessionState)); switch (newState)
e.NewSession.StateChanged += HandleAudioStateChanged;
}
private static void HandleAudioStateChanged(object sender, AudioSessionStateChangedEventArgs e)
{
Debug.WriteLine($"{e.NewState}");
switch (e.NewState)
{ {
case AudioSessionState.AudioSessionStateActive: case AudioSessionState.AudioSessionStateActive:
_activeSessionCount++; ActiveSessions[deviceId]++;
break; break;
case AudioSessionState.AudioSessionStateInactive: case AudioSessionState.AudioSessionStateInactive:
_activeSessionCount--; if (ActiveSessions[deviceId] > 0)
ActiveSessions[deviceId]--;
break; break;
case AudioSessionState.AudioSessionStateExpired: case AudioSessionState.AudioSessionStateExpired:
break; break;
@@ -76,17 +80,12 @@ namespace WorkIndicator
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
if (_activeSessionCount < 0)
_activeSessionCount = 0;
Debug.WriteLine($"{_activeSessionCount}");
MicrophoneInUseChanged?.Invoke(MicrophoneInUse()); MicrophoneInUseChanged?.Invoke(MicrophoneInUse());
} }
public static bool MicrophoneInUse() public static bool MicrophoneInUse()
{ {
return _activeSessionCount > 0; return ActiveSessions.Any(a => a.Value > 0);
} }
} }
} }