ref - Cleaned up some code

Aptivi · Sep 18, 2023 · 1f51bbe · 1f51bbe
1 parent 60c9b3f
commit 1f51bbe
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 34 deletions.
diff --git a/BassBoom.Basolia/Format/AudioInfoTools.cs b/BassBoom.Basolia/Format/AudioInfoTools.cs
@@ -26,7 +26,6 @@
 using System.Diagnostics;
 using BassBoom.Native.Interop.LowLevel;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/BassBoom.Basolia/Format/Cache/CachedSongInfo.cs b/BassBoom.Basolia/Format/Cache/CachedSongInfo.cs
@@ -17,11 +17,6 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using BassBoom.Basolia.Lyrics;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BassBoom.Basolia.Format.Cache
 {

diff --git a/BassBoom.Basolia/Playback/PlaybackPositioningTools.cs b/BassBoom.Basolia/Playback/PlaybackPositioningTools.cs
@@ -23,10 +23,6 @@
 using BassBoom.Native.Interop.Output;
 using BassBoom.Native.Runtime;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Threading;
 
 namespace BassBoom.Basolia.Playback

diff --git a/BassBoom.Basolia/Playback/PlaybackTools.cs b/BassBoom.Basolia/Playback/PlaybackTools.cs
@@ -21,15 +21,13 @@
 using BassBoom.Native.Interop.Init;
 using BassBoom.Native.Interop.Output;
 using BassBoom.Native.Interop.Play;
-using BassBoom.Native.Interop.LowLevel;
 using BassBoom.Native.Runtime;
 using System;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using BassBoom.Basolia.Devices;
 using System.Runtime.InteropServices;
-using System.Reflection.Metadata;
 
 namespace BassBoom.Basolia.Playback
 {
@@ -69,24 +67,24 @@ public static void Play()
                 var outHandle = Mpg123Instance._out123Handle;
 
                 // First, get formats and reset them
-                var formatInfo = FormatTools.GetFormatInfo();
+                var (rate, channels, encoding) = FormatTools.GetFormatInfo();
                 int resetStatus = NativeOutput.mpg123_format_none(handle);
                 if (resetStatus != (int)mpg123_errors.MPG123_OK)
                     throw new BasoliaException($"Can't reset output encoding", (mpg123_errors)resetStatus);
 
                 // Set the format
-                int formatStatus = NativeOutput.mpg123_format(handle, formatInfo.rate, formatInfo.channels, formatInfo.encoding);
+                int formatStatus = NativeOutput.mpg123_format(handle, rate, channels, encoding);
                 if (formatStatus != (int)mpg123_errors.MPG123_OK)
                     throw new BasoliaException($"Can't set output encoding", (mpg123_errors)formatStatus);
-                Debug.WriteLine($"Format {formatInfo.rate}, {formatInfo.channels}, {formatInfo.encoding}");
+                Debug.WriteLine($"Format {rate}, {channels}, {encoding}");
 
                 // Try to open output to device
                 int openStatus = NativeOutputLib.out123_open(outHandle, DeviceTools.activeDriver, DeviceTools.activeDevice);
                 if (openStatus != (int)out123_error.OUT123_OK)
                     throw new BasoliaOutException($"Can't open output to device {DeviceTools.activeDevice} on driver {DeviceTools.activeDriver}", (out123_error)openStatus);
 
                 // Start the output
-                int startStatus = NativeOutputLib.out123_start(outHandle, formatInfo.rate, formatInfo.channels, formatInfo.encoding);
+                int startStatus = NativeOutputLib.out123_start(outHandle, rate, channels, encoding);
                 if (startStatus != (int)out123_error.OUT123_OK)
                     throw new BasoliaOutException($"Can't start the output.", (out123_error)startStatus);
 
@@ -97,7 +95,6 @@ public static void Play()
                 state = PlaybackState.Playing;
                 do
                 {
-                    int played;
                     int num = 0;
                     int audioBytes = 0;
                     byte[] audio = null;
@@ -109,7 +106,7 @@ public static void Play()
                     // Now, play the MPEG buffer to the device
                     bufferPlaying = true;
                     err = DecodeTools.DecodeFrame(ref num, ref audio, ref audioBytes);
-                    played = PlayBuffer(audio);
+                    PlayBuffer(audio);
                     bufferPlaying = false;
                 } while (err == (int)mpg123_errors.MPG123_OK && Playing);
                 if (Playing)

diff --git a/BassBoom.Native/Interop/Analysis/NativeStatus.cs b/BassBoom.Native/Interop/Analysis/NativeStatus.cs
@@ -16,7 +16,6 @@
 //   You should have received a copy of the GNU General Public License
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-using System;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Play/NativeVolume.cs b/BassBoom.Native/Interop/Play/NativeVolume.cs
@@ -16,7 +16,6 @@
 //   You should have received a copy of the GNU General Public License
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-using System;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom/Views/MainView.axaml.cs b/BassBoom/Views/MainView.axaml.cs
@@ -21,23 +21,10 @@
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Controls.Primitives;
 using Avalonia.Platform.Storage;
-using Avalonia.Threading;
-using BassBoom.Basolia;
-using BassBoom.Basolia.File;
-using BassBoom.Basolia.Format;
-using BassBoom.Basolia.Lyrics;
 using BassBoom.Basolia.Playback;
 using BassBoom.ViewModels;
-using MsBox.Avalonia;
-using MsBox.Avalonia.Enums;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace BassBoom.Views;
 

diff --git a/BassBoom/Views/SelectionWindow.axaml.cs b/BassBoom/Views/SelectionWindow.axaml.cs
@@ -17,7 +17,6 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using Avalonia.Controls;
-using System.Collections.ObjectModel;
 
 namespace BassBoom.Views
 {