Merge pull request #52 from davkean/Cleanup2

Cleanup2
davkean · Nov 12, 2021 · 453e220 · 453e220
2 parents 06c20ca + 48f60b8
commit 453e220
Show file tree

Hide file tree

Showing 109 changed files with 219 additions and 192 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -200,6 +200,10 @@ csharp_preserve_single_line_blocks = true
 # Code block
 csharp_prefer_braces = false:none
 
+# Microsoft.CodeAnalysis.VisualBasic.CodeStyle/Microsoft.CodeAnalysis.CSharp.CodeStyle
+dotnet_diagnostic.IDE0073.severity = error      # Enforce file header
+file_header_template = -----------------------------------------------------------------------\nCopyright (c) David Kean. All rights reserved.\n-----------------------------------------------------------------------
+
 [src/*Tests/**/*.cs]
 # We allow usage of "var" inside tests as it reduces churn as we remove/rename types
 csharp_style_var_for_built_in_types = true:none

diff --git a/src/AudioSwitcher/ApplicationModel/AudioSwitcherApp.cs b/src/AudioSwitcher/ApplicationModel/AudioSwitcherApp.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

diff --git a/src/AudioSwitcher/ApplicationModel/IApplication.cs b/src/AudioSwitcher/ApplicationModel/IApplication.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Drawing;
 

diff --git a/src/AudioSwitcher/ApplicationModel/IStartupService.cs b/src/AudioSwitcher/ApplicationModel/IStartupService.cs
@@ -1,7 +1,6 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
-using System;
 
 namespace AudioSwitcher.ApplicationModel
 {

diff --git a/src/AudioSwitcher/ApplicationModel/NotificationIconStartupService.cs b/src/AudioSwitcher/ApplicationModel/NotificationIconStartupService.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System.ComponentModel.Composition;
 using AudioSwitcher.Presentation;
 using AudioSwitcher.UI.Presenters;

diff --git a/src/AudioSwitcher/ApplicationModel/SaveSettingsService.cs b/src/AudioSwitcher/ApplicationModel/SaveSettingsService.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.ComponentModel;
 using System.ComponentModel.Composition;

diff --git a/src/AudioSwitcher/Audio/AudioDevice.cs b/src/AudioSwitcher/Audio/AudioDevice.cs
@@ -1,4 +1,8 @@
-/*
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+/*
   LICENSE
   -------
   Copyright (C) 2007 Ray Molenkamp

diff --git a/src/AudioSwitcher/Audio/AudioDeviceCollection.cs b/src/AudioSwitcher/Audio/AudioDeviceCollection.cs
@@ -1,4 +1,8 @@
-using System.Collections;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+using System.Collections;
 /*
   LICENSE
   -------

diff --git a/src/AudioSwitcher/Audio/AudioDeviceEventArgs.cs b/src/AudioSwitcher/Audio/AudioDeviceEventArgs.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 
 namespace AudioSwitcher.Audio

diff --git a/src/AudioSwitcher/Audio/AudioDeviceKind.cs b/src/AudioSwitcher/Audio/AudioDeviceKind.cs
@@ -1,4 +1,6 @@
-using System;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/AudioDeviceManager.cs b/src/AudioSwitcher/Audio/AudioDeviceManager.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 // This source file was altered for use in AudioSwitcher.
 /*
   LICENSE

diff --git a/src/AudioSwitcher/Audio/AudioDeviceRemovedEventArgs.cs b/src/AudioSwitcher/Audio/AudioDeviceRemovedEventArgs.cs
@@ -1,8 +1,8 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/AudioDeviceRole.cs b/src/AudioSwitcher/Audio/AudioDeviceRole.cs
@@ -1,6 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/AudioDeviceState.cs b/src/AudioSwitcher/Audio/AudioDeviceState.cs
@@ -1,4 +1,8 @@
-/*
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+/*
   LICENSE
   -------
   Copyright (C) 2007 Ray Molenkamp

diff --git a/src/AudioSwitcher/Audio/AudioDeviceStateEventArgs.cs b/src/AudioSwitcher/Audio/AudioDeviceStateEventArgs.cs
@@ -1,7 +1,6 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
-using System;
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/DefaultAudioDeviceEventArgs.cs b/src/AudioSwitcher/Audio/DefaultAudioDeviceEventArgs.cs
@@ -1,7 +1,6 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
-using System;
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/InputSwitcherService.cs b/src/AudioSwitcher/Audio/InputSwitcherService.cs
@@ -1,10 +1,11 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.ComponentModel.Composition;
+
 using AudioSwitcher.ApplicationModel;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/Blob.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/Blob.cs
@@ -1,4 +1,8 @@
-/*
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+/*
   LICENSE
   -------
   Copyright (C) 2007 Ray Molenkamp
@@ -21,9 +25,6 @@
 */
 // Adapted for AudioSwitcher
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/ClsCtx.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/ClsCtx.cs
@@ -1,6 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+using System;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDevice.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDevice.cs
@@ -1,9 +1,9 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDeviceCollection.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDeviceCollection.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
 

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDeviceEnumerator.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IMMDeviceEnumerator.cs
@@ -1,9 +1,9 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IMMEndpoint.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IMMEndpoint.cs
@@ -1,8 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+using System;
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IMMNotificationClient.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IMMNotificationClient.cs
@@ -1,8 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+using System;
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IPolicyConfig2.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IPolicyConfig2.cs
@@ -1,8 +1,8 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IPolicyConfig3.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IPolicyConfig3.cs
@@ -1,8 +1,8 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/IPropertyStore.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/IPropertyStore.cs
@@ -1,9 +1,9 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
-using AudioSwitcher.Audio;
 
 namespace AudioSwitcher.Audio.Interop
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/MMDeviceEnumerator.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/MMDeviceEnumerator.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
 

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PolicyConfig.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PolicyConfig.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 using System.Runtime.InteropServices;
 

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PropVariant.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PropVariant.cs
@@ -1,4 +1,8 @@
-/*
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+/*
   LICENSE
   -------
   Copyright (C) 2007 Ray Molenkamp
@@ -21,9 +25,7 @@
 */
 // adapted for use in AudioSwitcher
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace AudioSwitcher.Audio.Interop

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyKey.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyKey.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 using System;
 
 namespace AudioSwitcher.Audio

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyKeys.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyKeys.cs
@@ -1,6 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
+
 /*
   LICENSE
   -------
@@ -23,8 +24,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace AudioSwitcher.Audio
 {

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyStore.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyStore.cs
@@ -1,7 +1,7 @@
 // -----------------------------------------------------------------------
-// Copyright (c) David Kean.
+// Copyright (c) David Kean. All rights reserved.
 // -----------------------------------------------------------------------
-// This source file was altered for use in AudioSwitcher.
+
 /*
   LICENSE
   -------
@@ -23,10 +23,8 @@
      misrepresented as being the original source code.
   3. This notice may not be removed or altered from any source distribution.
 */
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
+
 using AudioSwitcher.Audio.Interop;
 
 namespace AudioSwitcher.Audio

diff --git a/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyStoreProperty.cs b/src/AudioSwitcher/Audio/Interop/MMAudio/PropertyStoreProperty.cs
@@ -1,4 +1,8 @@
-/*
+// -----------------------------------------------------------------------
+// Copyright (c) David Kean. All rights reserved.
+// -----------------------------------------------------------------------
+
+/*
   LICENSE
   -------
   Copyright (C) 2007 Ray Molenkamp
@@ -22,9 +26,6 @@
 // modified from Ray Molenkamp's original
 
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using AudioSwitcher.Audio.Interop;
 
 namespace AudioSwitcher.Audio