use external lib for FM audio

clean-up
fedex81 · Jan 5, 2020 · 04fc31e · 04fc31e
1 parent 5d35ed3
commit 04fc31e
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 3,335 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 docs/**
 vgm/**
-native/**
+/out/
+/.idea/
diff --git a/lib/fmAudio-1.00.jar b/lib/fmAudio-1.00.jar
diff --git a/lib/jnaerator-0.12-shaded.jar b/lib/jnaerator-0.12-shaded.jar
diff --git a/simplevgm.iml b/simplevgm.iml
@@ -14,30 +14,14 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/commons-math3-3.6.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/iirj-1.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jnaerator-0.12-shaded.jar!/" />
+          <root url="file://$MODULE_DIR$/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/jnaerator-0.12-shaded.jar!/" />
+          <root url="file://$MODULE_DIR$/lib" />
         </SOURCES>
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
+        <jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
   </component>

diff --git a/src/uk/co/omgdrv/simplevgm/VgmEmu.java b/src/uk/co/omgdrv/simplevgm/VgmEmu.java
@@ -15,7 +15,7 @@
 Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
 
 import uk.co.omgdrv.simplevgm.fm.MdFmProvider;
-import uk.co.omgdrv.simplevgm.fm.YM2612;
+import uk.co.omgdrv.simplevgm.fm.nukeykt.Ym2612Nuke;
 import uk.co.omgdrv.simplevgm.fm.ym2413.Ym2413Provider;
 import uk.co.omgdrv.simplevgm.model.VgmFmProvider;
 import uk.co.omgdrv.simplevgm.model.VgmHeader;
@@ -71,7 +71,7 @@ protected int parseHeader(byte[] data)
         fm_clock_rate = vgmHeader.getYm2612Clk();
         if (fm_clock_rate > 0)
         {
-            fm = fm == VgmFmProvider.NO_SOUND ? new YM2612() : fm;
+            fm = fm == VgmFmProvider.NO_SOUND ? new Ym2612Nuke() : fm;
             buf.setVolume(0.7);
             fm.init(fm_clock_rate, sampleRate());
         }

diff --git a/src/uk/co/omgdrv/simplevgm/fm/nukeykt/IYm3438.java b/src/uk/co/omgdrv/simplevgm/fm/nukeykt/IYm3438.java