From 6b159c8f1d038596194901b59e456e3de1ad0562 Mon Sep 17 00:00:00 2001
From: bsutherland <bsutherland@users.noreply.github.com>
Date: Sun, 14 Feb 2016 09:44:53 +0900
Subject: [PATCH] Upgrade all Juce components to v4.x, add Visual Studio 2015
 build using latest SDK from Steinberg (but still building as VST 2).

---
 JuceOPLVSTi.jucer | 33 +++++++++++++++++++++++++++++++--
 Source/dbopl.cpp  |  4 +---
 readme.md         |  9 +++++----
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/JuceOPLVSTi.jucer b/JuceOPLVSTi.jucer
index 3ae2b64..a532352 100644
--- a/JuceOPLVSTi.jucer
+++ b/JuceOPLVSTi.jucer
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.12.1"
+<JUCERPROJECT id="wUKQiT" name="JuceOPLVSTi" projectType="audioplug" version="0.12.2"
               bundleIdentifier="com.plainweave.JuceOPLVSTi" buildVST="1" buildAU="1"
               pluginName="JuceOPLVSTi" pluginDesc="JuceOPLVSTi" pluginManufacturer="Plainweave Software"
               pluginManufacturerCode="Pwve" pluginCode="JOPL" pluginChannelConfigs="{0, 1}"
@@ -9,7 +9,7 @@
               pluginAUExportPrefix="JuceOPLVSTiAU" pluginRTASCategory="" aaxIdentifier="com.plainweave.JuceOPLVSTi"
               pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="4.1.0"
               buildVST3="0" buildRTAS="0" buildAAX="0" includeBinaryInAppConfig="1"
-              pluginIsMidiEffectPlugin="0">
+              pluginIsMidiEffectPlugin="0" companyWebsite="https://bsutherland.github.io/JuceOPLVSTi/">
   <MAINGROUP id="TOefyq" name="JuceOPLVSTi">
     <GROUP id="{DCA755EB-7953-0641-E719-95C7850E5B2B}" name="Source">
       <FILE id="o0sULY" name="DROMultiplexer.cpp" compile="1" resource="0"
@@ -102,5 +102,34 @@
         <MODULEPATH id="juce_video" path="../Juce/modules"/>
       </MODULEPATHS>
     </VS2013>
+    <VS2015 targetFolder="Builds/VisualStudio2015" vstFolder="C:\code\audio\VST3 SDK"
+            extraCompilerFlags="/wd4458" vst3Folder="">
+      <CONFIGURATIONS>
+        <CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
+                       isDebug="1" optimisation="1" targetName="JuceOPLVSTi"/>
+        <CONFIGURATION name="Release - 64-bit" winWarningLevel="4" generateManifest="1"
+                       winArchitecture="x64" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"
+                       warningsAreErrors="1" headerPath=""/>
+      </CONFIGURATIONS>
+      <MODULEPATHS>
+        <MODULEPATH id="juce_video" path="../Juce/modules"/>
+        <MODULEPATH id="juce_opengl" path="../Juce/modules"/>
+        <MODULEPATH id="juce_gui_extra" path="../Juce/modules"/>
+        <MODULEPATH id="juce_gui_basics" path="../Juce/modules"/>
+        <MODULEPATH id="juce_graphics" path="../Juce/modules"/>
+        <MODULEPATH id="juce_events" path="../Juce/modules"/>
+        <MODULEPATH id="juce_data_structures" path="../Juce/modules"/>
+        <MODULEPATH id="juce_cryptography" path="../Juce/modules"/>
+        <MODULEPATH id="juce_core" path="../Juce/modules"/>
+        <MODULEPATH id="juce_audio_processors" path="../Juce/modules"/>
+        <MODULEPATH id="juce_audio_plugin_client" path="../Juce/modules"/>
+        <MODULEPATH id="juce_audio_formats" path="../Juce/modules"/>
+        <MODULEPATH id="juce_audio_devices" path="../Juce/modules"/>
+        <MODULEPATH id="juce_audio_basics" path="../Juce/modules"/>
+      </MODULEPATHS>
+    </VS2015>
   </EXPORTFORMATS>
+  <LIVE_SETTINGS>
+    <WINDOWS/>
+  </LIVE_SETTINGS>
 </JUCERPROJECT>
diff --git a/Source/dbopl.cpp b/Source/dbopl.cpp
index 2ac86c6..7deaead 100644
--- a/Source/dbopl.cpp
+++ b/Source/dbopl.cpp
@@ -1212,9 +1212,7 @@ void Chip::GenerateBlock3( Bitu total, Bit32s* output  ) {
 }
 
 void Chip::Setup( Bit32u rate ) {
-	double original = OPLRATE;
-//	double original = rate;
-	double scale = original / (double)rate;
+	double scale = OPLRATE / (double)rate;
 
 	//Noise counter is run at the same precision as general waves
 	noiseAdd = (Bit32u)( 0.5 + scale * ( 1 << LFO_SH ) );
diff --git a/readme.md b/readme.md
index 0d78d20..29ac97c 100644
--- a/readme.md
+++ b/readme.md
@@ -81,11 +81,12 @@ So far I've only built under Windows. Thanks to the hard work of Jeff Russ, ther
 ### Windows Build Instructions ###
 
 1. Download Juce (http://www.juce.com/)
-2. Download the VST SDK (http://www.steinberg.net/en/company/developer.html)
+2. Download the VST SDK (http://www.steinberg.net/en/company/developers.html)
 3. Run "The Projucer" executable included in Juce.
 4. Open JuceOPLVSTi.jucer
    - Make any changes to the GUI layout and components here (PluginEditor.cpp).
    - Save PluginEditor.cpp if modified
-5. Hit "Save Project and Open in Visual Studio". I use Visual Studio Express 2013.
-6. (For Windows XP compatibility) In the project's properties, set platform toolset to Windows XP (Configuration Properties > General).
-7. Build!
+5. Hit "Save Project and Open in Visual Studio". I use Visual Studio Express 2015.
+6. Select the build: "Release - 64-bit" and set platform to x64.
+7. (Optional, for Windows XP compatibility) In the project's properties, set platform toolset to Windows XP (Configuration Properties > General).
+8. Build!