Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46fce20771 | ||
|
|
d28f421ea3 | ||
|
|
5aeefebc47 |
+9
-1
@@ -4,7 +4,6 @@ using Serilog;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Threading;
|
||||
|
||||
namespace WorkIndicator;
|
||||
|
||||
@@ -23,6 +22,9 @@ internal class AudioDevice : IAudioSessionEventsHandler
|
||||
_logger = Log.ForContext<AudioDevice>();
|
||||
|
||||
_friendlyName = device.DeviceFriendlyName;
|
||||
IsMuted = device.AudioEndpointVolume.Mute;
|
||||
|
||||
_logger.Information("AudioDevice: {name} {muted}", _friendlyName, IsMuted);
|
||||
|
||||
device.AudioEndpointVolume.OnVolumeNotification += AudioEndpointVolume_OnVolumeNotification;
|
||||
device.AudioSessionManager.AudioSessionControl.RegisterEventClient(this);
|
||||
@@ -40,6 +42,10 @@ internal class AudioDevice : IAudioSessionEventsHandler
|
||||
private void AudioEndpointVolume_OnVolumeNotification(AudioVolumeNotificationData data)
|
||||
{
|
||||
_logger.Information("AudioEndpointVolume_OnVolumeNotification: {name} {muted}", _friendlyName, data.Muted);
|
||||
|
||||
IsMuted = data.Muted;
|
||||
|
||||
AudioSessionsChanged?.Invoke();
|
||||
}
|
||||
|
||||
private void AudioSessionManager_OnSessionCreated(object sender, IAudioSessionControl newSession)
|
||||
@@ -63,6 +69,8 @@ internal class AudioDevice : IAudioSessionEventsHandler
|
||||
|
||||
public int ActiveSessionCount => _sessions.Values.Count(s => s.State == AudioSessionState.AudioSessionStateActive);
|
||||
|
||||
public bool IsMuted { get; private set; }
|
||||
|
||||
void IAudioSessionEventsHandler.OnVolumeChanged(float volume, bool isMuted)
|
||||
{
|
||||
_logger.Information("OnVolumeChanged: {name} {volume} {isMuted}", _friendlyName, volume, isMuted);
|
||||
|
||||
+20
-10
@@ -1,20 +1,26 @@
|
||||
using NAudio.CoreAudioApi;
|
||||
using NAudio.CoreAudioApi.Interfaces;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Serilog;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace WorkIndicator;
|
||||
|
||||
internal enum MicrophoneStatus
|
||||
{
|
||||
NotUsed,
|
||||
UsedMuted,
|
||||
UsedNotMuted
|
||||
}
|
||||
|
||||
internal class AudioWatcher : IMMNotificationClient
|
||||
{
|
||||
private readonly ILogger _logger = Log.ForContext<AudioWatcher>();
|
||||
private readonly MMDeviceEnumerator _deviceEnumerator = new();
|
||||
private readonly Dictionary<string, AudioDevice> _inputDevices = new();
|
||||
|
||||
public delegate void MicrophoneInUseChangedDelegate(bool microphoneInUse);
|
||||
public delegate void MicrophoneStatusChangedDelegate(MicrophoneStatus microphoneStatus);
|
||||
|
||||
public event MicrophoneInUseChangedDelegate MicrophoneInUseChanged;
|
||||
public event MicrophoneStatusChangedDelegate MicrophoneStatusChanged;
|
||||
|
||||
public void Start()
|
||||
{
|
||||
@@ -43,12 +49,12 @@ internal class AudioWatcher : IMMNotificationClient
|
||||
|
||||
_inputDevices[captureDevice.ID] = audioDevice;
|
||||
|
||||
MicrophoneInUseChanged?.Invoke(MicrophoneInUse());
|
||||
MicrophoneStatusChanged?.Invoke(GetMicrophoneStatus());
|
||||
}
|
||||
|
||||
private void AudioDevice_AudioSessionsChanged()
|
||||
{
|
||||
MicrophoneInUseChanged?.Invoke(MicrophoneInUse());
|
||||
MicrophoneStatusChanged?.Invoke(GetMicrophoneStatus());
|
||||
}
|
||||
|
||||
private void HandleRemovedDevice(string deviceId)
|
||||
@@ -57,7 +63,7 @@ internal class AudioWatcher : IMMNotificationClient
|
||||
|
||||
_inputDevices.Remove(deviceId);
|
||||
|
||||
MicrophoneInUseChanged?.Invoke(MicrophoneInUse());
|
||||
MicrophoneStatusChanged?.Invoke(GetMicrophoneStatus());
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
@@ -68,11 +74,15 @@ internal class AudioWatcher : IMMNotificationClient
|
||||
_deviceEnumerator.Dispose();
|
||||
}
|
||||
|
||||
public bool MicrophoneInUse()
|
||||
public MicrophoneStatus GetMicrophoneStatus()
|
||||
{
|
||||
var totalActiveSessionCount = _inputDevices.Sum(i => i.Value.ActiveSessionCount);
|
||||
foreach (var inputDevice in _inputDevices.Values)
|
||||
{
|
||||
if (inputDevice.ActiveSessionCount > 0)
|
||||
return inputDevice.IsMuted ? MicrophoneStatus.UsedMuted : MicrophoneStatus.UsedNotMuted;
|
||||
}
|
||||
|
||||
return totalActiveSessionCount > 0;
|
||||
return MicrophoneStatus.NotUsed;
|
||||
}
|
||||
|
||||
void IMMNotificationClient.OnDeviceStateChanged(string deviceId, DeviceState newState)
|
||||
|
||||
+6
-4
@@ -30,7 +30,7 @@ namespace WorkIndicator
|
||||
|
||||
Properties.Settings.Default.PropertyChanged += HandleSettingChange;
|
||||
|
||||
AudioWatcher.MicrophoneInUseChanged += AudioWatcher_MicrophoneInUseChanged;
|
||||
AudioWatcher.MicrophoneStatusChanged += AudioWatcher_MicrophoneStatusChanged;
|
||||
AudioWatcher.Start();
|
||||
|
||||
_initialized = true;
|
||||
@@ -50,7 +50,7 @@ namespace WorkIndicator
|
||||
UpdateLights();
|
||||
}
|
||||
|
||||
private static void AudioWatcher_MicrophoneInUseChanged(bool microphoneInUse)
|
||||
private static void AudioWatcher_MicrophoneStatusChanged(MicrophoneStatus microphoneStatus)
|
||||
{
|
||||
UpdateLights();
|
||||
}
|
||||
@@ -90,9 +90,11 @@ namespace WorkIndicator
|
||||
|
||||
if (status == Status.Auto)
|
||||
{
|
||||
if (AudioWatcher.MicrophoneInUse())
|
||||
var microphoneStatus = AudioWatcher.GetMicrophoneStatus();
|
||||
|
||||
if (microphoneStatus != MicrophoneStatus.NotUsed)
|
||||
{
|
||||
status = Status.OnPhone;
|
||||
status = microphoneStatus == MicrophoneStatus.UsedMuted ? Status.OnPhone : Status.Talking;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user