Fix the session mess - also number starting with 1

ho0ber · Feb 4, 2019 · c7bbe40 · c7bbe40
1 parent 13a3a41
commit c7bbe40
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/NK2Tray/AudioDevice.cs b/NK2Tray/AudioDevice.cs
@@ -92,11 +92,8 @@ public List<MixerSession> GetMixerSessions()
                 var process = FindLivingProcess(identSessions);
                 string label = (process != null) ? process.ProcessName : ident;
 
-                if (identSessions.First().IsSystemSoundsSession && WindowTools.ProcessExists(identSessions.First().GetProcessID))
-                {
+                if (HasSystemSoundsSession(identSessions))
                     label = "System Sounds";
-                    sessionType = SessionType.SystemSounds;
-                }
 
                 var mixerSession = new MixerSession(this, label, ident, identSessions, sessionType);
                 mixerSessions.Add(mixerSession);
@@ -123,6 +120,15 @@ public Process FindLivingProcess(List<AudioSessionControl> sessions)
             return process;
         }
 
+        public bool HasSystemSoundsSession(List<AudioSessionControl> sessions)
+        {
+            foreach (var session in sessions)
+                if (session.IsSystemSoundsSession)
+                    return true;
+
+            return false;
+        }
+
         public MixerSession FindMixerSessions(string sessionIdentifier)
         {
             var mixerSessions = GetMixerSessions();

diff --git a/NK2Tray/Program.cs b/NK2Tray/Program.cs
@@ -68,7 +68,7 @@ private void OnPopup(object sender, EventArgs e)
 
             foreach (var fader in midiDevice.faders)
             {
-                MenuItem faderMenu = new MenuItem($@"Fader {fader.faderNumber} - {(fader.assigned ? fader.assignment.label : "")}");
+                MenuItem faderMenu = new MenuItem($@"Fader {fader.faderNumber + 1} - {(fader.assigned ? fader.assignment.label : "")}");
                 trayMenu.MenuItems.Add(faderMenu);
 
                 // Add master mixerSession to menu

diff --git a/NK2Tray/Properties/AssemblyInfo.cs b/NK2Tray/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.14.0")]
-[assembly: AssemblyFileVersion("0.0.14.0")]
+[assembly: AssemblyVersion("0.0.15.0")]
+[assembly: AssemblyFileVersion("0.0.15.0")]