From 91b933c893d79f469a92d8431026b6629bad28d6 Mon Sep 17 00:00:00 2001 From: Xab3r Date: Mon, 20 Jun 2022 20:46:31 +0200 Subject: [PATCH] Migration to C#10 --- Sources/MicSwitch/App.xaml.cs | 30 ++---------- .../MainWindow/Models/GraphicsExtensions.cs | 1 - .../MainWindow/Models/ImageProvider.cs | 10 ---- .../ViewModels/HotkeyEditorViewModel.cs | 7 --- .../ViewModels/IHotkeyEditorViewModel.cs | 2 - .../ViewModels/IMainWindowViewModel.cs | 2 - .../ViewModels/IMicSwitchOverlayViewModel.cs | 1 - .../IMicrophoneControllerViewModel.cs | 4 -- .../ViewModels/MainWindowViewModel.cs | 44 +++++++---------- .../ViewModels/MicSwitchOverlayViewModel.cs | 11 ----- .../MicrophoneControllerViewModel.cs | 18 ------- .../MainWindow/Views/MainWindow.xaml.cs | 9 +--- Sources/MicSwitch/MicSwitch.csproj | 6 +-- .../MicSwitch/Modularity/MicSwitchConfig.cs | 6 +-- .../Modularity/MicSwitchHotkeyConfig.cs | 1 - .../Modularity/MicSwitchOverlayConfig.cs | 2 - Sources/MicSwitch/Properties/GlobalUsings.cs | 47 +++++++++++++++++++ .../Services/AllMicrophonesController.cs | 6 --- .../Services/ComplexHotkeyTracker.cs | 13 ----- .../Services/ComplexMicrophoneController.cs | 8 ---- .../Services/IComplexHotkeyTracker.cs | 2 - .../Services/IMicrophoneController.cs | 1 - .../MultimediaMicrophoneController.cs | 6 --- .../Services/WaveInAudioExEventArgs.cs | 1 - Submodules/PoeEye | 2 +- 25 files changed, 74 insertions(+), 166 deletions(-) create mode 100644 Sources/MicSwitch/Properties/GlobalUsings.cs diff --git a/Sources/MicSwitch/App.xaml.cs b/Sources/MicSwitch/App.xaml.cs index 4e8ce80..eb69c92 100644 --- a/Sources/MicSwitch/App.xaml.cs +++ b/Sources/MicSwitch/App.xaml.cs @@ -1,33 +1,13 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reactive.Concurrency; -using System.Reactive.Disposables; -using System.Reflection; +using System.Reflection; using System.Runtime.Versioning; -using System.Threading; -using System.Threading.Tasks; using System.Windows; using MicSwitch.MainWindow.Models; using MicSwitch.MainWindow.ViewModels; using MicSwitch.Modularity; using MicSwitch.Prism; using MicSwitch.Services; -using PoeShared; -using PoeShared.Modularity; -using PoeShared.Native; -using PoeShared.Native.Scaffolding; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using PoeShared.Services; -using PoeShared.Squirrel.Core; using PoeShared.Squirrel.Prism; using PoeShared.Squirrel.Updater; -using PoeShared.UI; -using PoeShared.Wpf.Scaffolding; -using ReactiveUI; -using Unity; using Unity.Resolution; namespace MicSwitch @@ -89,7 +69,7 @@ private void SingleInstanceValidationRoutine(bool retryIfAbandoned) } catch (AbandonedMutexException ex) { - Log.Debug($"Mutex is abandoned {mutexId} (retryIfAbandoned: {retryIfAbandoned})"); + Log.Debug($"Mutex is abandoned {mutexId} (retryIfAbandoned: {retryIfAbandoned})", ex); if (retryIfAbandoned) { SingleInstanceValidationRoutine(false); @@ -169,7 +149,7 @@ protected override void OnStartup(StartupEventArgs e) sw.Step($"Main window shown"); } - private static void ActualizeConfig(IConfigProvider mainConfigProvider) + private void ActualizeConfig(IConfigProvider mainConfigProvider) { Log.Debug($"Actualizing configuration format of {mainConfigProvider}"); var config = mainConfigProvider.ActualConfig.CloneJson(); @@ -187,7 +167,7 @@ private static void ActualizeConfig(IConfigProvider mainConfigP Log.Debug("Config format updated successfully"); } - private static void ActualizeConfig(IConfigProvider mainConfigProvider, IConfigProvider hotkeyConfigProvider) + private void ActualizeConfig(IConfigProvider mainConfigProvider, IConfigProvider hotkeyConfigProvider) { Log.Debug($"Actualizing configuration format of {hotkeyConfigProvider}"); @@ -220,7 +200,7 @@ private static void ActualizeConfig(IConfigProvider mainConfigP Log.Debug("Config format updated successfully"); } - private static void ActualizeConfig(IConfigProvider mainConfigProvider, IConfigProvider overlayConfigProvider) + private void ActualizeConfig(IConfigProvider mainConfigProvider, IConfigProvider overlayConfigProvider) { Log.Debug($"Actualizing configuration format of {overlayConfigProvider}"); diff --git a/Sources/MicSwitch/MainWindow/Models/GraphicsExtensions.cs b/Sources/MicSwitch/MainWindow/Models/GraphicsExtensions.cs index 9a3194f..176ea8d 100644 --- a/Sources/MicSwitch/MainWindow/Models/GraphicsExtensions.cs +++ b/Sources/MicSwitch/MainWindow/Models/GraphicsExtensions.cs @@ -1,6 +1,5 @@ using System.Drawing; using System.Drawing.Imaging; -using System.IO; using System.Windows; using System.Windows.Interop; using System.Windows.Media.Imaging; diff --git a/Sources/MicSwitch/MainWindow/Models/ImageProvider.cs b/Sources/MicSwitch/MainWindow/Models/ImageProvider.cs index 8141478..1d34d04 100644 --- a/Sources/MicSwitch/MainWindow/Models/ImageProvider.cs +++ b/Sources/MicSwitch/MainWindow/Models/ImageProvider.cs @@ -1,19 +1,9 @@ -using System; using System.Drawing; -using System.Reactive.Concurrency; -using System.Reactive.Linq; using System.Windows.Media; using System.Windows.Media.Imaging; -using JetBrains.Annotations; using log4net; using MicSwitch.Modularity; using MicSwitch.Services; -using PoeShared; -using PoeShared.Modularity; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using ReactiveUI; -using Unity; namespace MicSwitch.MainWindow.Models { diff --git a/Sources/MicSwitch/MainWindow/ViewModels/HotkeyEditorViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/HotkeyEditorViewModel.cs index 88f959b..16cadd7 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/HotkeyEditorViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/HotkeyEditorViewModel.cs @@ -1,13 +1,6 @@ -using System; -using System.Reactive.Linq; using System.Windows.Input; using log4net; using MicSwitch.MainWindow.Models; -using PoeShared; -using PoeShared.Scaffolding; -using PoeShared.UI; -using PropertyBinder; -using ReactiveUI; namespace MicSwitch.MainWindow.ViewModels { diff --git a/Sources/MicSwitch/MainWindow/ViewModels/IHotkeyEditorViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/IHotkeyEditorViewModel.cs index 364f938..c322958 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/IHotkeyEditorViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/IHotkeyEditorViewModel.cs @@ -1,6 +1,4 @@ using MicSwitch.MainWindow.Models; -using PoeShared.Scaffolding; -using PoeShared.UI; namespace MicSwitch.MainWindow.ViewModels { diff --git a/Sources/MicSwitch/MainWindow/ViewModels/IMainWindowViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/IMainWindowViewModel.cs index c3ffe20..29bcaa9 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/IMainWindowViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/IMainWindowViewModel.cs @@ -1,5 +1,3 @@ -using PoeShared.Scaffolding; - namespace MicSwitch.MainWindow.ViewModels { public interface IMainWindowViewModel : IDisposableReactiveObject diff --git a/Sources/MicSwitch/MainWindow/ViewModels/IMicSwitchOverlayViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/IMicSwitchOverlayViewModel.cs index 8d8ceca..c6a74bb 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/IMicSwitchOverlayViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/IMicSwitchOverlayViewModel.cs @@ -1,5 +1,4 @@ using MicSwitch.MainWindow.Models; -using PoeShared.Native; namespace MicSwitch.MainWindow.ViewModels { diff --git a/Sources/MicSwitch/MainWindow/ViewModels/IMicrophoneControllerViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/IMicrophoneControllerViewModel.cs index 7ceaab1..5610d43 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/IMicrophoneControllerViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/IMicrophoneControllerViewModel.cs @@ -1,9 +1,5 @@ -using System.Collections.ObjectModel; using MicSwitch.MainWindow.Models; -using MicSwitch.Services; using PoeShared.Audio.Models; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; namespace MicSwitch.MainWindow.ViewModels { diff --git a/Sources/MicSwitch/MainWindow/ViewModels/MainWindowViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/MainWindowViewModel.cs index 90f67a5..de83e89 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/MainWindowViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/MainWindowViewModel.cs @@ -1,12 +1,5 @@ -using System; -using System.ComponentModel; -using System.Diagnostics; +using System.ComponentModel; using System.Drawing; -using System.IO; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Runtime.Versioning; -using System.Threading.Tasks; using System.Windows; using System.Windows.Input; using log4net; @@ -15,19 +8,8 @@ using Microsoft.Win32; using MicSwitch.MainWindow.Models; using MicSwitch.Modularity; -using PoeShared; using PoeShared.Audio.Services; -using PoeShared.Audio.ViewModels; -using PoeShared.Modularity; -using PoeShared.Native; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; -using PoeShared.Services; using PoeShared.Squirrel.Updater; -using PoeShared.UI; -using ReactiveUI; -using Unity; using Application = System.Windows.Application; using Size = System.Windows.Size; @@ -105,14 +87,22 @@ public MainWindowViewModel( WindowState = WindowState.Minimized; Overlay = overlay.AddTo(Anchors); - var startupManagerArgs = new StartupManagerArgs + try { - UniqueAppName = $"{appArguments.AppName}{(appArguments.IsDebugMode ? "-debug" : string.Empty)}", - ExecutablePath = appUpdater.GetLatestExecutable().FullName, - CommandLineArgs = appArguments.StartupArgs, - AutostartFlag = appArguments.AutostartFlag - }; - this.startupManager = startupManagerFactory.Create(startupManagerArgs); + var startupManagerArgs = new StartupManagerArgs + { + UniqueAppName = $"{appArguments.AppName}{(appArguments.IsDebugMode ? "-debug" : string.Empty)}", + ExecutablePath = appUpdater.LauncherExecutable.FullName, + CommandLineArgs = appArguments.StartupArgs, + AutostartFlag = appArguments.AutostartFlag + }; + this.startupManager = startupManagerFactory.Create(startupManagerArgs); + RunAtLoginToggleCommand = CommandWrapper.Create(RunAtLoginCommandExecuted, Observable.Return(startupManager?.IsReady ?? false)); + } + catch (Exception e) + { + Log.Warn("Failed to initialize startup manager", e); + } this.RaiseWhenSourceValue(x => x.IsActive, mainWindowTracker, x => x.IsActive, uiScheduler).AddTo(Anchors); this.RaiseWhenSourceValue(x => x.RunAtLogin, startupManager, x => x.IsRegistered, uiScheduler).AddTo(Anchors); @@ -328,7 +318,7 @@ public MainWindowViewModel( public bool IsActive => mainWindowTracker.IsActive; - public bool RunAtLogin => startupManager.IsRegistered; + public bool RunAtLogin => startupManager?.IsRegistered ?? false; public Size MinSize { get; } = new Size(600, 430); public Size MaxSize { get; } = new Size(900, 980); diff --git a/Sources/MicSwitch/MainWindow/ViewModels/MicSwitchOverlayViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/MicSwitchOverlayViewModel.cs index c7666d1..7bc7523 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/MicSwitchOverlayViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/MicSwitchOverlayViewModel.cs @@ -1,6 +1,3 @@ -using System; -using System.Reactive.Concurrency; -using System.Reactive.Linq; using System.Windows; using System.Windows.Input; using System.Windows.Media; @@ -8,14 +5,6 @@ using MicSwitch.MainWindow.Models; using MicSwitch.Modularity; using MicSwitch.Services; -using PoeShared; -using PoeShared.Modularity; -using PoeShared.Native; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; -using ReactiveUI; -using Unity; using Size = System.Drawing.Size; namespace MicSwitch.MainWindow.ViewModels diff --git a/Sources/MicSwitch/MainWindow/ViewModels/MicrophoneControllerViewModel.cs b/Sources/MicSwitch/MainWindow/ViewModels/MicrophoneControllerViewModel.cs index fdf150d..29ae123 100644 --- a/Sources/MicSwitch/MainWindow/ViewModels/MicrophoneControllerViewModel.cs +++ b/Sources/MicSwitch/MainWindow/ViewModels/MicrophoneControllerViewModel.cs @@ -1,26 +1,8 @@ -using System; -using System.Collections.ObjectModel; -using System.Linq; -using System.Linq.Expressions; -using System.Reactive.Concurrency; -using System.Reactive.Linq; -using System.Runtime.Versioning; -using System.Threading.Tasks; -using DynamicData; -using DynamicData.Binding; using log4net; using MicSwitch.MainWindow.Models; using MicSwitch.Modularity; using MicSwitch.Services; -using PoeShared; using PoeShared.Audio.Models; -using PoeShared.Modularity; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; -using PoeShared.UI; -using ReactiveUI; -using Unity; namespace MicSwitch.MainWindow.ViewModels { diff --git a/Sources/MicSwitch/MainWindow/Views/MainWindow.xaml.cs b/Sources/MicSwitch/MainWindow/Views/MainWindow.xaml.cs index adc7e19..394460f 100644 --- a/Sources/MicSwitch/MainWindow/Views/MainWindow.xaml.cs +++ b/Sources/MicSwitch/MainWindow/Views/MainWindow.xaml.cs @@ -1,11 +1,6 @@ -using System; -using System.ComponentModel; -using System.Reactive.Disposables; +using System.ComponentModel; using System.Windows; using log4net; -using PoeShared.Modularity; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; namespace MicSwitch.MainWindow.Views { @@ -15,7 +10,7 @@ namespace MicSwitch.MainWindow.Views public partial class MainWindow { private static readonly ILog Log = LogManager.GetLogger(typeof(MainWindow)); - private readonly CompositeDisposable anchors = new CompositeDisposable(); + private readonly CompositeDisposable anchors = new(); public MainWindow(IAppArguments appArguments) { diff --git a/Sources/MicSwitch/MicSwitch.csproj b/Sources/MicSwitch/MicSwitch.csproj index 554fbbc..21430dd 100644 --- a/Sources/MicSwitch/MicSwitch.csproj +++ b/Sources/MicSwitch/MicSwitch.csproj @@ -2,7 +2,7 @@ WinExe net6-windows10.0.19041.0 - 9 + 10 false MicSwitch ..\bin @@ -24,15 +24,11 @@ - - - - diff --git a/Sources/MicSwitch/Modularity/MicSwitchConfig.cs b/Sources/MicSwitch/Modularity/MicSwitchConfig.cs index 8f94482..c827f33 100644 --- a/Sources/MicSwitch/Modularity/MicSwitchConfig.cs +++ b/Sources/MicSwitch/Modularity/MicSwitchConfig.cs @@ -1,11 +1,7 @@ -using System; -using System.Drawing; +using System.Drawing; using System.Windows; using MicSwitch.MainWindow.Models; -using MicSwitch.Services; -using Newtonsoft.Json; using PoeShared.Audio.Models; -using PoeShared.Modularity; using Point = System.Windows.Point; using Size = System.Windows.Size; diff --git a/Sources/MicSwitch/Modularity/MicSwitchHotkeyConfig.cs b/Sources/MicSwitch/Modularity/MicSwitchHotkeyConfig.cs index 0ddf6b9..9df43ad 100644 --- a/Sources/MicSwitch/Modularity/MicSwitchHotkeyConfig.cs +++ b/Sources/MicSwitch/Modularity/MicSwitchHotkeyConfig.cs @@ -1,5 +1,4 @@ using MicSwitch.MainWindow.Models; -using PoeShared.Modularity; namespace MicSwitch.Modularity { diff --git a/Sources/MicSwitch/Modularity/MicSwitchOverlayConfig.cs b/Sources/MicSwitch/Modularity/MicSwitchOverlayConfig.cs index 659579d..7d8d81f 100644 --- a/Sources/MicSwitch/Modularity/MicSwitchOverlayConfig.cs +++ b/Sources/MicSwitch/Modularity/MicSwitchOverlayConfig.cs @@ -1,7 +1,5 @@ using System.Drawing; using MicSwitch.MainWindow.Models; -using PoeShared.Modularity; -using PoeShared.Native; using Point = System.Windows.Point; using Size = System.Windows.Size; diff --git a/Sources/MicSwitch/Properties/GlobalUsings.cs b/Sources/MicSwitch/Properties/GlobalUsings.cs new file mode 100644 index 0000000..0c99611 --- /dev/null +++ b/Sources/MicSwitch/Properties/GlobalUsings.cs @@ -0,0 +1,47 @@ +// ReSharper disable RedundantUsingDirective.Global +global using PoeShared.Audio.ViewModels; +global using PoeShared.Scaffolding.WPF; +global using PoeShared.UI.Bindings; +global using PoeShared.Wpf.Scaffolding; +global using System.Collections.Generic; +global using System.Diagnostics; +global using System.Linq; +global using PoeShared; +global using PoeShared.Modularity; +global using PoeShared.Native; +global using PoeShared.Scaffolding; +global using PoeShared.Logging; +global using System; +global using System.Reactive; +global using System.Reactive.Concurrency; +global using System.Reactive.Linq; +global using System.Reactive.Subjects; +global using System.Threading; +global using System.Reactive.Disposables; +global using System.Linq.Expressions; +global using System.Collections.ObjectModel; +global using System.Collections.Concurrent; +global using System.Reactive.Threading.Tasks; +global using System.Threading.Tasks; +global using JetBrains.Annotations; +global using PoeShared.Prism; +global using PoeShared.UI; +global using PoeShared.WindowSeekers; +global using PoeShared.Services; +global using ReactiveUI; +global using Unity; +global using System.IO; +global using PropertyBinder; +global using DynamicData; +global using DynamicData.Binding; +global using DynamicData.Kernel; +global using WinSize = System.Drawing.Size; +global using WinPoint = System.Drawing.Point; +global using WinRectangle = System.Drawing.Rectangle; +global using IDisposable = System.IDisposable; +global using Guard = PoeShared.Guard; +global using AwesomeIcons = PoeShared.Themes.AwesomeIcons; +global using Path = System.IO.Path; +global using Directory = System.IO.Directory; +global using SearchOption = System.IO.SearchOption; +global using File = System.IO.File; \ No newline at end of file diff --git a/Sources/MicSwitch/Services/AllMicrophonesController.cs b/Sources/MicSwitch/Services/AllMicrophonesController.cs index ab8c4f5..8fd45f4 100644 --- a/Sources/MicSwitch/Services/AllMicrophonesController.cs +++ b/Sources/MicSwitch/Services/AllMicrophonesController.cs @@ -1,11 +1,5 @@ -using System.Collections.ObjectModel; -using System.Linq; -using DynamicData.Binding; -using DynamicData; using log4net; -using PoeShared; using PoeShared.Audio.Models; -using PoeShared.Scaffolding; namespace MicSwitch.Services { diff --git a/Sources/MicSwitch/Services/ComplexHotkeyTracker.cs b/Sources/MicSwitch/Services/ComplexHotkeyTracker.cs index 5f1496f..ad20bba 100644 --- a/Sources/MicSwitch/Services/ComplexHotkeyTracker.cs +++ b/Sources/MicSwitch/Services/ComplexHotkeyTracker.cs @@ -1,24 +1,11 @@ -using System; -using System.Diagnostics; using System.Drawing; -using System.Reactive.Disposables; -using System.Reactive.Linq; using System.Reflection; -using System.Threading; using System.Windows; using System.Windows.Interop; -using JetBrains.Annotations; using log4net; using MicSwitch.MainWindow.Models; using MicSwitch.Modularity; using PInvoke; -using PoeShared; -using PoeShared.Modularity; -using PoeShared.Native; -using PoeShared.Prism; -using PoeShared.Scaffolding; -using PoeShared.Scaffolding.WPF; -using PoeShared.UI; namespace MicSwitch.Services { diff --git a/Sources/MicSwitch/Services/ComplexMicrophoneController.cs b/Sources/MicSwitch/Services/ComplexMicrophoneController.cs index 44279b9..02cee25 100644 --- a/Sources/MicSwitch/Services/ComplexMicrophoneController.cs +++ b/Sources/MicSwitch/Services/ComplexMicrophoneController.cs @@ -1,13 +1,5 @@ -using System; -using DynamicData; -using DynamicData.Binding; -using ReactiveUI; -using System.Reactive.Linq; using log4net; -using PoeShared; using PoeShared.Audio.Models; -using PoeShared.Prism; -using PoeShared.Scaffolding; namespace MicSwitch.Services { diff --git a/Sources/MicSwitch/Services/IComplexHotkeyTracker.cs b/Sources/MicSwitch/Services/IComplexHotkeyTracker.cs index edbeac5..c019309 100644 --- a/Sources/MicSwitch/Services/IComplexHotkeyTracker.cs +++ b/Sources/MicSwitch/Services/IComplexHotkeyTracker.cs @@ -1,5 +1,3 @@ -using PoeShared.Scaffolding; - namespace MicSwitch.Services { internal interface IComplexHotkeyTracker : IDisposableReactiveObject diff --git a/Sources/MicSwitch/Services/IMicrophoneController.cs b/Sources/MicSwitch/Services/IMicrophoneController.cs index aa5dba2..80e471c 100644 --- a/Sources/MicSwitch/Services/IMicrophoneController.cs +++ b/Sources/MicSwitch/Services/IMicrophoneController.cs @@ -1,5 +1,4 @@ using PoeShared.Audio.Models; -using PoeShared.Scaffolding; namespace MicSwitch.Services { diff --git a/Sources/MicSwitch/Services/MultimediaMicrophoneController.cs b/Sources/MicSwitch/Services/MultimediaMicrophoneController.cs index ca96583..2622e72 100644 --- a/Sources/MicSwitch/Services/MultimediaMicrophoneController.cs +++ b/Sources/MicSwitch/Services/MultimediaMicrophoneController.cs @@ -1,13 +1,7 @@ -using System; -using System.Reactive.Linq; using log4net; using MicSwitch.Modularity; using NAudio.CoreAudioApi; -using PoeShared; using PoeShared.Audio.Models; -using PoeShared.Modularity; -using PoeShared.Scaffolding; -using ReactiveUI; namespace MicSwitch.Services { diff --git a/Sources/MicSwitch/Services/WaveInAudioExEventArgs.cs b/Sources/MicSwitch/Services/WaveInAudioExEventArgs.cs index 58f2b19..05c7a1a 100644 --- a/Sources/MicSwitch/Services/WaveInAudioExEventArgs.cs +++ b/Sources/MicSwitch/Services/WaveInAudioExEventArgs.cs @@ -1,4 +1,3 @@ -using System; using NAudio.Wave; namespace MicSwitch.Services diff --git a/Submodules/PoeEye b/Submodules/PoeEye index d0c4570..84d151e 160000 --- a/Submodules/PoeEye +++ b/Submodules/PoeEye @@ -1 +1 @@ -Subproject commit d0c457080fbd70ee89dcc0dd4203381f40e9617a +Subproject commit 84d151ecd70f71726f49782a0eab8def07b2b2d8