Add default icon for Speaker and Microphone.

Used in case it can't be extacted from the DLL or that the path can't be parsed. Fixes #23
Belphemur · Sep 2, 2015 · 91bc736 · 91bc736
1 parent e2c45ef
commit 91bc736
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 6 deletions.
diff --git a/SoundSwitch/Properties/Resources.Designer.cs b/SoundSwitch/Properties/Resources.Designer.cs
diff --git a/SoundSwitch/Properties/Resources.resx b/SoundSwitch/Properties/Resources.resx
@@ -145,4 +145,10 @@
   <data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="MicDefaultIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\MicDefaultIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="SpeakerDefaultIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\SpeakerDefaultIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/SoundSwitch/Resources/MicDefaultIcon.png b/SoundSwitch/Resources/MicDefaultIcon.png
diff --git a/SoundSwitch/Resources/SpeakerDefaultIcon.png b/SoundSwitch/Resources/SpeakerDefaultIcon.png
diff --git a/SoundSwitch/SoundSwitch.csproj b/SoundSwitch/SoundSwitch.csproj
@@ -298,6 +298,8 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\MicDefaultIcon.png" />
+    <None Include="Resources\SpeakerDefaultIcon.png" />
     <None Include="Resources\page-bottom.png" />
     <None Include="Resources\tick.png" />
     <None Include="Resources\arrow-switch-16.png" />

diff --git a/SoundSwitch/UI/Forms/Settings.cs b/SoundSwitch/UI/Forms/Settings.cs
@@ -23,6 +23,7 @@
 using SoundSwitch.Framework.Configuration;
 using SoundSwitch.Model;
 using SoundSwitch.Properties;
+using SoundSwitch.Util;
 
 namespace SoundSwitch.UI.Forms
 {

diff --git a/SoundSwitch/Util/AudioDeviceIconExtractor.cs b/SoundSwitch/Util/AudioDeviceIconExtractor.cs
@@ -12,12 +12,14 @@
 * GNU General Public License for more details.
 ********************************************************************/
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using AudioEndPointControllerWrapper;
-using SoundSwitch.Util;
+using SoundSwitch.Framework;
+using SoundSwitch.Properties;
 
-namespace SoundSwitch.Framework
+namespace SoundSwitch.Util
 {
     internal class AudioDeviceIconExtractor
     {
@@ -36,10 +38,29 @@ public static Icon ExtractIconFromAudioDevice(IAudioDevice audioDevice, bool lar
             {
                 return ico;
             }
-            var iconInfo = audioDevice.DeviceClassIconPath.Split(',');
-            var dllPath = iconInfo[0];
-            var iconIndex = int.Parse(iconInfo[1]);
-            ico = IconExtractor.Extract(dllPath, iconIndex, largeIcon);
+            try
+            {
+                var iconInfo = audioDevice.DeviceClassIconPath.Split(',');
+                var dllPath = iconInfo[0];
+                var iconIndex = int.Parse(iconInfo[1]);
+                ico = IconExtractor.Extract(dllPath, iconIndex, largeIcon);
+            }
+            catch (Exception e)
+            {
+                AppLogger.Log.Error($"Can't extract icon from {audioDevice.DeviceClassIconPath}\n Ex: ", e);
+                switch (audioDevice.Type)
+                {
+                    case AudioDeviceType.Playback:
+                        ico = Icon.FromHandle(Resources.SpeakerDefaultIcon.GetHicon());
+                        break;
+                    case AudioDeviceType.Recording:
+                        ico = Icon.FromHandle(Resources.MicDefaultIcon.GetHicon());
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
+            }
+
             IconCache.Add(audioDevice.DeviceClassIconPath, ico);
             return ico;
         }