Improve logging

Belphemur · Feb 26, 2017 · 44b6184 · 44b6184
1 parent dae19a3
commit 44b6184
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/SoundSwitch/Model/AudioDeviceLister.cs b/SoundSwitch/Model/AudioDeviceLister.cs
@@ -75,19 +75,22 @@ private void AudioControllerOnDeviceAdded(object sender, DeviceAddedEvent device
         /// <returns></returns>
         public ICollection<IAudioDevice> GetPlaybackDevices()
         {
-            _cacheLock.EnterUpgradeableReadLock();
-            try
+            using (AppLogger.Log.DebugCall())
             {
-                if (_needUpdate)
+                _cacheLock.EnterUpgradeableReadLock();
+                try
                 {
+                    if (!_needUpdate) return _playback;
+
+                    AppLogger.Log.Debug("Needs update");
                     Refresh();
+                    return _playback;
+                }
+                finally
+                {
+                    AppLogger.Log.Debug("Get Playback Devices");
+                    _cacheLock.ExitUpgradeableReadLock();
                 }
-                return _playback;
-            }
-            finally
-            {
-                AppLogger.Log.Debug("Get Playback Devices");
-                _cacheLock.ExitUpgradeableReadLock();
             }
 
 
@@ -102,6 +105,7 @@ private void Refresh()
 
                 try
                 {
+                    AppLogger.Log.Debug("Refreshing playback devices");
                     _playback.UnionWith(AudioController.GetPlaybackDevices(_state));
                 }
                 catch (DefSoundException e)
@@ -113,6 +117,7 @@ private void Refresh()
                 _recording.Clear();
                 try
                 {
+                    AppLogger.Log.Debug("Refreshing recording devices");
                     _recording.UnionWith(AudioController.GetRecordingDevices(_state));
                 }
                 catch (DefSoundException e)
@@ -133,19 +138,22 @@ private void Refresh()
         /// <returns></returns>
         public ICollection<IAudioDevice> GetRecordingDevices()
         {
-            _cacheLock.EnterUpgradeableReadLock();
-            try
+            using (AppLogger.Log.DebugCall())
             {
-                if (_needUpdate)
+                _cacheLock.EnterUpgradeableReadLock();
+                try
                 {
+                    if (!_needUpdate) return _recording;
+
+                    AppLogger.Log.Debug("Needs update");
                     Refresh();
+                    return _recording;
+                }
+                finally
+                {
+                    AppLogger.Log.Debug("Get Recording Devices");
+                    _cacheLock.ExitUpgradeableReadLock();
                 }
-                return _recording;
-            }
-            finally
-            {
-                AppLogger.Log.Debug("Get Recording Devices");
-                _cacheLock.ExitUpgradeableReadLock();
             }
         }
     }