Removed broken OptimFrog support

webmaster442 · Nov 5, 2016 · 1d9eeac · 1d9eeac
1 parent 594703a
commit 1d9eeac
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#1.07 - 2016.11.05
+ * Fixed broken bassmidi.dll
+ * Removed OFR support, because the current version of the bass plugin is broken, will reenable it when it's fixed
+
 #1.06 - 2016.11.04
 
  * Added options dialog, with various settings

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Code compiles with Visual Studio Community
 
 ##Features
 
-* Supports various audio formats: MP3, MP4, AAC, OGG, WAV, FLAC, WavPack, Apple Lossless (ALAC), WMA, AC3, CDDA, APE, MPC, MP+, MPP, OFR, OFS, SPX, TTA, DSF, OPUS
+* Supports various audio formats: MP3, MP4, AAC, OGG, WAV, FLAC, WavPack, Apple Lossless (ALAC), WMA, AC3, CDDA, APE, MPC, MP+, MPP, SPX, TTA, DSF, OPUS
 * Support MIDI & tracker files playback: midi, mid, rmi, kar, xm, it, s3m, mod, mtm, umx, .mo3
 * Supports various playlist formats: PLS, M3U, WPL
 * 64 bit & 32 bit support

diff --git a/TCPlayer/Code/Native.cs b/TCPlayer/Code/Native.cs
@@ -33,6 +33,12 @@ internal class Native
         // Unregisters the hot key with Windows.
         [DllImport("user32.dll")]
         public static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        [DllImport("kernel32.dll", EntryPoint = "LoadLibrary")]
+        public static extern IntPtr LoadLibrary(string DllToLoad);
+
+        [DllImport("kernel32.dll", EntryPoint = "FreeLibrary")]
+        public static extern bool FreeLibrary(IntPtr hLib);
     }
 
 

diff --git a/TCPlayer/Code/Player.cs b/TCPlayer/Code/Player.cs
@@ -18,14 +18,12 @@ You should have received a copy of the GNU General Public License
  */
 using ManagedBass;
 using ManagedBass.Cd;
-using ManagedBass.DirectX8;
 using ManagedBass.Fx;
 using ManagedBass.Midi;
 using ManagedBass.Mix;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.InteropServices;
 
 namespace TCPlayer.Code
 {
@@ -55,7 +53,6 @@ public Player()
             Bass.PluginLoad(enginedir + "\\bass_ac3.dll");
             Bass.PluginLoad(enginedir + "\\bass_ape.dll");
             Bass.PluginLoad(enginedir + "\\bass_mpc.dll");
-            Bass.PluginLoad(enginedir + "\\bass_ofr.dll");
             Bass.PluginLoad(enginedir + "\\bass_spx.dll");
             Bass.PluginLoad(enginedir + "\\bass_tta.dll");
             Bass.PluginLoad(enginedir + "\\bassalac.dll");

diff --git a/TCPlayer/Engine/x64/OptimFROG.dll b/TCPlayer/Engine/x64/OptimFROG.dll
diff --git a/TCPlayer/Engine/x64/bass_ofr.dll b/TCPlayer/Engine/x64/bass_ofr.dll
diff --git a/TCPlayer/Engine/x86/OptimFROG.dll b/TCPlayer/Engine/x86/OptimFROG.dll
diff --git a/TCPlayer/Engine/x86/bass_ofr.dll b/TCPlayer/Engine/x86/bass_ofr.dll
diff --git a/TCPlayer/TCPlayer.csproj b/TCPlayer/TCPlayer.csproj
@@ -470,18 +470,12 @@
     <Content Include="Engine\x64\bass_mpc.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Engine\x64\bass_ofr.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Engine\x64\bass_spx.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Engine\x64\bass_tta.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Engine\x64\OptimFROG.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Engine\x64\tags.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -530,18 +524,12 @@
     <Content Include="Engine\x86\bass_mpc.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Engine\x86\bass_ofr.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Engine\x86\bass_spx.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Engine\x86\bass_tta.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Engine\x86\OptimFROG.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Engine\x86\tags.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>