ref - Cleanup

Aptivi · Aug 29, 2023 · d85e306 · d85e306
1 parent c40f17d
commit d85e306
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 68 deletions.
diff --git a/BassBoom.Basolia/Format/AudioInfoTools.cs b/BassBoom.Basolia/Format/AudioInfoTools.cs
@@ -18,14 +18,7 @@
 
 using BassBoom.Native.Runtime;
 using BassBoom.Native.Interop.Analysis;
-using BassBoom.Native.Interop.Play;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using BassBoom.Native.Interop.Init;
-using BassBoom.Basolia.File;
 
 namespace BassBoom.Basolia.Format
 {

diff --git a/BassBoom.Basolia/Format/FormatTools.cs b/BassBoom.Basolia/Format/FormatTools.cs
@@ -17,15 +17,8 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using BassBoom.Native.Runtime;
-using BassBoom.Native.Interop.Analysis;
 using BassBoom.Native.Interop.Play;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using BassBoom.Native.Interop.Init;
-using BassBoom.Basolia.File;
 
 namespace BassBoom.Basolia.Format
 {

diff --git a/BassBoom.Basolia/Playback/PlaybackTools.cs b/BassBoom.Basolia/Playback/PlaybackTools.cs
@@ -24,10 +24,7 @@
 using BassBoom.Native.Interop.LowLevel;
 using BassBoom.Native.Runtime;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using BassBoom.Basolia.Devices;
 

diff --git a/BassBoom.Native/Interop/Analysis/NativeFormats.cs b/BassBoom.Native/Interop/Analysis/NativeFormats.cs
@@ -1,5 +1,4 @@
-
-//   BassBoom  Copyright (C) 2023  Aptivi
+//   BassBoom  Copyright (C) 2023  Aptivi
 // 
 //   This file is part of BassBoom
 // 
@@ -16,12 +15,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.Collections.Generic;
-using System.Text;
-using System.Runtime.InteropServices;
-using BassBoom.Native.Interop.Init;
-
 namespace BassBoom.Native.Interop.Analysis
 {
     public enum mpg123_enc_enum

diff --git a/BassBoom.Native/Interop/Analysis/NativeMetadata.cs b/BassBoom.Native/Interop/Analysis/NativeMetadata.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Analysis/NativeParameters.cs b/BassBoom.Native/Interop/Analysis/NativeParameters.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Analysis/NativeStatus.cs b/BassBoom.Native/Interop/Analysis/NativeStatus.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Init/NativeDecoder.cs b/BassBoom.Native/Interop/Init/NativeDecoder.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace BassBoom.Native.Interop.Init

diff --git a/BassBoom.Native/Interop/Init/NativeError.cs b/BassBoom.Native/Interop/Init/NativeError.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace BassBoom.Native.Interop.Init
@@ -85,13 +82,14 @@ public static unsafe class NativeError
         /// MPG123_EXPORT const char* mpg123_plain_strerror(int errcode);
         /// </summary>
         [DllImport(LibraryTools.LibraryName, CharSet = CharSet.Ansi)]
-        internal static extern IntPtr mpg123_plain_strerror(int errcode);
+        [return: MarshalAs(UnmanagedType.LPStr)]
+        internal static extern string mpg123_plain_strerror(int errcode);
 
         /// <summary>
         /// MPG123_EXPORT const char* mpg123_strerror(mpg123_handle *mh);
         /// </summary>
         [DllImport(LibraryTools.LibraryName, CharSet = CharSet.Ansi)]
-        internal static extern IntPtr mpg123_strerror(mpg123_handle* mh);
+        internal static extern string mpg123_strerror(mpg123_handle* mh);
 
         /// <summary>
         /// MPG123_EXPORT int mpg123_errcode(mpg123_handle *mh);

diff --git a/BassBoom.Native/Interop/Init/NativeInit.cs b/BassBoom.Native/Interop/Init/NativeInit.cs
@@ -17,8 +17,6 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 
 namespace BassBoom.Native.Interop.Init

diff --git a/BassBoom.Native/Interop/LowLevel/NativeLowIo.cs b/BassBoom.Native/Interop/LowLevel/NativeLowIo.cs
@@ -17,8 +17,6 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Output/NativeOutputLib.cs b/BassBoom.Native/Interop/Output/NativeOutputLib.cs
@@ -17,10 +17,7 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
-using BassBoom.Native.Interop.Init;
 using BassBoom.Native.Interop.Analysis;
 
 namespace BassBoom.Native.Interop.Output
@@ -119,7 +116,7 @@ public static unsafe class NativeOutputLib
         /// MPG123_EXPORT const char* out123_strerror(out123_handle *ao);
         /// </summary>
         [DllImport(LibraryTools.LibraryNameOut, CharSet = CharSet.Ansi)]
-        internal static extern IntPtr out123_strerror(out123_handle* ao);
+        internal static extern string out123_strerror(out123_handle* ao);
 
         /// <summary>
         /// MPG123_EXPORT int out123_errcode(out123_handle *ao);
@@ -131,7 +128,7 @@ public static unsafe class NativeOutputLib
         /// MPG123_EXPORT const char* out123_plain_strerror(int errcode);
         /// </summary>
         [DllImport(LibraryTools.LibraryNameOut, CharSet = CharSet.Ansi)]
-        internal static extern IntPtr out123_plain_strerror(int errcode);
+        internal static extern string out123_plain_strerror(int errcode);
 
         /// <summary>
         /// MPG123_EXPORT int out123_set_buffer(out123_handle *ao, size_t buffer_bytes);

diff --git a/BassBoom.Native/Interop/Play/NativeInput.cs b/BassBoom.Native/Interop/Play/NativeInput.cs
@@ -17,8 +17,6 @@
 //   along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Play/NativeOutput.cs b/BassBoom.Native/Interop/Play/NativeOutput.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Interop/Play/NativePositioning.cs b/BassBoom.Native/Interop/Play/NativePositioning.cs
@@ -16,9 +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.Collections.Generic;
-using System.Text;
 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,9 +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.Collections.Generic;
-using System.Text;
 using System.Runtime.InteropServices;
 using BassBoom.Native.Interop.Init;
 

diff --git a/BassBoom.Native/Runtime/Mpg123Instance.cs b/BassBoom.Native/Runtime/Mpg123Instance.cs
@@ -20,9 +20,7 @@
 using BassBoom.Native.Interop;
 using BassBoom.Native.Interop.Init;
 using BassBoom.Native.Interop.Output;
-using Microsoft.Win32.SafeHandles;
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;

diff --git a/BassBoom/Views/MainView.axaml.cs b/BassBoom/Views/MainView.axaml.cs
@@ -19,7 +19,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Input;
 using Avalonia.Interactivity;
 using BassBoom.Basolia;
 using BassBoom.Basolia.Devices;

diff --git a/BassBoom/Views/MainWindow.axaml.cs b/BassBoom/Views/MainWindow.axaml.cs
@@ -18,8 +18,6 @@
 
 using Avalonia.Controls;
 using BassBoom.Basolia;
-using BassBoom.Basolia.File;
-using BassBoom.Basolia.Format;
 
 namespace BassBoom.Views;
 
@@ -31,4 +29,4 @@ public MainWindow()
             InitBasolia.Init();
         InitializeComponent();
     }
-}
+}