updates to version 1.0.2

fixes device selections, fixes default device recognition, adds error message
targor · Dec 21, 2021 · 1240f48 · 1240f48
1 parent 27078f1
commit 1240f48
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 12 deletions.
diff --git a/JBLRecover/MainWindow.xaml.cs b/JBLRecover/MainWindow.xaml.cs
@@ -167,28 +167,57 @@ private void LoadAudioDevices()
                     CapsWrapper c = (CapsWrapper)o;
                     if (c.ToString().ToLower().Contains("jbl")
                         &&
-                        c.Device.AudioEndpointVolume.MasterVolumeLevel != 0.0f &&
-                        (
-                            c.ToString().ToLower().Contains("lautsprecher") ||
-                            c.ToString().ToLower().Contains("speaker")
-                        )
-                    )
+                        c.Device.AudioEndpointVolume.MasterVolumeLevel != 0.0f && c.Device.DataFlow==DataFlow.Render)
                     {
                         devices.SelectedItem = o;
-                        listener();
                         Play();
                         break;
                     }
                 }
 
                 if (devices.SelectedItem==null)
                 {
+                    var enumerator = new MMDeviceEnumerator();
+                    MMDevice mm =enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+
+                    bool deviceset = false;
+
+                    if (mm != null)
+                    {
+                        foreach (object o in devices.Items)
+                        {
+                            CapsWrapper c = (CapsWrapper)o;
+                            if (c.Device.AudioEndpointVolume.MasterVolumeLevel != 0.0f &&
+                                c.Device.DataFlow == DataFlow.Render &&
+                                c.Device.State == DeviceState.Active &&
+                                c.Device.ID.Equals(mm.ID)
+
+                                )
+                            {
+                                deviceset = true;
+                                devices.SelectedItem = o;
+                                Play();
+                                break;
+                            }
+                        }
+                    }
+
+
                     this.Show();
                     this.ShowInTaskbar = true;
                     this.WindowState = System.Windows.WindowState.Normal;
-                    System.Windows.Forms.MessageBox.Show("Could not find the correct speaker output, please select one manually.");
+                    if (deviceset)
+                    {
+                        System.Windows.Forms.MessageBox.Show("A specific jbl device could not be found. The default active device was set instead, please check if everything is allright.");
+                    }
+                    else
+                    {
+                        System.Windows.Forms.MessageBox.Show("Could not find the correct speaker output, please select one manually.");
+                    }
                 }
 
+                listener();
+
             }
             catch (Exception ex)
             {
@@ -290,12 +319,18 @@ private void listener()
                     Thread.Sleep(100);
                     try
                     {
-                        if (devices.SelectedItem != null)
+                        CapsWrapper wrapper = null;
+                        App.Current.Dispatcher.Invoke(() => {
+                            if (devices.SelectedItem != null)
+                            {
+                                wrapper = (CapsWrapper)devices.SelectedItem;
+                            }
+                        });
+
+                        if (wrapper != null)
                         {
                             System.Windows.Application.Current.Dispatcher.Invoke(() =>
                             {
-
-                                CapsWrapper wrapper = (CapsWrapper)devices.SelectedItem;
                                 double[] volumes = GetDeviceVolumes(wrapper);
 
                                 if (!minmaxset)

diff --git a/JBLRecover/Properties/AssemblyInfo.cs b/JBLRecover/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]