Use a new Sound for notification. See #49

README.md

@@ -70,3 +70,6 @@ http://creativecommons.org/licenses/by-nc-sa/4.0/
 
 ### Disabling notification
 [@adamblackburn](https://github.com/adamblackburn) with merge request [#33](https://github.com/Belphemur/SoundSwitch/pull/33)
+
+### Notification Sound
+[Music box notification sound by Robinhood76](https://www.freesound.org/people/Robinhood76/sounds/216676/)

SoundSwitch/Framework/Audio/AudioPlaybackEngine.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using NAudio.Wave;
 using NAudio.Wave.SampleProviders;
 

SoundSwitch/Framework/NotificationManager/Notification/NotificationSound.cs

@@ -21,7 +21,6 @@ public void NotifyDefaultChanged(IAudioDevice audioDevice)
         {
             if (audioDevice.Type != AudioDeviceType.Playback)
                 return;
-
             new AudioPlaybackEngine().PlaySoundWav(_sound);
         }
     }

SoundSwitch/Framework/NotificationManager/NotificationManager.cs

@@ -1,4 +1,6 @@
-using AudioEndPointControllerWrapper;
+using System;
+using AudioEndPointControllerWrapper;
+using SoundSwitch.Framework.NotificationManager.Notification;
 using SoundSwitch.Model;
 
 namespace SoundSwitch.Framework.NotificationManager
@@ -7,27 +9,41 @@ public class NotificationManager
     {
         private readonly IAppModel _model;
         private string _lastDeviceId;
+        private INotification _notification;
 
         public NotificationManager(IAppModel model)
         {
             _model = model;
+        }
+
+        public void Init()
+        {
             _model.DefaultDeviceChanged += ModelOnDefaultDeviceChanged;
+            _model.NotificationSettingsChanged += ModelOnNotificationSettingsChanged;
+            _notification = NotificationFactory.CreateNotification(_model.NotificationSettings, _model.NotifyIcon,
+                _model.NotificationSound);
+        }
+
+        private void ModelOnNotificationSettingsChanged(object sender, NotificationSettingsUpdatedEvent notificationSettingsUpdatedEvent)
+        {
+            _notification = NotificationFactory.CreateNotification(notificationSettingsUpdatedEvent.NewSettings, _model.NotifyIcon,
+               _model.NotificationSound);
         }
 
         private void ModelOnDefaultDeviceChanged(object sender, DeviceDefaultChangedEvent deviceDefaultChangedEvent)
         {
             if (_lastDeviceId == deviceDefaultChangedEvent.device.Id)
                 return;
 
-            var notification = NotificationFactory.CreateNotification(_model.NotificationSettings, _model.NotifyIcon,
-                _model.NotificationSound);
-            notification.NotifyDefaultChanged(deviceDefaultChangedEvent.device);
+
+            _notification.NotifyDefaultChanged(deviceDefaultChangedEvent.device);
             _lastDeviceId = deviceDefaultChangedEvent.device.Id;
         }
 
         ~NotificationManager()
         {
             _model.DefaultDeviceChanged -= ModelOnDefaultDeviceChanged;
+            _model.NotificationSettingsChanged -= ModelOnNotificationSettingsChanged;
         }
     }
 }

SoundSwitch/Model/AppModel.cs

@@ -52,6 +52,8 @@ public NotificationTypeEnum NotificationSettings
             {
                 AppConfigs.Configuration.NotificationSettings = value;
                 AppConfigs.Configuration.Save();
+                NotificationSettingsChanged?.Invoke(this,
+                    new NotificationSettingsUpdatedEvent(NotificationSettings, value));
             }
         }
         public HashSet<string> SelectedPlaybackDevicesList => AppConfigs.Configuration.SelectedPlaybackDeviceListId;
@@ -122,9 +124,12 @@ public bool RunAtStartup
         }
 
         public IAudioDeviceLister ActiveAudioDeviceLister { get; set; }
+        public event EventHandler<NotificationSettingsUpdatedEvent> NotificationSettingsChanged;
 
         #endregion
 
+
+
         /// <summary>
         ///     Initialize the Main class with Updater and Hotkeys
         /// </summary>
@@ -140,10 +145,11 @@ public void InitializeMain()
             }
             SetHotkeyCombination(AppConfigs.Configuration.PlaybackHotKeys, AudioDeviceType.Playback);
             SetHotkeyCombination(AppConfigs.Configuration.RecordingHotKeys, AudioDeviceType.Recording);
-            NotificationSound = new CachedWavSound(Properties.Resources.dingdong);
+            NotificationSound = new CachedWavSound(Properties.Resources.NotificationSound);
             /*TODO: Remove in next VERSION (3.6.6)*/
             MigrateSelectedDeviceLists();
             InitUpdateChecker();
+            _notificationManager.Init();
             _initialized = true;
         }
 

SoundSwitch/Model/Events.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using AudioEndPointControllerWrapper;
+using SoundSwitch.Framework.NotificationManager;
 
 namespace SoundSwitch.Model
 {
@@ -40,4 +41,16 @@ public DeviceListChanged(IEnumerable<string> seletedDevicesList, AudioDeviceType
         public IEnumerable<string> SeletedDevicesList { get; private set; }
         public AudioDeviceType Type { get; private set; }
     }
+
+    public class NotificationSettingsUpdatedEvent : EventArgs
+    {
+        public NotificationTypeEnum PrevSettings { get;}
+        public NotificationTypeEnum NewSettings { get; }
+
+        public NotificationSettingsUpdatedEvent(NotificationTypeEnum prevSettings, NotificationTypeEnum newSettings)
+        {
+            PrevSettings = prevSettings;
+            NewSettings = newSettings;
+        }
+    }
 }

SoundSwitch/Model/IAppModel.cs

@@ -112,6 +112,11 @@ public interface IAppModel
         /// If a device is added in the system
         /// </summary>
         event EventHandler<DeviceAddedEvent> DeviceAdded;
+
+        /// <summary>
+        /// If the NotificationSettings has been modified
+        /// </summary>
+        event EventHandler<NotificationSettingsUpdatedEvent> NotificationSettingsChanged;
         #endregion
 
         #region Methods

SoundSwitch/Properties/Resources.resx

@@ -151,7 +151,7 @@
   <data name="defaultSpeakers" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\defaultSpeakers.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="dingdong" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\33244__ljudman__dingding.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="NotificationSound" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\216676__robinhood76__04864-notification-music-box.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>

SoundSwitch/SoundSwitch.csproj

@@ -376,6 +376,7 @@
     <None Include="Resources\arrow-switch-16.png" />
     <None Include="Resources\arrow-switch-48.png" />
     <None Include="Resources\33244__ljudman__dingding.wav" />
+    <None Include="Resources\216676__robinhood76__04864-notification-music-box.wav" />
     <Content Include="Resources\arrow_switch.ico" />
     <None Include="Resources\cog.png" />
     <None Include="Resources\exit.png" />