Compare commits
No commits in common. "f94052e54b49285d3c59e9c1b74de6ee91b70d22" and "f9b23a62a36fa62d0e18784eb8f830b2fdad274e" have entirely different histories.
f94052e54b
...
f9b23a62a3
@ -1,51 +1,33 @@
|
||||
using FocusVolumeControl.AudioSessions;
|
||||
using CoreAudio;
|
||||
using FocusVolumeControl.AudioSessions;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace FocusVolumeControl;
|
||||
|
||||
public class AudioHelper
|
||||
{
|
||||
static object _lock = new object();
|
||||
IAudioSession _current;
|
||||
List<Process> _currentProcesses;
|
||||
|
||||
public IAudioSession Current { get; private set; }
|
||||
|
||||
public void ResetCache()
|
||||
{
|
||||
lock (_lock)
|
||||
{
|
||||
Current = null;
|
||||
}
|
||||
}
|
||||
|
||||
public IAudioSession FindSession(List<Process> processes)
|
||||
{
|
||||
var deviceEnumerator = (CoreAudio)new MMDeviceEnumerator();
|
||||
var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
|
||||
|
||||
deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia, out var device);
|
||||
using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||
using var manager = device.AudioSessionManager2;
|
||||
|
||||
Guid iid = typeof(IAudioSessionManager2).GUID;
|
||||
device.Activate(ref iid, 0, IntPtr.Zero, out var m);
|
||||
var manager = (IAudioSessionManager2)m;
|
||||
var sessions = manager.Sessions;
|
||||
|
||||
var matchingSession = new ActiveAudioSessionWrapper();
|
||||
|
||||
manager.GetSessionEnumerator(out var sessionEnumerator);
|
||||
|
||||
var results = new ActiveAudioSessionWrapper();
|
||||
|
||||
sessionEnumerator.GetCount(out var count);
|
||||
for (int i = 0; i < count; i++)
|
||||
foreach (var session in sessions)
|
||||
{
|
||||
sessionEnumerator.GetSession(i, out var session);
|
||||
var audioProcess = Process.GetProcessById((int)session.ProcessID);
|
||||
|
||||
session.GetProcessId(out var sessionProcessId);
|
||||
var audioProcess = Process.GetProcessById(sessionProcessId);
|
||||
|
||||
if (processes.Any(x => x.Id == sessionProcessId || x.ProcessName == audioProcess?.ProcessName))
|
||||
if (processes.Any(x => x.Id == session.ProcessID || x.ProcessName == audioProcess?.ProcessName))
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -54,24 +36,31 @@ public class AudioHelper
|
||||
{
|
||||
displayName = audioProcess.ProcessName;
|
||||
}
|
||||
results.DisplayName = displayName;
|
||||
matchingSession.DisplayName = displayName;
|
||||
}
|
||||
catch
|
||||
{
|
||||
results.DisplayName ??= audioProcess.ProcessName;
|
||||
matchingSession.DisplayName ??= audioProcess.ProcessName;
|
||||
}
|
||||
|
||||
results.ExecutablePath ??= audioProcess.MainModule.FileName;
|
||||
matchingSession.ExecutablePath ??= audioProcess.MainModule.FileName;
|
||||
|
||||
//some apps like discord have multiple volume processes.
|
||||
results.AddSession(session);
|
||||
|
||||
matchingSession.AddVolume(session.SimpleAudioVolume);
|
||||
}
|
||||
}
|
||||
|
||||
return results.Any() ? results : null;
|
||||
return matchingSession.Any() ? matchingSession : null;
|
||||
}
|
||||
|
||||
static object _lock = new object();
|
||||
|
||||
public void ResetCache()
|
||||
{
|
||||
lock(_lock)
|
||||
{
|
||||
_current = null;
|
||||
}
|
||||
}
|
||||
|
||||
public IAudioSession GetActiveSession(FallbackBehavior fallbackBehavior)
|
||||
{
|
||||
@ -81,23 +70,23 @@ public class AudioHelper
|
||||
|
||||
if (_currentProcesses == null || !_currentProcesses.SequenceEqual(processes))
|
||||
{
|
||||
Current = FindSession(processes);
|
||||
_current = FindSession(processes);
|
||||
}
|
||||
|
||||
if (Current == null)
|
||||
if(_current == null)
|
||||
{
|
||||
if (fallbackBehavior == FallbackBehavior.SystemSounds && Current is not SystemSoundsAudioSession)
|
||||
if(fallbackBehavior == FallbackBehavior.SystemSounds && _current is not SystemSoundsAudioSession)
|
||||
{
|
||||
Current = GetSystemSounds();
|
||||
_current = GetSystemSounds();
|
||||
}
|
||||
else if (fallbackBehavior == FallbackBehavior.SystemVolume && Current is not SystemVolumeAudioSession)
|
||||
else if(fallbackBehavior == FallbackBehavior.SystemVolume && _current is not SystemVolumeAudioSession)
|
||||
{
|
||||
Current = GetSystemVolume();
|
||||
_current = GetSystemVolume();
|
||||
}
|
||||
}
|
||||
|
||||
_currentProcesses = processes;
|
||||
return Current;
|
||||
return _current;
|
||||
}
|
||||
}
|
||||
|
||||
@ -137,16 +126,6 @@ public class AudioHelper
|
||||
|
||||
try
|
||||
{
|
||||
//note. in instances where you launch a game from steam. this ends up mapping the process to both steam and to the game. which is unfortunate
|
||||
//The problem is that if you don't use the parent processes, then the actual steam window won't get recognized. But if you do, then games will map to steam.
|
||||
//
|
||||
//Additionally, I group all audio processes that match instead of just the most specific, or the first, etc. Because Discord uses two processes, one for voice chat, and one for discord sounds.
|
||||
//
|
||||
//Steam and Discord are both very common, and end up butting heads in the algorithm.
|
||||
//And I'm not overly fond of programming in special cases
|
||||
//so for the time being, the only down side i've found for including the parent process is that when you launch a game from steam and change the volume, you also change steam's volume. but that really only impacts videos on steam store pages
|
||||
//The icon is also often steam's icon instead of the games'.
|
||||
//But i'm striving for functional before perfection.
|
||||
var blah = ParentProcessUtilities.GetParentProcess(pid);
|
||||
if (blah != null && blah.ProcessName != "explorer" && blah.ProcessName != "svchost")
|
||||
{
|
||||
@ -163,65 +142,47 @@ public class AudioHelper
|
||||
|
||||
public void ResetAll()
|
||||
{
|
||||
var deviceEnumerator = (CoreAudio)new MMDeviceEnumerator();
|
||||
|
||||
deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia, out var device);
|
||||
|
||||
Guid iid = typeof(IAudioSessionManager2).GUID;
|
||||
device.Activate(ref iid, 0, IntPtr.Zero, out var m);
|
||||
var manager = (IAudioSessionManager2)m;
|
||||
|
||||
|
||||
manager.GetSessionEnumerator(out var sessionEnumerator);
|
||||
|
||||
sessionEnumerator.GetCount(out var count);
|
||||
for (int i = 0; i < count; i++)
|
||||
try
|
||||
{
|
||||
sessionEnumerator.GetSession(i, out var session);
|
||||
var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
|
||||
|
||||
var volume = (ISimpleAudioVolume)session;
|
||||
var guid = Guid.Empty;
|
||||
volume.SetMasterVolume(1, ref guid);
|
||||
volume.SetMute(false, ref guid);
|
||||
using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||
using var manager = device.AudioSessionManager2;
|
||||
|
||||
foreach (var session in manager.Sessions)
|
||||
{
|
||||
session.SimpleAudioVolume.MasterVolume = 1;
|
||||
session.SimpleAudioVolume.Mute = false;
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
}
|
||||
|
||||
public IAudioSession GetSystemSounds()
|
||||
{
|
||||
var deviceEnumerator = (CoreAudio)new MMDeviceEnumerator();
|
||||
var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
|
||||
|
||||
deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia, out var device);
|
||||
using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||
using var manager = device.AudioSessionManager2;
|
||||
|
||||
Guid iid = typeof(IAudioSessionManager2).GUID;
|
||||
device.Activate(ref iid, 0, IntPtr.Zero, out var m);
|
||||
var manager = (IAudioSessionManager2)m;
|
||||
var sessions = manager.Sessions;
|
||||
|
||||
|
||||
manager.GetSessionEnumerator(out var sessionEnumerator);
|
||||
|
||||
sessionEnumerator.GetCount(out var count);
|
||||
for (int i = 0; i < count; i++)
|
||||
foreach (var session in sessions)
|
||||
{
|
||||
sessionEnumerator.GetSession(i, out var session);
|
||||
|
||||
if (session.IsSystemSoundsSession() == 0)
|
||||
if (session.IsSystemSoundsSession)
|
||||
{
|
||||
return new SystemSoundsAudioSession(session);
|
||||
return new SystemSoundsAudioSession(session.SimpleAudioVolume);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
public IAudioSession GetSystemVolume()
|
||||
{
|
||||
var deviceEnumerator = (CoreAudio)new MMDeviceEnumerator();
|
||||
var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
|
||||
|
||||
deviceEnumerator.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eMultimedia, out var device);
|
||||
|
||||
Guid iid = typeof(IAudioEndpointVolume).GUID;
|
||||
device.Activate(ref iid, 0, IntPtr.Zero, out var o);
|
||||
var endpointVolume = (IAudioEndpointVolume)o;
|
||||
|
||||
return new SystemVolumeAudioSession(endpointVolume);
|
||||
using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||
return new SystemVolumeAudioSession(device.AudioEndpointVolume);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
using System;
|
||||
using CoreAudio;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using BarRaider.SdTools;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
public sealed class ActiveAudioSessionWrapper : IAudioSession
|
||||
public class ActiveAudioSessionWrapper : IAudioSession
|
||||
{
|
||||
public string DisplayName { get; set; }
|
||||
public string ExecutablePath { get; set; }
|
||||
private List<IAudioSessionControl2> Sessions { get; } = new List<IAudioSessionControl2>();
|
||||
private IEnumerable<ISimpleAudioVolume> Volume => Sessions.Cast<ISimpleAudioVolume>();
|
||||
private List<SimpleAudioVolume> Volume { get; } = new List<SimpleAudioVolume>();
|
||||
|
||||
string _icon;
|
||||
|
||||
@ -37,11 +36,11 @@ public sealed class ActiveAudioSessionWrapper : IAudioSession
|
||||
{
|
||||
return Volume.Any();
|
||||
}
|
||||
public int Count => Sessions.Count;
|
||||
public int Count => Volume.Count;
|
||||
|
||||
public void AddSession(IAudioSessionControl2 session)
|
||||
public void AddVolume(SimpleAudioVolume volume)
|
||||
{
|
||||
Sessions.Add(session);
|
||||
Volume.Add(volume);
|
||||
}
|
||||
|
||||
public void ToggleMute()
|
||||
@ -52,52 +51,28 @@ public sealed class ActiveAudioSessionWrapper : IAudioSession
|
||||
//when any volumes are unmuted, Volume.All will return false
|
||||
//so we set muted to true (opposite of Volume.All)
|
||||
|
||||
var muted = IsMuted();
|
||||
var muted = Volume.All(x => x.Mute);
|
||||
|
||||
foreach(var v in Volume)
|
||||
{
|
||||
var guid = Guid.Empty;
|
||||
v.SetMute(!muted, ref guid);
|
||||
}
|
||||
Volume.ForEach(x => x.Mute = !muted);
|
||||
}
|
||||
|
||||
public bool IsMuted()
|
||||
{
|
||||
return Volume.All(x =>
|
||||
{
|
||||
x.GetMute(out var mute);
|
||||
return mute;
|
||||
});
|
||||
return Volume.All(x => x.Mute);
|
||||
}
|
||||
|
||||
public void IncrementVolumeLevel(int step, int ticks)
|
||||
{
|
||||
//if you have more than one volume. they will all get set based on the first volume control
|
||||
var volume = Volume.FirstOrDefault();
|
||||
var level = 0f;
|
||||
if (volume != null)
|
||||
{
|
||||
volume.GetMasterVolume(out level);
|
||||
}
|
||||
|
||||
var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
|
||||
level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
|
||||
|
||||
foreach(var v in Volume)
|
||||
{
|
||||
var guid = Guid.Empty;
|
||||
v.SetMasterVolume(level, ref guid);
|
||||
}
|
||||
Volume.ForEach(x => x.MasterVolume = level);
|
||||
}
|
||||
|
||||
public int GetVolumeLevel()
|
||||
{
|
||||
var volume = Volume.FirstOrDefault();
|
||||
var level = 0f;
|
||||
if(volume != null)
|
||||
{
|
||||
volume.GetMasterVolume(out level);
|
||||
}
|
||||
|
||||
var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
|
||||
return VolumeHelpers.GetVolumePercentage(level);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,306 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
|
||||
[ComImport]
|
||||
[Guid("BCDE0395-E52F-467C-8E3D-C4579291692E")]
|
||||
internal class MMDeviceEnumerator
|
||||
{
|
||||
}
|
||||
|
||||
internal enum EDataFlow
|
||||
{
|
||||
eRender,
|
||||
eCapture,
|
||||
eAll,
|
||||
EDataFlow_enum_count
|
||||
}
|
||||
|
||||
internal enum ERole
|
||||
{
|
||||
eConsole,
|
||||
eMultimedia,
|
||||
eCommunications,
|
||||
ERole_enum_count
|
||||
}
|
||||
|
||||
[Guid("A95664D2-9614-4F35-A746-DE8DB63617E6"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
internal interface CoreAudio
|
||||
{
|
||||
int NotImpl1();
|
||||
|
||||
[PreserveSig]
|
||||
int GetDefaultAudioEndpoint(EDataFlow dataFlow, ERole role, out IMMDevice ppDevice);
|
||||
}
|
||||
|
||||
[Guid("D666063F-1587-4E43-81F1-B948E807363F"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
internal interface IMMDevice
|
||||
{
|
||||
[PreserveSig]
|
||||
int Activate(ref Guid iid, int dwClsCtx, IntPtr pActivationParams, [MarshalAs(UnmanagedType.IUnknown)] out object ppInterface);
|
||||
}
|
||||
|
||||
[Guid("77AA99A0-1BD6-484F-8BC7-2C654C9A9B6F"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
internal interface IAudioSessionManager2
|
||||
{
|
||||
int NotImpl1();
|
||||
int NotImpl2();
|
||||
|
||||
[PreserveSig]
|
||||
int GetSessionEnumerator(out IAudioSessionEnumerator SessionEnum);
|
||||
}
|
||||
|
||||
[Guid("E2F5BB11-0570-40CA-ACDD-3AA01277DEE8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
internal interface IAudioSessionEnumerator
|
||||
{
|
||||
[PreserveSig]
|
||||
int GetCount(out int SessionCount);
|
||||
|
||||
[PreserveSig]
|
||||
int GetSession(int SessionCount, out IAudioSessionControl2 Session);
|
||||
}
|
||||
|
||||
[Guid("87CE5498-68D6-44E5-9215-6DA47EF883D8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
internal interface ISimpleAudioVolume
|
||||
{
|
||||
[PreserveSig]
|
||||
int SetMasterVolume(float fLevel, ref Guid EventContext);
|
||||
|
||||
[PreserveSig]
|
||||
int GetMasterVolume(out float pfLevel);
|
||||
|
||||
[PreserveSig]
|
||||
int SetMute(bool bMute, ref Guid EventContext);
|
||||
|
||||
[PreserveSig]
|
||||
int GetMute(out bool pbMute);
|
||||
}
|
||||
|
||||
[Guid("bfb7ff88-7239-4fc9-8fa2-07c950be9c6d"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
public interface IAudioSessionControl2
|
||||
{
|
||||
// IAudioSessionControl
|
||||
[PreserveSig]
|
||||
int NotImpl0();
|
||||
|
||||
[PreserveSig]
|
||||
int GetDisplayName([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int SetDisplayName([MarshalAs(UnmanagedType.LPWStr)] string Value, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
|
||||
|
||||
[PreserveSig]
|
||||
int GetIconPath([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int SetIconPath([MarshalAs(UnmanagedType.LPWStr)] string Value, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
|
||||
|
||||
[PreserveSig]
|
||||
int GetGroupingParam(out Guid pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int SetGroupingParam([MarshalAs(UnmanagedType.LPStruct)] Guid Override, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
|
||||
|
||||
[PreserveSig]
|
||||
int NotImpl1();
|
||||
|
||||
[PreserveSig]
|
||||
int NotImpl2();
|
||||
|
||||
// IAudioSessionControl2
|
||||
[PreserveSig]
|
||||
int GetSessionIdentifier([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int GetSessionInstanceIdentifier([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int GetProcessId(out int pRetVal);
|
||||
|
||||
[PreserveSig]
|
||||
int IsSystemSoundsSession();
|
||||
|
||||
[PreserveSig]
|
||||
int SetDuckingPreference(bool optOut);
|
||||
}
|
||||
|
||||
// http://netcoreaudio.codeplex.com/SourceControl/latest#trunk/Code/CoreAudio/Interfaces/IAudioEndpointVolume.cs
|
||||
[Guid("5CDF2C82-841E-4546-9722-0CF74078229A"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
|
||||
public interface IAudioEndpointVolume
|
||||
{
|
||||
[PreserveSig]
|
||||
int NotImpl1();
|
||||
|
||||
[PreserveSig]
|
||||
int NotImpl2();
|
||||
|
||||
/// <summary>
|
||||
/// Gets a count of the channels in the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="channelCount">The number of channels.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetChannelCount(
|
||||
[Out][MarshalAs(UnmanagedType.U4)] out UInt32 channelCount);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the master volume level of the audio stream, in decibels.
|
||||
/// </summary>
|
||||
/// <param name="level">The new master volume level in decibels.</param>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int SetMasterVolumeLevel(
|
||||
[In][MarshalAs(UnmanagedType.R4)] float level,
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the master volume level, expressed as a normalized, audio-tapered value.
|
||||
/// </summary>
|
||||
/// <param name="level">The new master volume level expressed as a normalized value between 0.0 and 1.0.</param>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int SetMasterVolumeLevelScalar(
|
||||
[In][MarshalAs(UnmanagedType.R4)] float level,
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the master volume level of the audio stream, in decibels.
|
||||
/// </summary>
|
||||
/// <param name="level">The volume level in decibels.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetMasterVolumeLevel(
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float level);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the master volume level, expressed as a normalized, audio-tapered value.
|
||||
/// </summary>
|
||||
/// <param name="level">The volume level expressed as a normalized value between 0.0 and 1.0.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetMasterVolumeLevelScalar(
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float level);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the volume level, in decibels, of the specified channel of the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="channelNumber">The channel number.</param>
|
||||
/// <param name="level">The new volume level in decibels.</param>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int SetChannelVolumeLevel(
|
||||
[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
|
||||
[In][MarshalAs(UnmanagedType.R4)] float level,
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the normalized, audio-tapered volume level of the specified channel in the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="channelNumber">The channel number.</param>
|
||||
/// <param name="level">The new master volume level expressed as a normalized value between 0.0 and 1.0.</param>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int SetChannelVolumeLevelScalar(
|
||||
[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
|
||||
[In][MarshalAs(UnmanagedType.R4)] float level,
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the volume level, in decibels, of the specified channel in the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="channelNumber">The zero-based channel number.</param>
|
||||
/// <param name="level">The volume level in decibels.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetChannelVolumeLevel(
|
||||
[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float level);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the normalized, audio-tapered volume level of the specified channel of the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="channelNumber">The zero-based channel number.</param>
|
||||
/// <param name="level">The volume level expressed as a normalized value between 0.0 and 1.0.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetChannelVolumeLevelScalar(
|
||||
[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float level);
|
||||
|
||||
/// <summary>
|
||||
/// Sets the muting state of the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="isMuted">True to mute the stream, or false to unmute the stream.</param>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int SetMute(
|
||||
[In][MarshalAs(UnmanagedType.Bool)] Boolean isMuted,
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the muting state of the audio stream.
|
||||
/// </summary>
|
||||
/// <param name="isMuted">The muting state. True if the stream is muted, false otherwise.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetMute(
|
||||
[Out][MarshalAs(UnmanagedType.Bool)] out Boolean isMuted);
|
||||
|
||||
/// <summary>
|
||||
/// Gets information about the current step in the volume range.
|
||||
/// </summary>
|
||||
/// <param name="step">The current zero-based step index.</param>
|
||||
/// <param name="stepCount">The total number of steps in the volume range.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetVolumeStepInfo(
|
||||
[Out][MarshalAs(UnmanagedType.U4)] out UInt32 step,
|
||||
[Out][MarshalAs(UnmanagedType.U4)] out UInt32 stepCount);
|
||||
|
||||
/// <summary>
|
||||
/// Increases the volume level by one step.
|
||||
/// </summary>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int VolumeStepUp(
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Decreases the volume level by one step.
|
||||
/// </summary>
|
||||
/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int VolumeStepDown(
|
||||
[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
|
||||
|
||||
/// <summary>
|
||||
/// Queries the audio endpoint device for its hardware-supported functions.
|
||||
/// </summary>
|
||||
/// <param name="hardwareSupportMask">A hardware support mask that indicates the capabilities of the endpoint.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int QueryHardwareSupport(
|
||||
[Out][MarshalAs(UnmanagedType.U4)] out UInt32 hardwareSupportMask);
|
||||
|
||||
/// <summary>
|
||||
/// Gets the volume range of the audio stream, in decibels.
|
||||
/// </summary>
|
||||
/// <param name="volumeMin">The minimum volume level in decibels.</param>
|
||||
/// <param name="volumeMax">The maximum volume level in decibels.</param>
|
||||
/// <param name="volumeStep">The volume increment level in decibels.</param>
|
||||
/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
|
||||
[PreserveSig]
|
||||
int GetVolumeRange(
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float volumeMin,
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float volumeMax,
|
||||
[Out][MarshalAs(UnmanagedType.R4)] out float volumeStep);
|
||||
}
|
||||
@ -1,6 +1,4 @@
|
||||
using System;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
public interface IAudioSession
|
||||
{
|
||||
|
||||
@ -1,46 +1,33 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using CoreAudio;
|
||||
using System;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
internal sealed class SystemSoundsAudioSession : IAudioSession
|
||||
internal class SystemSoundsAudioSession : IAudioSession
|
||||
{
|
||||
public SystemSoundsAudioSession(IAudioSessionControl2 sessionControl)
|
||||
public SystemSoundsAudioSession(SimpleAudioVolume volumeControl)
|
||||
{
|
||||
_sessionControl = sessionControl;
|
||||
_volumeControl = (ISimpleAudioVolume)sessionControl;
|
||||
_volumeControl = volumeControl;
|
||||
}
|
||||
|
||||
IAudioSessionControl2 _sessionControl;
|
||||
ISimpleAudioVolume _volumeControl;
|
||||
SimpleAudioVolume _volumeControl;
|
||||
|
||||
public string DisplayName => "System sounds";
|
||||
public string GetIcon() => "Images/systemSounds";
|
||||
|
||||
public void ToggleMute()
|
||||
{
|
||||
var guid = Guid.Empty;
|
||||
_volumeControl.SetMute(!IsMuted(), ref guid);
|
||||
_volumeControl.Mute = !_volumeControl.Mute;
|
||||
}
|
||||
|
||||
public bool IsMuted()
|
||||
{
|
||||
_volumeControl.GetMute(out var mute);
|
||||
return mute;
|
||||
}
|
||||
public bool IsMuted() => _volumeControl.Mute;
|
||||
|
||||
public void IncrementVolumeLevel(int step, int ticks)
|
||||
{
|
||||
_volumeControl.GetMasterVolume(out var level);
|
||||
level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
|
||||
|
||||
var guid = Guid.Empty;
|
||||
_volumeControl.SetMasterVolume(level, ref guid);
|
||||
var level = VolumeHelpers.GetAdjustedVolume(_volumeControl.MasterVolume, step, ticks);
|
||||
_volumeControl.MasterVolume = level;
|
||||
}
|
||||
|
||||
public int GetVolumeLevel()
|
||||
{
|
||||
_volumeControl.GetMasterVolume(out var level);
|
||||
return VolumeHelpers.GetVolumePercentage(level);
|
||||
}
|
||||
public int GetVolumeLevel() => VolumeHelpers.GetVolumePercentage(_volumeControl.MasterVolume);
|
||||
|
||||
}
|
||||
|
||||
@ -1,41 +1,33 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using CoreAudio;
|
||||
using System;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
internal sealed class SystemVolumeAudioSession : IAudioSession
|
||||
internal class SystemVolumeAudioSession : IAudioSession
|
||||
{
|
||||
public SystemVolumeAudioSession(IAudioEndpointVolume volumeControl)
|
||||
public SystemVolumeAudioSession(AudioEndpointVolume volumeControl)
|
||||
{
|
||||
_volumeControl = volumeControl;
|
||||
}
|
||||
|
||||
IAudioEndpointVolume _volumeControl;
|
||||
AudioEndpointVolume _volumeControl;
|
||||
|
||||
public string DisplayName => "System Volume";
|
||||
public string GetIcon() => "Images/encoderIcon";
|
||||
|
||||
public void ToggleMute()
|
||||
{
|
||||
_volumeControl.SetMute(!IsMuted(), Guid.Empty);
|
||||
_volumeControl.Mute = !_volumeControl.Mute;
|
||||
}
|
||||
|
||||
public bool IsMuted()
|
||||
{
|
||||
_volumeControl.GetMute(out var mute);
|
||||
return mute;
|
||||
}
|
||||
public bool IsMuted() => _volumeControl.Mute;
|
||||
|
||||
public void IncrementVolumeLevel(int step, int ticks)
|
||||
{
|
||||
_volumeControl.GetMasterVolumeLevelScalar(out var level);
|
||||
level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
|
||||
_volumeControl.SetMasterVolumeLevelScalar(level, Guid.Empty);
|
||||
var level = VolumeHelpers.GetAdjustedVolume(_volumeControl.MasterVolumeLevelScalar, step, ticks);
|
||||
_volumeControl.MasterVolumeLevelScalar = level;
|
||||
}
|
||||
|
||||
public int GetVolumeLevel()
|
||||
{
|
||||
_volumeControl.GetMasterVolumeLevelScalar(out var level);
|
||||
return VolumeHelpers.GetVolumePercentage(level);
|
||||
}
|
||||
public int GetVolumeLevel() => VolumeHelpers.GetVolumePercentage(_volumeControl.MasterVolumeLevelScalar);
|
||||
|
||||
}
|
||||
|
||||
@ -35,6 +35,7 @@ public class DialAction : EncoderBase
|
||||
IntPtr _foregroundWindowChangedEvent;
|
||||
Native.WinEventDelegate _delegate;
|
||||
|
||||
IAudioSession _currentAudioSession;
|
||||
AudioHelper _audioHelper = new AudioHelper();
|
||||
|
||||
Thread _thread;
|
||||
@ -47,7 +48,7 @@ public class DialAction : EncoderBase
|
||||
if (payload.Settings == null || payload.Settings.Count == 0)
|
||||
{
|
||||
settings = PluginSettings.CreateDefaultSettings();
|
||||
_ = SaveSettings();
|
||||
SaveSettings();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -68,8 +69,8 @@ public class DialAction : EncoderBase
|
||||
_thread.SetApartmentState(ApartmentState.STA);
|
||||
_thread.Start();
|
||||
|
||||
var session = _audioHelper.GetActiveSession(settings.FallbackBehavior);
|
||||
_ = UpdateStateIfNeeded(session);
|
||||
_currentAudioSession = settings.FallbackBehavior == FallbackBehavior.SystemSounds ? _audioHelper.GetSystemSounds() : _audioHelper.GetSystemVolume();
|
||||
_ = UpdateStateIfNeeded();
|
||||
}
|
||||
|
||||
public override void Dispose()
|
||||
@ -122,11 +123,10 @@ public class DialAction : EncoderBase
|
||||
{
|
||||
Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Rotate");
|
||||
//dial rotated. ticks positive for right, negative for left
|
||||
var activeSession = _audioHelper.Current;
|
||||
if (activeSession != null)
|
||||
if (_currentAudioSession != null)
|
||||
{
|
||||
activeSession.IncrementVolumeLevel(settings.StepSize, payload.Ticks);
|
||||
await UpdateStateIfNeeded(activeSession);
|
||||
_currentAudioSession.IncrementVolumeLevel(settings.StepSize, payload.Ticks);
|
||||
await UpdateStateIfNeeded();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -159,11 +159,10 @@ public class DialAction : EncoderBase
|
||||
{
|
||||
try
|
||||
{
|
||||
var activeSession = _audioHelper.Current;
|
||||
if (activeSession != null)
|
||||
if (_currentAudioSession != null)
|
||||
{
|
||||
activeSession.ToggleMute();
|
||||
await UpdateStateIfNeeded(activeSession);
|
||||
_currentAudioSession.ToggleMute();
|
||||
await UpdateStateIfNeeded();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -185,7 +184,12 @@ public class DialAction : EncoderBase
|
||||
//called once every 1000ms and can be used for updating the title/image of the key
|
||||
var activeSession = _audioHelper.GetActiveSession(settings.FallbackBehavior);
|
||||
|
||||
await UpdateStateIfNeeded(activeSession);
|
||||
if (activeSession != null)
|
||||
{
|
||||
_currentAudioSession = activeSession;
|
||||
}
|
||||
|
||||
await UpdateStateIfNeeded();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -194,14 +198,14 @@ public class DialAction : EncoderBase
|
||||
}
|
||||
}
|
||||
|
||||
private async Task UpdateStateIfNeeded(IAudioSession audioSession)
|
||||
private async Task UpdateStateIfNeeded()
|
||||
{
|
||||
try
|
||||
{
|
||||
if (audioSession != null)
|
||||
if (_currentAudioSession != null)
|
||||
{
|
||||
|
||||
var uiState = new UIState(audioSession);
|
||||
var uiState = new UIState(_currentAudioSession);
|
||||
|
||||
if (_previousState != null && uiState != null &&
|
||||
uiState.Title == _previousState.Title &&
|
||||
@ -237,7 +241,7 @@ public class DialAction : EncoderBase
|
||||
try
|
||||
{
|
||||
Tools.AutoPopulateSettings(settings, payload.Settings);
|
||||
_ = SaveSettings();
|
||||
SaveSettings();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
@ -56,7 +56,6 @@
|
||||
<ItemGroup>
|
||||
<Compile Include="AudioSessions\ActiveAudioSessionWrapper.cs" />
|
||||
<Compile Include="AudioHelper.cs" />
|
||||
<Compile Include="AudioSessions\CoreAudio.cs" />
|
||||
<Compile Include="AudioSessions\VolumeHelpers.cs" />
|
||||
<Compile Include="AudioSessions\SystemSoundsAudioSession.cs" />
|
||||
<Compile Include="AudioSessions\SystemVolumeAudioSession.cs" />
|
||||
@ -93,6 +92,9 @@
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CoreAudio">
|
||||
<Version>1.27.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="IsExternalInit">
|
||||
<Version>1.0.3</Version>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
"Name": "Focused Application Volume",
|
||||
"Description": "Control the volume of the focused application",
|
||||
"URL": "https://github.com/dlprows/FocusVolumeControl",
|
||||
"Version": "1.1.1",
|
||||
"Version": "1.1.0",
|
||||
"CodePath": "FocusVolumeControl",
|
||||
"Category": "Volume Control [dlprows]",
|
||||
"Icon": "Images/pluginIcon",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user