rem - Actually, get rid of syn123

--- We no longer need the SYN123 library, because BassBoom's design has changed. This means that we no longer ship SYN123. BassBoom was, is, and will be just a music player, but we'll compensate this by adding online radio support. --- Type: rem Breaking: False Doc Required: False Part: 1/1
Aptivi · May 25, 2024 · d140a88 · d140a88
1 parent 0a8ad7b
commit d140a88
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 703 deletions.
diff --git a/.github/workflows/build-mpg123-mac-arm64.yml b/.github/workflows/build-mpg123-mac-arm64.yml
@@ -37,11 +37,6 @@ jobs:
         with:
           name: "MPG123 library - libout123"
           path: mpg123-1.32.6/src/libout123/.libs/libout123.0.dylib
-      - name: MPG123 artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: "MPG123 library - libsyn123"
-          path: mpg123-1.32.6/src/libsyn123/.libs/libsyn123.0.dylib
       - name: MPG123 artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/BassBoom.Basolia/BasoliaSynException.cs b/BassBoom.Basolia/BasoliaSynException.cs
diff --git a/BassBoom.Basolia/InitBasolia.cs b/BassBoom.Basolia/InitBasolia.cs
@@ -20,7 +20,6 @@
 using BassBoom.Native.Interop;
 using BassBoom.Native.Interop.Init;
 using BassBoom.Native.Interop.Output;
-using BassBoom.Native.Interop.Synthesis;
 using BassBoom.Native.Runtime;
 using System;
 using System.Reflection;
@@ -66,19 +65,6 @@ public static Version OutLibVersion
             }
         }
 
-        /// <summary>
-        /// Synthesis library version
-        /// </summary>
-        public static Version SynLibVersion
-        {
-            get
-            {
-                if (!BasoliaInitialized)
-                    throw new BasoliaSynException("Can't get version until the library is initialized", syn123_error.SYN123_NO_DATA);
-                return LibraryTools.SynLibVersion;
-            }
-        }
-
         /// <summary>
         /// BassBoom's Basolia version
         /// </summary>
@@ -97,9 +83,8 @@ public static void Init(string root = "")
             {
                 string mpg = Mpg123Instance.GetAppropriateMpg123LibraryPath(root);
                 string @out = Mpg123Instance.GetAppropriateOut123LibraryPath(root);
-                string syn = Mpg123Instance.GetAppropriateSyn123LibraryPath(root);
                 string pthreads = Mpg123Instance.GetAppropriateWinpthreadsLibraryPath(root);
-                Mpg123Instance.InitializeLibrary(mpg, @out, syn, pthreads);
+                Mpg123Instance.InitializeLibrary(mpg, @out, pthreads);
             }
             _basoliaInited = true;
         }

diff --git a/BassBoom.Basolia/Synthesis/SynthesisTools.cs b/BassBoom.Basolia/Synthesis/SynthesisTools.cs
diff --git a/BassBoom.Cli/CliBase/Player.cs b/BassBoom.Cli/CliBase/Player.cs
@@ -65,7 +65,6 @@ internal static class Player
         internal static readonly List<CachedSongInfo> cachedInfos = [];
         internal static Version mpgVer;
         internal static Version outVer;
-        internal static Version synVer;
 
         public static void PlayerLoop()
         {
@@ -78,7 +77,6 @@ public static void PlayerLoop()
             // Initialize versions
             mpgVer = InitBasolia.MpgLibVersion;
             outVer = InitBasolia.OutLibVersion;
-            synVer = InitBasolia.SynLibVersion;
 
             // Populate the screen
             Screen playerScreen = new();

diff --git a/BassBoom.Cli/CliBase/PlayerControls.cs b/BassBoom.Cli/CliBase/PlayerControls.cs
@@ -492,7 +492,6 @@ BassBoom specifications
                 Basolia version: {{InitBasolia.BasoliaVersion}}
                 MPG123 version: {{InitBasolia.MpgLibVersion}}
                 OUT123 version: {{InitBasolia.OutLibVersion}}
-                SYN123 version: {{InitBasolia.SynLibVersion}}
 
                 System specifications
                 =====================

diff --git a/BassBoom.Native/Interop/LibraryTools.cs b/BassBoom.Native/Interop/LibraryTools.cs
@@ -19,7 +19,6 @@
 
 using BassBoom.Native.Interop.Init;
 using BassBoom.Native.Interop.Output;
-using BassBoom.Native.Interop.Synthesis;
 using BassBoom.Native.Runtime;
 using System;
 using System.Diagnostics;
@@ -44,12 +43,6 @@ public static unsafe class LibraryTools
         public static string LibraryPathOut =>
             Mpg123Instance.out123LibPath;
 
-        /// <summary>
-        /// Absolute path to the syn123 library
-        /// </summary>
-        public static string LibraryPathSyn =>
-            Mpg123Instance.syn123LibPath;
-
         /// <summary>
         /// MPG library version
         /// </summary>
@@ -80,21 +73,6 @@ public static Version OutLibVersion
             }
         }
 
-        /// <summary>
-        /// Synthesis library version
-        /// </summary>
-        public static Version SynLibVersion
-        {
-            get
-            {
-                uint major = 0, minor = 0, patch = 0;
-                var versionHandle = NativeSynthesis.syn123_distversion(ref major, ref minor, ref patch);
-                string version = Marshal.PtrToStringAnsi(versionHandle);
-                Debug.WriteLine($"syn123 version: {version}");
-                return new((int)major, (int)minor, (int)patch, 0);
-            }
-        }
-
         /// <summary>
         /// C library name (POSIX)
         /// </summary>
@@ -110,11 +88,6 @@ public static Version SynLibVersion
         /// </summary>
         public const string LibraryNameOut = "out123";
 
-        /// <summary>
-        /// Library name to search for upon invoking P/Invoke
-        /// </summary>
-        public const string LibraryNameSyn = "syn123";
-
         /// <summary>
         /// MPG123_EXPORT int mpg123_init (void)
         /// </summary>