mirrors/OPL
2
0
Fork 0
Code Activity

No significant changes, just silencing warnings by minor modifications and replacements of deprecated juce methods.

Browse source
This commit is contained in:
Jeff-Russ 2015-02-13 13:08:38 -05:00
parent 637e49fc53
commit 2fcf6c6395
6 changed files with 2251 additions and 2218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
JuceOPLVSTi.jucer
View file

@ -17,25 +17,20 @@
<FILE id="b9ci03" name="itoa.h" compile="0" resource="0" file="Source/itoa.h"/> <FILE id="b9ci03" name="itoa.h" compile="0" resource="0" file="Source/itoa.h"/>
<FILE id="zqVgdd" name="windows.h" compile="0" resource="0" file="Source/windows.h"/> <FILE id="zqVgdd" name="windows.h" compile="0" resource="0" file="Source/windows.h"/>
</GROUP> </GROUP>
<GROUP id="{5B100E11-BFF8-326B-F805-37178229BDAA}" name="introjucer"> <GROUP id="{04EB9715-F5C8-AD8A-9B89-2832B524778C}" name="modified">
<FILE id="SyIvF1" name="PluginGui.cpp" compile="1" resource="0" file="Source/PluginGui.cpp"/> <FILE id="SyIvF1" name="PluginGui.cpp" compile="1" resource="0" file="Source/PluginGui.cpp"/>
<FILE id="Phxzxb" name="PluginProcessor.cpp" compile="1" resource="0" <FILE id="Phxzxb" name="PluginProcessor.cpp" compile="1" resource="0"
file="Source/PluginProcessor.cpp"/> file="Source/PluginProcessor.cpp"/>
<FILE id="IvGocs" name="PluginProcessor.h" compile="0" resource="0"
file="Source/PluginProcessor.h"/>
<FILE id="a2DQGI" name="PluginGui.h" compile="0" resource="0" file="Source/PluginGui.h"/>
</GROUP>
<GROUP id="{04EB9715-F5C8-AD8A-9B89-2832B524778C}" name="modified">
<FILE id="o0sULY" name="DROMultiplexer.cpp" compile="1" resource="0" <FILE id="o0sULY" name="DROMultiplexer.cpp" compile="1" resource="0"
file="Source/DROMultiplexer.cpp"/> file="Source/DROMultiplexer.cpp"/>
<FILE id="cULQN7" name="DROMultiplexer.h" compile="0" resource="0" <FILE id="cULQN7" name="DROMultiplexer.h" compile="0" resource="0"
file="Source/DROMultiplexer.h"/> file="Source/DROMultiplexer.h"/>
<FILE id="c6G4EF" name="config.h" compile="0" resource="0" file="Source/config.h"/> <FILE id="c6G4EF" name="config.h" compile="0" resource="0" file="Source/config.h"/>
<FILE id="hjHmNq" name="zdopl.cpp" compile="1" resource="0" file="Source/zdopl.cpp"/> <FILE id="hjHmNq" name="zdopl.cpp" compile="1" resource="0" file="Source/zdopl.cpp"/>
<FILE id="TnpE3r" name="dbopl.cpp" compile="1" resource="0" file="Source/dbopl.cpp"/>
</GROUP> </GROUP>
<GROUP id="{6B1E4F6E-4D95-CAB5-DAD3-E894F5CA0730}" name="DOSBox"> <GROUP id="{6B1E4F6E-4D95-CAB5-DAD3-E894F5CA0730}" name="DOSBox">
<FILE id="BZFxoj" name="adlib.h" compile="0" resource="0" file="Source/adlib.h"/> <FILE id="BZFxoj" name="adlib.h" compile="0" resource="0" file="Source/adlib.h"/>
<FILE id="TnpE3r" name="dbopl.cpp" compile="1" resource="0" file="Source/dbopl.cpp"/>
<FILE id="r3zBZz" name="dbopl.h" compile="0" resource="0" file="Source/dbopl.h"/> <FILE id="r3zBZz" name="dbopl.h" compile="0" resource="0" file="Source/dbopl.h"/>
<FILE id="pXX3j1" name="dosbox.h" compile="0" resource="0" file="Source/dosbox.h"/> <FILE id="pXX3j1" name="dosbox.h" compile="0" resource="0" file="Source/dosbox.h"/>
<FILE id="TLHYVa" name="hardware.h" compile="0" resource="0" file="Source/hardware.h"/> <FILE id="TLHYVa" name="hardware.h" compile="0" resource="0" file="Source/hardware.h"/>
@ -46,6 +41,9 @@
<FILE id="ep2XEF" name="setup.h" compile="0" resource="0" file="Source/setup.h"/> <FILE id="ep2XEF" name="setup.h" compile="0" resource="0" file="Source/setup.h"/>
<FILE id="aR7Eu7" name="mixer.h" compile="0" resource="0" file="Source/mixer.h"/> <FILE id="aR7Eu7" name="mixer.h" compile="0" resource="0" file="Source/mixer.h"/>
</GROUP> </GROUP>
<FILE id="IvGocs" name="PluginProcessor.h" compile="0" resource="0"
file="Source/PluginProcessor.h"/>
<FILE id="a2DQGI" name="PluginGui.h" compile="0" resource="0" file="Source/PluginGui.h"/>
<FILE id="KRj0DZ" name="tests.cpp" compile="1" resource="0" file="Source/tests.cpp"/> <FILE id="KRj0DZ" name="tests.cpp" compile="1" resource="0" file="Source/tests.cpp"/>
<FILE id="TQyCKv" name="zdopl.h" compile="0" resource="0" file="Source/zdopl.h"/> <FILE id="TQyCKv" name="zdopl.h" compile="0" resource="0" file="Source/zdopl.h"/>
<FILE id="LVSdHL" name="InstrumentLoader.h" compile="0" resource="0" <FILE id="LVSdHL" name="InstrumentLoader.h" compile="0" resource="0"
@ -97,20 +95,20 @@
winArchitecture="32-bit" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"/> winArchitecture="32-bit" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../Juce/modules"/> <MODULEPATH id="juce_audio_devices" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_devices" path="../Juce/modules"/> <MODULEPATH id="juce_audio_formats" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_formats" path="../Juce/modules"/> <MODULEPATH id="juce_audio_plugin_client" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_plugin_client" path="../Juce/modules"/> <MODULEPATH id="juce_audio_processors" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_processors" path="../Juce/modules"/> <MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_core" path="../Juce/modules"/> <MODULEPATH id="juce_cryptography" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_cryptography" path="../Juce/modules"/> <MODULEPATH id="juce_data_structures" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_data_structures" path="../Juce/modules"/> <MODULEPATH id="juce_events" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_events" path="../Juce/modules"/> <MODULEPATH id="juce_graphics" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_graphics" path="../Juce/modules"/> <MODULEPATH id="juce_gui_basics" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_gui_basics" path="../Juce/modules"/> <MODULEPATH id="juce_gui_extra" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_gui_extra" path="../Juce/modules"/> <MODULEPATH id="juce_opengl" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_opengl" path="../Juce/modules"/> <MODULEPATH id="juce_video" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_video" path="../Juce/modules"/> <MODULEPATH id="juce_audio_basics" path="JuceLibraryCode/modules"/>
</MODULEPATHS> </MODULEPATHS>
</VS2013> </VS2013>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" postbuildCommand="&#13;&#10;# This script takes the build product and copies it to the AU, VST, VST3, RTAS and AAX folders, depending on &#13;&#10;# which plugin types you've built&#13;&#10;&#13;&#10;original=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME&#13;&#10;&#13;&#10;# this looks inside the binary to detect which platforms are needed.. &#13;&#10;copyAU=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'AudioUnit' | wc -l&#96;&#13;&#10;copyVST=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'VSTPlugin' | wc -l&#96;&#13;&#10;copyVST3=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'GetPluginFactory' | wc -l&#96;&#13;&#10;copyRTAS=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'CProcess' | wc -l&#96;&#13;&#10;copyAAX=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'ACFStartup' | wc -l&#96;&#13;&#10;&#13;&#10;if [ $copyAU -gt 0 ]; then&#13;&#10; echo &quot;Copying to AudioUnit folder...&quot;&#13;&#10; AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component&#13;&#10; if [ -d &quot;$AU&quot; ]; then &#13;&#10; rm -r &quot;$AU&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$AU&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$AU/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$AU/Contents/$INFOPLIST_FILE&quot;&#13;&#10;&#13;&#10; # Fix info.plist for AUs built with Xcode 3&#13;&#10; if [ -f &quot;$DEVELOPER_DIR/Library/Developer/CoreAudio/AudioUnits/AUPublic/AUBase/AUPlugInDispatch.cpp&quot; ]; then&#13;&#10; echo&#13;&#10; else&#13;&#10; echo &quot;Removing AudioComponents entry from Info.plist because this is not a new-format AU&quot;&#13;&#10; /usr/libexec/PlistBuddy -c &quot;Delete AudioComponents&quot; &quot;$AU/Contents/Info.plist&quot;&#13;&#10; fi&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyVST -gt 0 ]; then&#13;&#10; echo &quot;Copying to VST folder...&quot;&#13;&#10; VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst&#13;&#10; if [ -d &quot;$VST&quot; ]; then &#13;&#10; rm -r &quot;$VST&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$VST&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$VST/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$VST/Contents/$INFOPLIST_FILE&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyVST3 -gt 0 ]; then&#13;&#10; echo &quot;Copying to VST3 folder...&quot;&#13;&#10; VST3=~/Library/Audio/Plug-Ins/VST3/$PRODUCT_NAME.vst3&#13;&#10; if [ -d &quot;$VST3&quot; ]; then &#13;&#10; rm -r &quot;$VST3&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$VST3&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$VST3/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$VST3/Contents/$INFOPLIST_FILE&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyRTAS -gt 0 ]; then&#13;&#10; echo &quot;Copying to RTAS folder...&quot;&#13;&#10; RTAS=/Library/Application\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm&#13;&#10; if [ -d &quot;$RTAS&quot; ]; then&#13;&#10; rm -r &quot;$RTAS&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$RTAS&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyAAX -gt 0 ]; then&#13;&#10; echo &quot;Copying to AAX folder...&quot;&#13;&#10;&#13;&#10; if [ -d &quot;/Applications/ProTools_3PDev/Plug-Ins&quot; ]; then&#13;&#10; AAX1=&quot;/Applications/ProTools_3PDev/Plug-Ins/$PRODUCT_NAME.aaxplugin&quot;&#13;&#10;&#13;&#10; if [ -d &quot;$AAX1&quot; ]; then&#13;&#10; rm -r &quot;$AAX1&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -R -H &quot;$original&quot; &quot;$AAX1&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; if [ -d &quot;/Library/Application Support/Avid/Audio/Plug-Ins&quot; ]; then&#13;&#10; AAX2=&quot;/Library/Application Support/Avid/Audio/Plug-Ins/$PRODUCT_NAME.aaxplugin&quot;&#13;&#10;&#13;&#10; if [ -d &quot;$AAX2&quot; ]; then&#13;&#10; rm -r &quot;$AAX2&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -R -H &quot;$original&quot; &quot;$AAX2&quot;&#13;&#10; fi&#13;&#10;fi&#13;&#10;"> <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" postbuildCommand="&#13;&#10;# This script takes the build product and copies it to the AU, VST, VST3, RTAS and AAX folders, depending on &#13;&#10;# which plugin types you've built&#13;&#10;&#13;&#10;original=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME&#13;&#10;&#13;&#10;# this looks inside the binary to detect which platforms are needed.. &#13;&#10;copyAU=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'AudioUnit' | wc -l&#96;&#13;&#10;copyVST=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'VSTPlugin' | wc -l&#96;&#13;&#10;copyVST3=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'GetPluginFactory' | wc -l&#96;&#13;&#10;copyRTAS=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'CProcess' | wc -l&#96;&#13;&#10;copyAAX=&#96;nm -g &quot;$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH&quot; | grep -i 'ACFStartup' | wc -l&#96;&#13;&#10;&#13;&#10;if [ $copyAU -gt 0 ]; then&#13;&#10; echo &quot;Copying to AudioUnit folder...&quot;&#13;&#10; AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component&#13;&#10; if [ -d &quot;$AU&quot; ]; then &#13;&#10; rm -r &quot;$AU&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$AU&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$AU/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$AU/Contents/$INFOPLIST_FILE&quot;&#13;&#10;&#13;&#10; # Fix info.plist for AUs built with Xcode 3&#13;&#10; if [ -f &quot;$DEVELOPER_DIR/Library/Developer/CoreAudio/AudioUnits/AUPublic/AUBase/AUPlugInDispatch.cpp&quot; ]; then&#13;&#10; echo&#13;&#10; else&#13;&#10; echo &quot;Removing AudioComponents entry from Info.plist because this is not a new-format AU&quot;&#13;&#10; /usr/libexec/PlistBuddy -c &quot;Delete AudioComponents&quot; &quot;$AU/Contents/Info.plist&quot;&#13;&#10; fi&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyVST -gt 0 ]; then&#13;&#10; echo &quot;Copying to VST folder...&quot;&#13;&#10; VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst&#13;&#10; if [ -d &quot;$VST&quot; ]; then &#13;&#10; rm -r &quot;$VST&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$VST&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$VST/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$VST/Contents/$INFOPLIST_FILE&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyVST3 -gt 0 ]; then&#13;&#10; echo &quot;Copying to VST3 folder...&quot;&#13;&#10; VST3=~/Library/Audio/Plug-Ins/VST3/$PRODUCT_NAME.vst3&#13;&#10; if [ -d &quot;$VST3&quot; ]; then &#13;&#10; rm -r &quot;$VST3&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$VST3&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMwPTul/BNDLPTul/g' &quot;$VST3/Contents/PkgInfo&quot;&#13;&#10; sed -i &quot;&quot; -e 's/TDMw/BNDL/g' &quot;$VST3/Contents/$INFOPLIST_FILE&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyRTAS -gt 0 ]; then&#13;&#10; echo &quot;Copying to RTAS folder...&quot;&#13;&#10; RTAS=/Library/Application\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm&#13;&#10; if [ -d &quot;$RTAS&quot; ]; then&#13;&#10; rm -r &quot;$RTAS&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -r &quot;$original&quot; &quot;$RTAS&quot;&#13;&#10;fi&#13;&#10;&#13;&#10;if [ $copyAAX -gt 0 ]; then&#13;&#10; echo &quot;Copying to AAX folder...&quot;&#13;&#10;&#13;&#10; if [ -d &quot;/Applications/ProTools_3PDev/Plug-Ins&quot; ]; then&#13;&#10; AAX1=&quot;/Applications/ProTools_3PDev/Plug-Ins/$PRODUCT_NAME.aaxplugin&quot;&#13;&#10;&#13;&#10; if [ -d &quot;$AAX1&quot; ]; then&#13;&#10; rm -r &quot;$AAX1&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -R -H &quot;$original&quot; &quot;$AAX1&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; if [ -d &quot;/Library/Application Support/Avid/Audio/Plug-Ins&quot; ]; then&#13;&#10; AAX2=&quot;/Library/Application Support/Avid/Audio/Plug-Ins/$PRODUCT_NAME.aaxplugin&quot;&#13;&#10;&#13;&#10; if [ -d &quot;$AAX2&quot; ]; then&#13;&#10; rm -r &quot;$AAX2&quot;&#13;&#10; fi&#13;&#10;&#13;&#10; cp -R -H &quot;$original&quot; &quot;$AAX2&quot;&#13;&#10; fi&#13;&#10;fi&#13;&#10;">
@ -121,20 +119,20 @@
isDebug="0" optimisation="2" targetName="JuceOPL" cppLibType="libc++"/> isDebug="0" optimisation="2" targetName="JuceOPL" cppLibType="libc++"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_video" path="../../juce"/> <MODULEPATH id="juce_video" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_opengl" path="../../juce"/> <MODULEPATH id="juce_opengl" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_gui_extra" path="../../juce"/> <MODULEPATH id="juce_gui_extra" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_gui_basics" path="../../juce"/> <MODULEPATH id="juce_gui_basics" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_graphics" path="../../juce"/> <MODULEPATH id="juce_graphics" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_events" path="../../juce"/> <MODULEPATH id="juce_events" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_data_structures" path="../../juce"/> <MODULEPATH id="juce_data_structures" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_cryptography" path="../../juce"/> <MODULEPATH id="juce_cryptography" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_core" path="../../juce"/> <MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_processors" path="../../juce"/> <MODULEPATH id="juce_audio_processors" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_plugin_client" path="../../juce"/> <MODULEPATH id="juce_audio_plugin_client" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_formats" path="../../juce"/> <MODULEPATH id="juce_audio_formats" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_devices" path="../../juce"/> <MODULEPATH id="juce_audio_devices" path="JuceLibraryCode/modules"/>
<MODULEPATH id="juce_audio_basics" path="../../juce"/> <MODULEPATH id="juce_audio_basics" path="JuceLibraryCode/modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
</EXPORTFORMATS> </EXPORTFORMATS>

128
Source/PluginGui.cpp
View file

@ -29,46 +29,56 @@ void PluginGui::updateFromParameters()
emulatorSlider->setValue(processor->getEnumParameter("Emulator"), juce::NotificationType::dontSendNotification); emulatorSlider->setValue(processor->getEnumParameter("Emulator"), juce::NotificationType::dontSendNotification);
setRecordButtonState(processor->isThisInstanceRecording()); setRecordButtonState(processor->isThisInstanceRecording());
sineImageButton->setToggleState(false, false); /// setToggleState(bool, bool) is deprecated.
halfsineImageButton->setToggleState(false, false); /// Jeff-Russ replaced the second arg of "false" with dontSendNotification:
abssineImageButton->setToggleState(false, false);
quartersineImageButton->setToggleState(false, false); sineImageButton->setToggleState(false, dontSendNotification);
alternatingsineImageButton->setToggleState(false, false); halfsineImageButton->setToggleState(false, dontSendNotification);
camelsineImageButton->setToggleState(false, false); abssineImageButton->setToggleState(false, dontSendNotification);
squareImageButton->setToggleState(false, false); quartersineImageButton->setToggleState(false, dontSendNotification);
logsawImageButton->setToggleState(false, false); alternatingsineImageButton->setToggleState(false, dontSendNotification);
camelsineImageButton->setToggleState(false, dontSendNotification);
squareImageButton->setToggleState(false, dontSendNotification);
logsawImageButton->setToggleState(false, dontSendNotification);
switch(processor->getEnumParameter("Modulator Wave")) { switch(processor->getEnumParameter("Modulator Wave")) {
case 0: sineImageButton->setToggleState(true, false); break; case 0: sineImageButton->setToggleState(true, dontSendNotification); break;
case 1: halfsineImageButton->setToggleState(true, false); break; case 1: halfsineImageButton->setToggleState(true, dontSendNotification); break;
case 2: abssineImageButton->setToggleState(true, false); break; case 2: abssineImageButton->setToggleState(true, dontSendNotification); break;
case 3: quartersineImageButton->setToggleState(true, false); break; case 3: quartersineImageButton->setToggleState(true, dontSendNotification); break;
case 4: alternatingsineImageButton->setToggleState(true, false); break; case 4: alternatingsineImageButton->setToggleState(true, dontSendNotification); break;
case 5: camelsineImageButton->setToggleState(true, false); break; case 5: camelsineImageButton->setToggleState(true, dontSendNotification); break;
case 6: squareImageButton->setToggleState(true, false); break; case 6: squareImageButton->setToggleState(true, dontSendNotification); break;
case 7: logsawImageButton->setToggleState(true, false); break; case 7: logsawImageButton->setToggleState(true, dontSendNotification); break;
} }
sineImageButton2->setToggleState(false, false); sineImageButton2->setToggleState(false, dontSendNotification);
halfsineImageButton2->setToggleState(false, false); halfsineImageButton2->setToggleState(false, dontSendNotification);
abssineImageButton2->setToggleState(false, false); abssineImageButton2->setToggleState(false, dontSendNotification);
quartersineImageButton2->setToggleState(false, false); quartersineImageButton2->setToggleState(false, dontSendNotification);
alternatingsineImageButton2->setToggleState(false, false); alternatingsineImageButton2->setToggleState(false, dontSendNotification);
camelsineImageButton2->setToggleState(false, false); camelsineImageButton2->setToggleState(false, dontSendNotification);
squareImageButton2->setToggleState(false, false); squareImageButton2->setToggleState(false, dontSendNotification);
logsawImageButton2->setToggleState(false, false); logsawImageButton2->setToggleState(false, dontSendNotification);
switch(processor->getEnumParameter("Carrier Wave")) { switch(processor->getEnumParameter("Carrier Wave")) {
case 0: sineImageButton2->setToggleState(true, false); break; case 0: sineImageButton2->setToggleState(true, dontSendNotification); break;
case 1: halfsineImageButton2->setToggleState(true, false); break; case 1: halfsineImageButton2->setToggleState(true, dontSendNotification); break;
case 2: abssineImageButton2->setToggleState(true, false); break; case 2: abssineImageButton2->setToggleState(true, dontSendNotification); break;
case 3: quartersineImageButton2->setToggleState(true, false); break; case 3: quartersineImageButton2->setToggleState(true, dontSendNotification); break;
case 4: alternatingsineImageButton2->setToggleState(true, false); break; case 4: alternatingsineImageButton2->setToggleState(true, dontSendNotification); break;
case 5: camelsineImageButton2->setToggleState(true, false); break; case 5: camelsineImageButton2->setToggleState(true, dontSendNotification); break;
case 6: squareImageButton2->setToggleState(true, false); break; case 6: squareImageButton2->setToggleState(true, dontSendNotification); break;
case 7: logsawImageButton2->setToggleState(true, false); break; case 7: logsawImageButton2->setToggleState(true, dontSendNotification); break;
} }
frequencyComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Frequency Multiplier"), true); /// setSelectedItemIndex(bool, bool) is deprecated.
frequencyComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Frequency Multiplier"), true); /// Jeff-Russ replaced the second arg of "true" with "sendNotificationAsync":
frequencyComboBox->setSelectedItemIndex (
processor->getEnumParameter("Modulator Frequency Multiplier"),
sendNotificationAsync);
frequencyComboBox2->setSelectedItemIndex (
processor->getEnumParameter("Carrier Frequency Multiplier"),
sendNotificationAsync);
attenuationSlider->setValue(processor->getEnumParameter("Modulator Attenuation") * -0.75, juce::NotificationType::dontSendNotification); attenuationSlider->setValue(processor->getEnumParameter("Modulator Attenuation") * -0.75, juce::NotificationType::dontSendNotification);
attenuationSlider2->setValue(processor->getEnumParameter("Carrier Attenuation") * -0.75, juce::NotificationType::dontSendNotification); attenuationSlider2->setValue(processor->getEnumParameter("Carrier Attenuation") * -0.75, juce::NotificationType::dontSendNotification);
@ -82,30 +92,44 @@ void PluginGui::updateFromParameters()
sSlider2->setValue(processor->getIntParameter("Carrier Sustain Level"), juce::NotificationType::dontSendNotification); sSlider2->setValue(processor->getIntParameter("Carrier Sustain Level"), juce::NotificationType::dontSendNotification);
rSlider2->setValue(processor->getIntParameter("Carrier Release"), juce::NotificationType::dontSendNotification); rSlider2->setValue(processor->getIntParameter("Carrier Release"), juce::NotificationType::dontSendNotification);
keyscaleAttenuationComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Keyscale Level"), true); /// Jeff-Russ replaced the second arg of "true" with "sendNotificationAsync":
keyscaleAttenuationComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Keyscale Level"), true);
keyscaleAttenuationComboBox->setSelectedItemIndex (
processor->getEnumParameter("Modulator Keyscale Level"),
sendNotificationAsync);
keyscaleAttenuationComboBox2->setSelectedItemIndex (
processor->getEnumParameter("Carrier Keyscale Level"),
sendNotificationAsync);
if (processor->getEnumParameter("Modulator Tremolo")) tremoloButton->setToggleState(true, false); if (processor->getEnumParameter("Modulator Tremolo")) tremoloButton->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Modulator Vibrato")) vibratoButton->setToggleState(true, false); if (processor->getEnumParameter("Modulator Vibrato")) vibratoButton->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Modulator Sustain")) sustainButton->setToggleState(true, false); if (processor->getEnumParameter("Modulator Sustain")) sustainButton->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Modulator Keyscale Rate")) keyscaleEnvButton->setToggleState(true, false); if (processor->getEnumParameter("Modulator Keyscale Rate")) keyscaleEnvButton->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Carrier Tremolo")) tremoloButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Tremolo")) tremoloButton2->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Carrier Vibrato")) vibratoButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Vibrato")) vibratoButton2->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Sustain")) sustainButton2->setToggleState(true, dontSendNotification);
if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, false); if (processor->getEnumParameter("Carrier Keyscale Rate")) keyscaleEnvButton2->setToggleState(true, dontSendNotification);
vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification); vibratoSlider->setValue(processor->getEnumParameter("Vibrato Depth") * 7.0 + 7.0, juce::NotificationType::dontSendNotification);
tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification); tremoloSlider->setValue(processor->getEnumParameter("Tremolo Depth") * 3.8 + 1.0, juce::NotificationType::dontSendNotification);
feedbackSlider->setValue(processor->getIntParameter("Modulator Feedback"), juce::NotificationType::dontSendNotification); feedbackSlider->setValue(processor->getIntParameter("Modulator Feedback"), juce::NotificationType::dontSendNotification);
velocityComboBox->setSelectedItemIndex(processor->getEnumParameter("Modulator Velocity Sensitivity"), true); /// Jeff-Russ replaced the second arg of "true" with "sendNotificationAsync":
velocityComboBox2->setSelectedItemIndex(processor->getEnumParameter("Carrier Velocity Sensitivity"), true);
algorithmComboBox->setSelectedItemIndex(processor->getEnumParameter("Algorithm"), true); velocityComboBox->setSelectedItemIndex (
processor->getEnumParameter("Modulator Velocity Sensitivity"),
percussionComboBox->setSelectedItemIndex(processor->getEnumParameter("Percussion Mode"), true); sendNotificationAsync);
velocityComboBox2->setSelectedItemIndex (
processor->getEnumParameter("Carrier Velocity Sensitivity"),
sendNotificationAsync);
algorithmComboBox->setSelectedItemIndex (
processor->getEnumParameter("Algorithm"),
sendNotificationAsync);
percussionComboBox->setSelectedItemIndex (
processor->getEnumParameter("Percussion Mode"),
sendNotificationAsync);
tooltipWindow.setColour(tooltipWindow.backgroundColourId, Colour(0x0)); tooltipWindow.setColour(tooltipWindow.backgroundColourId, Colour(0x0));
tooltipWindow.setColour(tooltipWindow.textColourId, Colour(COLOUR_MID)); tooltipWindow.setColour(tooltipWindow.textColourId, Colour(COLOUR_MID));
@ -1552,7 +1576,7 @@ void PluginGui::buttonClicked (Button* buttonThatWasClicked)
else if (buttonThatWasClicked == recordButton) else if (buttonThatWasClicked == recordButton)
{ {
//[UserButtonCode_recordButton] -- add your button handler code here.. //[UserButtonCode_recordButton] -- add your button handler code here..
recordButton->setToggleState(false, false); recordButton->setToggleState(false, dontSendNotification);
if (!processor->isAnyInstanceRecording()) { if (!processor->isAnyInstanceRecording()) {
WildcardFileFilter wildcardFilter ("*.dro", String::empty, "DRO files"); WildcardFileFilter wildcardFilter ("*.dro", String::empty, "DRO files");
FileBrowserComponent browser (FileBrowserComponent::saveMode, FileBrowserComponent browser (FileBrowserComponent::saveMode,
@ -1894,8 +1918,8 @@ BEGIN_JUCER_METADATA
<SLIDER name="tremolo slider" id="ab64abee7ac8874b" memberName="tremoloSlider" <SLIDER name="tremolo slider" id="ab64abee7ac8874b" memberName="tremoloSlider"
virtualName="" explicitFocusOrder="0" pos="632 456 112 24" thumbcol="ff00af00" virtualName="" explicitFocusOrder="0" pos="632 456 112 24" thumbcol="ff00af00"
trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000" trackcol="7f007f00" textboxtext="ff007f00" textboxbkgd="ff000000"
textboxhighlight="ff00af00" min="1" max="4.7999999999999998" textboxhighlight="ff00af00" min="1" max="4.7999999999999998224"
int="3.7999999999999998" style="LinearHorizontal" textBoxPos="TextBoxLeft" int="3.7999999999999998224" style="LinearHorizontal" textBoxPos="TextBoxLeft"
textBoxEditable="1" textBoxWidth="44" textBoxHeight="20" skewFactor="1"/> textBoxEditable="1" textBoxWidth="44" textBoxHeight="20" skewFactor="1"/>
<LABEL name="frequency label" id="134ce8f87da62b88" memberName="frequencyLabel5" <LABEL name="frequency label" id="134ce8f87da62b88" memberName="frequencyLabel5"
virtualName="" explicitFocusOrder="0" pos="472 456 152 24" tooltip="OPL global tremolo depth" virtualName="" explicitFocusOrder="0" pos="472 456 152 24" tooltip="OPL global tremolo depth"

3
Source/PluginProcessor.cpp
View file

@ -820,7 +820,8 @@ void JuceOplvstiAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf
applyPitchBend(); applyPitchBend();
} }
} }
Opl->Generate(buffer.getNumSamples(), buffer.getSampleData(0)); /// Jeff-Russ: getSampleData(int) is deprecated. use getWritePointer(int)
Opl->Generate(buffer.getNumSamples(), buffer.getWritePointer(0));
} }
//============================================================================== //==============================================================================

32
Source/config.h
View file

@ -75,24 +75,30 @@ typedef uint16_t Bit16u;
typedef int16_t Bit16s; typedef int16_t Bit16s;
typedef uint32_t Bit32u; typedef uint32_t Bit32u;
typedef int32_t Bit32s; typedef int32_t Bit32s;
typedef int64_t Bit64u; typedef uint64_t Bit64u;
typedef uint64_t Bit64s; typedef int64_t Bit64s;
typedef Bit32u Bitu; typedef Bit32u Bitu;
typedef Bit32s Bits; typedef Bit32s Bits;
/// Jeff-Russ PUT PLATFORM SPECIFIC STUFF HERE: /// Jeff-Russ PUT PLATFORM SPECIFIC STUFF HERE:
#ifndef _WIN32 /// __forceinline likely not needed
#define __forceinline inline /// outside of windows.
#endif
#ifdef _WIN32 // covers both 32 and 64-bit #ifdef _WIN32 // covers both 32 and 64-bit
#define INLINE __forceinline #define INLINE __forceinline
#elif __APPLE__
#include "TargetConditionals.h"
#define INLINE inline /// apple has no forceinline
#elif __linux
#define INLINE inline
#elif __unix
#define INLINE inline
#elif __posix
#define INLINE inline
#else
#error Unsupported Operating System
#endif #endif
//#elif __APPLE__
// #include "TargetConditionals.h"
// #define INLINE inline /// apple has no forceinline
//#elif __linux
// #define INLINE inline
//#elif __unix
// #define INLINE inline
//#elif __posix
// #define INLINE inline
//#else
// #error Unsupported Operating System
//#endif

4
Source/dbopl.cpp
View file

@ -889,6 +889,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
return (this + 2); return (this + 2);
} }
break; break;
default: /// Jeff-Russ added to silence warning
break;
} }
//Init the operators with the the current vibrato and tremolo values //Init the operators with the the current vibrato and tremolo values
Op( 0 )->Prepare( chip ); Op( 0 )->Prepare( chip );
@ -954,6 +956,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
output[ i * 2 + 0 ] += sample & maskLeft; output[ i * 2 + 0 ] += sample & maskLeft;
output[ i * 2 + 1 ] += sample & maskRight; output[ i * 2 + 1 ] += sample & maskRight;
break; break;
default: /// Jeff-Russ added to silence warning
break;
} }
} }
switch( mode ) { switch( mode ) {

2
Source/windows.h
View file

@ -31,7 +31,7 @@ typedef int16_t WCHAR;
// HANDLE - A handle to an object. // HANDLE - A handle to an object.
// This type is declared in WinDef.h as follows: // This type is declared in WinDef.h as follows:
typedef PVOID HANDLE; typedef /*PVOID*/ DWORD HANDLE;
DWORD STD_INPUT_HANDLE = -10; DWORD STD_INPUT_HANDLE = -10;
DWORD STD_OUTPUT_HANDLE = -11; DWORD STD_OUTPUT_HANDLE = -11;