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>

4358
Source/PluginGui.cpp
View file

File diff suppressed because it is too large Load diff

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));
} }
//============================================================================== //==============================================================================

34
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__ #endif
#include "TargetConditionals.h"
#define INLINE inline /// apple has no forceinline //#elif __APPLE__
#elif __linux // #include "TargetConditionals.h"
#define INLINE inline // #define INLINE inline /// apple has no forceinline
#elif __unix //#elif __linux
#define INLINE inline // #define INLINE inline
#elif __posix //#elif __unix
#define INLINE inline // #define INLINE inline
#else //#elif __posix
#error Unsupported Operating System // #define INLINE inline
#endif //#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;