Skip to content

Commit

Permalink
Updated to JUCE 6.0.5.
Browse files Browse the repository at this point in the history 
Now has a Universal build target for macOS.
  • Loading branch information
@gbevin
gbevin committed Jan 2, 2021
1 parent 81667a1 commit aded817
Show file tree
Hide file tree
Showing 94 changed files with 7,554 additions and 1,668 deletions.
33 changes: 28 additions & 5 deletions Builds/MacOSX/sendmidi.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
isa = PBXBuildFile;
fileRef = BF812B73A42627ED8AD203EA;
};
8C315CE0BB161E8F64351690 = {
isa = PBXBuildFile;
fileRef = 07349D8481B1ED49EE53EB64;
};
2B50A8D000C0D831B3F9702E = {
isa = PBXBuildFile;
fileRef = D2BC5390A6F33C796C125CA6;
Expand Down Expand Up @@ -61,6 +65,13 @@
isa = PBXBuildFile;
fileRef = F0AC19E3023CA8E85D590A1B;
};
07349D8481B1ED49EE53EB64 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.framework;
name = Foundation.framework;
path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT;
};
08ACADE6BD3415FD33BA447B = {
isa = PBXFileReference;
lastKnownFileType = sourcecode.cpp.objcpp;
Expand Down Expand Up @@ -266,6 +277,7 @@
8C841A693EA83A57B62FDF16,
39BBB61E6B2796DB8C72B46D,
BF812B73A42627ED8AD203EA,
07349D8481B1ED49EE53EB64,
D2BC5390A6F33C796C125CA6,
);
name = Frameworks;
Expand Down Expand Up @@ -321,15 +333,20 @@
);
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
"../../JuceLibraryCode",
"../../JuceLibraryCode/modules",
"$(SRCROOT)/../../JuceLibraryCode",
"$(SRCROOT)/../../JuceLibraryCode/modules",
"$(inherited)",
);
INSTALL_PATH = "/usr/bin";
MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../JuceLibraryCode",
"$(SRCROOT)/../../JuceLibraryCode/modules",
);
PRODUCT_BUNDLE_IDENTIFIER = com.uwyn.sendmidi;
PRODUCT_NAME = "sendmidi";
USE_HEADERMAP = NO;
VALID_ARCHS = "i386 x86_64 arm64 arm64e";
};
name = Debug;
};
Expand Down Expand Up @@ -362,16 +379,21 @@
);
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = (
"../../JuceLibraryCode",
"../../JuceLibraryCode/modules",
"$(SRCROOT)/../../JuceLibraryCode",
"$(SRCROOT)/../../JuceLibraryCode/modules",
"$(inherited)",
);
INSTALL_PATH = "/usr/bin";
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../JuceLibraryCode",
"$(SRCROOT)/../../JuceLibraryCode/modules",
);
PRODUCT_BUNDLE_IDENTIFIER = com.uwyn.sendmidi;
PRODUCT_NAME = "sendmidi";
USE_HEADERMAP = NO;
VALID_ARCHS = "i386 x86_64 arm64 arm64e";
};
name = Release;
};
Expand Down Expand Up @@ -520,6 +542,7 @@
8E8410A6B527CB8A75830C3C,
5DC8BD2E0E589697B3A66001,
1CD0216F853135DDC28315F0,
8C315CE0BB161E8F64351690,
2B50A8D000C0D831B3F9702E,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -542,7 +565,7 @@
6323F87A9BE44E1C4257AD90 = {
isa = PBXProject;
buildConfigurationList = 9B7F79ECBA6BB3FD7D9F4A1B;
attributes = { LastUpgradeCheck = 1100; ORGANIZATIONNAME = "Uwyn"; };
attributes = { LastUpgradeCheck = 1230; ORGANIZATIONNAME = "Uwyn"; };
compatibilityVersion = "Xcode 3.2";
hasScannedForEncodings = 0;
mainGroup = CA1CE00FEEC53FB42E8CDD06;
Expand Down
8 changes: 0 additions & 8 deletions ...s/MacOSX/sendmidi.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file

This file was deleted.

36 changes: 34 additions & 2 deletions Builds/VisualStudio2015/sendmidi_ConsoleApp.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.15;JUCE_APP_VERSION_HEX=0x1000f;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)\</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
Expand Down Expand Up @@ -109,7 +109,7 @@
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.15;JUCE_APP_VERSION_HEX=0x1000f;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
<ObjectFileName>$(IntDir)\</ObjectFileName>
<ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
Expand All @@ -132,6 +132,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
Expand Down Expand Up @@ -252,6 +253,21 @@
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_AudioIODeviceType.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToMidi2DefaultTranslator.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPSysEx7.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPTests.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPUtils.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPView.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\juce_MidiDevices.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
Expand Down Expand Up @@ -901,6 +917,22 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_AudioIODevice.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_AudioIODeviceType.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_SystemAudioVolume.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPacket.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPackets.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPBytestreamInputHandler.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPConversion.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPConverters.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPDispatcher.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPFactory.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPIterator.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToBytestreamTranslator.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToMidi2DefaultTranslator.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPProtocols.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPReceiver.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPSysEx7.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPU32InputHandler.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPUtils.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPView.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\juce_MidiDevices.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\juce_MidiMessageCollector.h"/>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\native\oboe\include\oboe\AudioStream.h"/>
Expand Down
69 changes: 69 additions & 0 deletions Builds/VisualStudio2015/sendmidi_ConsoleApp.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<Filter Include="JUCE Modules\juce_audio_devices\audio_io">
<UniqueIdentifier>{BF23FC10-1D57-2A9B-706F-6DD8A7B593D4}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_audio_devices\midi_io\ump">
<UniqueIdentifier>{386862D5-4DCC-A4B3-5642-60A201E303EF}</UniqueIdentifier>
</Filter>
<Filter Include="JUCE Modules\juce_audio_devices\midi_io">
<UniqueIdentifier>{092EFC17-7C95-7E04-0ACA-0D61A462EE81}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -295,6 +298,21 @@
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_AudioIODeviceType.cpp">
<Filter>JUCE Modules\juce_audio_devices\audio_io</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToMidi2DefaultTranslator.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPSysEx7.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPTests.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPUtils.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPView.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\juce_MidiDevices.cpp">
<Filter>JUCE Modules\juce_audio_devices\midi_io</Filter>
</ClCompile>
Expand Down Expand Up @@ -481,6 +499,9 @@
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\native\juce_mac_CoreMidi.cpp">
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\native\juce_mac_CoreMidi.mm">
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\modules\juce_audio_devices\native\juce_win32_ASIO.cpp">
<Filter>JUCE Modules\juce_audio_devices\native</Filter>
</ClCompile>
Expand Down Expand Up @@ -1077,6 +1098,54 @@
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\audio_io\juce_SystemAudioVolume.h">
<Filter>JUCE Modules\juce_audio_devices\audio_io</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPacket.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPackets.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPBytestreamInputHandler.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPConversion.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPConverters.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPDispatcher.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPFactory.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPIterator.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToBytestreamTranslator.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPMidi1ToMidi2DefaultTranslator.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPProtocols.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPReceiver.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPSysEx7.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPU32InputHandler.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPUtils.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\ump\juce_UMPView.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io\ump</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\modules\juce_audio_devices\midi_io\juce_MidiDevices.h">
<Filter>JUCE Modules\juce_audio_devices\midi_io</Filter>
</ClInclude>
Expand Down
6 changes: 1 addition & 5 deletions JuceLibraryCode/AppConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#define JUCE_USE_DARK_SPLASH_SCREEN 1

#define JUCE_PROJUCER_VERSION 0x60001
#define JUCE_PROJUCER_VERSION 0x60005

//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
Expand All @@ -67,10 +67,6 @@
//#define JUCE_WASAPI 1
#endif

#ifndef JUCE_WASAPI_EXCLUSIVE
//#define JUCE_WASAPI_EXCLUSIVE 0
#endif

#ifndef JUCE_DIRECTSOUND
//#define JUCE_DIRECTSOUND 1
#endif
Expand Down
33 changes: 29 additions & 4 deletions JuceLibraryCode/modules/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,35 @@ class JUCE_API AudioPlayHead
bool isLooping;

//==============================================================================
bool operator== (const CurrentPositionInfo& other) const noexcept;
bool operator!= (const CurrentPositionInfo& other) const noexcept;

void resetToDefault();
bool operator== (const CurrentPositionInfo& other) const noexcept
{
return timeInSamples == other.timeInSamples
&& ppqPosition == other.ppqPosition
&& editOriginTime == other.editOriginTime
&& ppqPositionOfLastBarStart == other.ppqPositionOfLastBarStart
&& frameRate == other.frameRate
&& isPlaying == other.isPlaying
&& isRecording == other.isRecording
&& bpm == other.bpm
&& timeSigNumerator == other.timeSigNumerator
&& timeSigDenominator == other.timeSigDenominator
&& ppqLoopStart == other.ppqLoopStart
&& ppqLoopEnd == other.ppqLoopEnd
&& isLooping == other.isLooping;
}

bool operator!= (const CurrentPositionInfo& other) const noexcept
{
return ! operator== (other);
}

void resetToDefault()
{
zerostruct (*this);
timeSigNumerator = 4;
timeSigDenominator = 4;
bpm = 120;
}
};

//==============================================================================
Expand Down
Loading

0 comments on commit aded817

Please sign in to comment.