No significant changes, just silencing warnings by minor modifications and replacements of deprecated juce methods.
This commit is contained in:
Jeff-Russ
parent
637e49fc53
commit
2fcf6c6395
6 changed files with 2251 additions and 2218 deletions
|
|
@ -17,25 +17,20 @@
|
|||
<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"/>
|
||||
</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="Phxzxb" name="PluginProcessor.cpp" compile="1" resource="0"
|
||||
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="Source/DROMultiplexer.cpp"/>
|
||||
<FILE id="cULQN7" name="DROMultiplexer.h" compile="0" resource="0"
|
||||
file="Source/DROMultiplexer.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="TnpE3r" name="dbopl.cpp" compile="1" resource="0" file="Source/dbopl.cpp"/>
|
||||
</GROUP>
|
||||
<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="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="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"/>
|
||||
|
|
@ -46,6 +41,9 @@
|
|||
<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"/>
|
||||
</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="TQyCKv" name="zdopl.h" compile="0" resource="0" file="Source/zdopl.h"/>
|
||||
<FILE id="LVSdHL" name="InstrumentLoader.h" compile="0" resource="0"
|
||||
|
|
@ -97,20 +95,20 @@
|
|||
winArchitecture="32-bit" isDebug="0" optimisation="3" targetName="JuceOPLVSTi"/>
|
||||
</CONFIGURATIONS>
|
||||
<MODULEPATHS>
|
||||
<MODULEPATH id="juce_audio_basics" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_audio_devices" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_audio_formats" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_audio_plugin_client" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_audio_processors" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_core" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_cryptography" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_data_structures" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_events" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_graphics" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_gui_basics" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_gui_extra" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_opengl" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_video" path="../Juce/modules"/>
|
||||
<MODULEPATH id="juce_audio_devices" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_formats" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_plugin_client" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_processors" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_cryptography" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_data_structures" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_events" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_graphics" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_gui_basics" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_gui_extra" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_opengl" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_video" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_basics" path="JuceLibraryCode/modules"/>
|
||||
</MODULEPATHS>
|
||||
</VS2013>
|
||||
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" postbuildCommand=" # This script takes the build product and copies it to the AU, VST, VST3, RTAS and AAX folders, depending on # which plugin types you've built original=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME # this looks inside the binary to detect which platforms are needed.. copyAU=`nm -g "$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH" | grep -i 'AudioUnit' | wc -l` copyVST=`nm -g "$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH" | grep -i 'VSTPlugin' | wc -l` copyVST3=`nm -g "$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH" | grep -i 'GetPluginFactory' | wc -l` copyRTAS=`nm -g "$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH" | grep -i 'CProcess' | wc -l` copyAAX=`nm -g "$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH" | grep -i 'ACFStartup' | wc -l` if [ $copyAU -gt 0 ]; then echo "Copying to AudioUnit folder..." AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component if [ -d "$AU" ]; then rm -r "$AU" fi cp -r "$original" "$AU" sed -i "" -e 's/TDMwPTul/BNDLPTul/g' "$AU/Contents/PkgInfo" sed -i "" -e 's/TDMw/BNDL/g' "$AU/Contents/$INFOPLIST_FILE" # Fix info.plist for AUs built with Xcode 3 if [ -f "$DEVELOPER_DIR/Library/Developer/CoreAudio/AudioUnits/AUPublic/AUBase/AUPlugInDispatch.cpp" ]; then echo else echo "Removing AudioComponents entry from Info.plist because this is not a new-format AU" /usr/libexec/PlistBuddy -c "Delete AudioComponents" "$AU/Contents/Info.plist" fi fi if [ $copyVST -gt 0 ]; then echo "Copying to VST folder..." VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst if [ -d "$VST" ]; then rm -r "$VST" fi cp -r "$original" "$VST" sed -i "" -e 's/TDMwPTul/BNDLPTul/g' "$VST/Contents/PkgInfo" sed -i "" -e 's/TDMw/BNDL/g' "$VST/Contents/$INFOPLIST_FILE" fi if [ $copyVST3 -gt 0 ]; then echo "Copying to VST3 folder..." VST3=~/Library/Audio/Plug-Ins/VST3/$PRODUCT_NAME.vst3 if [ -d "$VST3" ]; then rm -r "$VST3" fi cp -r "$original" "$VST3" sed -i "" -e 's/TDMwPTul/BNDLPTul/g' "$VST3/Contents/PkgInfo" sed -i "" -e 's/TDMw/BNDL/g' "$VST3/Contents/$INFOPLIST_FILE" fi if [ $copyRTAS -gt 0 ]; then echo "Copying to RTAS folder..." RTAS=/Library/Application\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm if [ -d "$RTAS" ]; then rm -r "$RTAS" fi cp -r "$original" "$RTAS" fi if [ $copyAAX -gt 0 ]; then echo "Copying to AAX folder..." if [ -d "/Applications/ProTools_3PDev/Plug-Ins" ]; then AAX1="/Applications/ProTools_3PDev/Plug-Ins/$PRODUCT_NAME.aaxplugin" if [ -d "$AAX1" ]; then rm -r "$AAX1" fi cp -R -H "$original" "$AAX1" fi if [ -d "/Library/Application Support/Avid/Audio/Plug-Ins" ]; then AAX2="/Library/Application Support/Avid/Audio/Plug-Ins/$PRODUCT_NAME.aaxplugin" if [ -d "$AAX2" ]; then rm -r "$AAX2" fi cp -R -H "$original" "$AAX2" fi fi ">
|
||||
|
|
@ -121,20 +119,20 @@
|
|||
isDebug="0" optimisation="2" targetName="JuceOPL" cppLibType="libc++"/>
|
||||
</CONFIGURATIONS>
|
||||
<MODULEPATHS>
|
||||
<MODULEPATH id="juce_video" path="../../juce"/>
|
||||
<MODULEPATH id="juce_opengl" path="../../juce"/>
|
||||
<MODULEPATH id="juce_gui_extra" path="../../juce"/>
|
||||
<MODULEPATH id="juce_gui_basics" path="../../juce"/>
|
||||
<MODULEPATH id="juce_graphics" path="../../juce"/>
|
||||
<MODULEPATH id="juce_events" path="../../juce"/>
|
||||
<MODULEPATH id="juce_data_structures" path="../../juce"/>
|
||||
<MODULEPATH id="juce_cryptography" path="../../juce"/>
|
||||
<MODULEPATH id="juce_core" path="../../juce"/>
|
||||
<MODULEPATH id="juce_audio_processors" path="../../juce"/>
|
||||
<MODULEPATH id="juce_audio_plugin_client" path="../../juce"/>
|
||||
<MODULEPATH id="juce_audio_formats" path="../../juce"/>
|
||||
<MODULEPATH id="juce_audio_devices" path="../../juce"/>
|
||||
<MODULEPATH id="juce_audio_basics" path="../../juce"/>
|
||||
<MODULEPATH id="juce_video" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_opengl" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_gui_extra" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_gui_basics" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_graphics" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_events" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_data_structures" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_cryptography" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_processors" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_plugin_client" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_formats" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_devices" path="JuceLibraryCode/modules"/>
|
||||
<MODULEPATH id="juce_audio_basics" path="JuceLibraryCode/modules"/>
|
||||
</MODULEPATHS>
|
||||
</XCODE_MAC>
|
||||
</EXPORTFORMATS>
|
||||
|
|
|
|||
4358
Source/PluginGui.cpp
4358
Source/PluginGui.cpp
File diff suppressed because it is too large
Load diff
|
|
@ -820,7 +820,8 @@ void JuceOplvstiAudioProcessor::processBlock (AudioSampleBuffer& buffer, MidiBuf
|
|||
applyPitchBend();
|
||||
}
|
||||
}
|
||||
Opl->Generate(buffer.getNumSamples(), buffer.getSampleData(0));
|
||||
/// Jeff-Russ: getSampleData(int) is deprecated. use getWritePointer(int)
|
||||
Opl->Generate(buffer.getNumSamples(), buffer.getWritePointer(0));
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
|
|
@ -75,24 +75,30 @@ typedef uint16_t Bit16u;
|
|||
typedef int16_t Bit16s;
|
||||
typedef uint32_t Bit32u;
|
||||
typedef int32_t Bit32s;
|
||||
typedef int64_t Bit64u;
|
||||
typedef uint64_t Bit64s;
|
||||
typedef uint64_t Bit64u;
|
||||
typedef int64_t Bit64s;
|
||||
typedef Bit32u Bitu;
|
||||
typedef Bit32s Bits;
|
||||
|
||||
|
||||
/// 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
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -889,6 +889,8 @@ Channel* Channel::BlockTemplate( Chip* chip, Bit32u samples, Bit32s* output ) {
|
|||
return (this + 2);
|
||||
}
|
||||
break;
|
||||
default: /// Jeff-Russ added to silence warning
|
||||
break;
|
||||
}
|
||||
//Init the operators with the the current vibrato and tremolo values
|
||||
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 + 1 ] += sample & maskRight;
|
||||
break;
|
||||
default: /// Jeff-Russ added to silence warning
|
||||
break;
|
||||
}
|
||||
}
|
||||
switch( mode ) {
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ typedef int16_t WCHAR;
|
|||
|
||||
// HANDLE - A handle to an object.
|
||||
// This type is declared in WinDef.h as follows:
|
||||
typedef PVOID HANDLE;
|
||||
typedef /*PVOID*/ DWORD HANDLE;
|
||||
|
||||
DWORD STD_INPUT_HANDLE = -10;
|
||||
DWORD STD_OUTPUT_HANDLE = -11;
|
||||
|
|
|
|||
Loading…
Reference in a new issue