WIP

stevehjohn · Aug 16, 2024 · 55b80ea · 55b80ea
1 parent 52d6aa4
commit 55b80ea
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/Zen.System/bass.dll → src/Zen.System/Libraries/libbass.dll b/src/Zen.System/bass.dll → src/Zen.System/Libraries/libbass.dll
diff --git a/src/Zen.System/libbass.dylib → src/Zen.System/Libraries/libbass.dylib b/src/Zen.System/libbass.dylib → src/Zen.System/Libraries/libbass.dylib
diff --git a/src/Zen.System/libbass.so.arm64 → src/Zen.System/Libraries/libbass.so.arm64 b/src/Zen.System/libbass.so.arm64 → src/Zen.System/Libraries/libbass.so.arm64
diff --git a/src/Zen.System/libbass.so.x64 → src/Zen.System/Libraries/libbass.so.x64 b/src/Zen.System/libbass.so.x64 → src/Zen.System/Libraries/libbass.so.x64
diff --git a/src/Zen.System/libportaudio.dll → src/Zen.System/Libraries/libportaudio.dll b/src/Zen.System/libportaudio.dll → src/Zen.System/Libraries/libportaudio.dll
diff --git a/src/Zen.System/libportaudio.dylib → src/Zen.System/Libraries/libportaudio.dylib b/src/Zen.System/libportaudio.dylib → src/Zen.System/Libraries/libportaudio.dylib
diff --git a/src/Zen.System/libportaudio.so → src/Zen.System/Libraries/libportaudio.so b/src/Zen.System/libportaudio.so → src/Zen.System/Libraries/libportaudio.so
diff --git a/src/Zen.System/Modules/Audio/Engines/Bass/ManagedBass.cs b/src/Zen.System/Modules/Audio/Engines/Bass/ManagedBass.cs
@@ -4,28 +4,28 @@ namespace Zen.System.Modules.Audio.Engines.Bass;
 
 public static class ManagedBass
 {
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     [return: MarshalAs((UnmanagedType) 2)]
     public static extern bool BASS_Init(int device, int freq, BassInit flags, IntPtr win);
 
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     public static extern int BASS_SampleCreate(int length, int freq, int chans, int max, BassFlag flags);
 
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     [return: MarshalAs((UnmanagedType) 2)]
     public static extern bool BASS_SampleSetData(int handle, float[] buffer);
 
-    [DllImport("bass", CharSet = CharSet.Unicode)]
+    [DllImport("Libraries/libbass", CharSet = CharSet.Unicode)]
     public static extern int BASS_SampleGetChannel(int handle, BassFlag flags);
 
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     public static extern int BASS_ChannelSetSync(int handle, BassSync type, long param, SyncProc proc, IntPtr user);
 
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     [return: MarshalAs((UnmanagedType) 2)]
     public static extern bool BASS_ChannelPlay(int handle, [MarshalAs((UnmanagedType) 2)] bool restart);
 
-    [DllImport("bass")]
+    [DllImport("Libraries/libbass")]
     [return: MarshalAs((UnmanagedType) 2)]
     public static extern bool BASS_Free();
 

diff --git a/src/Zen.System/Zen.System.csproj b/src/Zen.System/Zen.System.csproj
@@ -21,25 +21,25 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="libbass.dylib">
+    <None Update="Libraries\libbass.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libbass.so.arm64">
+    <None Update="Libraries\libbass.so.arm64">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="bass.dll">
+    <None Update="Libraries\libbass.so.x64">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libbass.so.x64">
+    <None Update="Libraries\libportaudio.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libportaudio.dll">
+    <None Update="Libraries\libportaudio.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libportaudio.dylib">
+    <None Update="Libraries\libportaudio.so">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="libportaudio.so">
+    <None Update="Libraries\libbass.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>