Skip to content

Commit

Permalink
revert to JUCE 7.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@DBraun
DBraun committed Sep 17, 2023
1 parent e0a10a6 commit 3e3be68
Show file tree
Hide file tree
Showing 655 changed files with 12,254 additions and 30,770 deletions.
81 changes: 38 additions & 43 deletions Builds/LinuxMakefile/Makefile
View file

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions Builds/MacOSX/DawDreamer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
C9200467702F9E5502DCC9F0 /* include_juce_video.mm */ = {isa = PBXBuildFile; fileRef = C519012CDDE2CA92FF58903A; };
D8E2F775028097109496AAA1 /* Cocoa.framework */ = {isa = PBXBuildFile; fileRef = 7EC708BB8670BC4B971F031E; };
D915E61C72D98F0B97F31690 /* StandalonePluginWindow.h */ = {isa = PBXBuildFile; fileRef = 44A26898F037A3E6B43EB911; };
DF5374E67F8812D79694279E /* Security.framework */ = {isa = PBXBuildFile; fileRef = B243F8F5ADFF280683E55EE1; };
DFE780784ED99EACC1B654A6 /* include_juce_gui_extra.mm */ = {isa = PBXBuildFile; fileRef = 06AE4EC72C9D2D0775EF879E; };
E358C00D8D92D35AFBC9944C /* FaustProcessor.cpp */ = {isa = PBXBuildFile; fileRef = BFD142EBB8AFBADC8AB04A8A; };
E3F94999130BC1FFAB7F9829 /* FaustSignalAPI.cpp */ = {isa = PBXBuildFile; fileRef = DA5D0A9D3542DCB5ACFC8FB8; };
Expand Down Expand Up @@ -142,7 +141,6 @@
AB39C0017B2EE44B9E510D89 /* PlaybackWarpProcessor.cpp */ /* PlaybackWarpProcessor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PlaybackWarpProcessor.cpp; path = ../../Source/PlaybackWarpProcessor.cpp; sourceTree = SOURCE_ROOT; };
AD248A6B37034D215326CB7F /* juce_audio_processors */ /* juce_audio_processors */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_audio_processors; path = ../../JuceLibraryCode/modules/juce_audio_processors; sourceTree = SOURCE_ROOT; };
B1FAEBBC0B8073BAE84C5665 /* PlaybackProcessor.h */ /* PlaybackProcessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PlaybackProcessor.h; path = ../../Source/PlaybackProcessor.h; sourceTree = SOURCE_ROOT; };
B243F8F5ADFF280683E55EE1 /* Security.framework */ /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
B2CCBF7C3614EE8B865D41C0 /* include_juce_graphics.mm */ /* include_juce_graphics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_graphics.mm; path = ../../JuceLibraryCode/include_juce_graphics.mm; sourceTree = SOURCE_ROOT; };
B9149690533DD3D5D70543AA /* WaveformEditor.h */ /* WaveformEditor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = WaveformEditor.h; path = ../../Source/Sampler/Source/Components/WaveformEditor.h; sourceTree = SOURCE_ROOT; };
BFD142EBB8AFBADC8AB04A8A /* FaustProcessor.cpp */ /* FaustProcessor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FaustProcessor.cpp; path = ../../Source/FaustProcessor.cpp; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -196,7 +194,6 @@
C0D03D32EA25F7011FECF9F6,
29782FB7B1C181EA8900F409,
8CB86F722980F4262C64B7D7,
DF5374E67F8812D79694279E,
31D395DB17463EFA64FFF6EE,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -317,7 +314,6 @@
E0756912D4AE6F8AF5A16B05,
1B24D4A69BF5E24D9E0DB1E5,
D2350C56CE13419F5D6CF40E,
B243F8F5ADFF280683E55EE1,
7FC28740B3DC997941439C94,
);
name = Frameworks;
Expand Down
421 changes: 147 additions & 274 deletions Builds/VisualStudio2022/DawDreamer_DynamicLibrary.vcxproj
View file

Large diffs are not rendered by default.

628 changes: 191 additions & 437 deletions Builds/VisualStudio2022/DawDreamer_DynamicLibrary.vcxproj.filters
View file

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions DawDreamer.jucer
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
<FILE id="TwJEHz" name="FaustProcessor.cpp" compile="1" resource="0"
file="Source/FaustProcessor.cpp"/>
<FILE id="CzVHWE" name="FaustBoxAPI.h" compile="1" resource="0" file="Source/FaustBoxAPI.h"/>
<FILE id="qVaVsT" name="FaustBoxAPI.cpp" compile="1" resource="0" file="Source/FaustBoxAPI.cpp"/>
<FILE id="GBvvc4" name="FaustBoxAPI.cpp" compile="1" resource="0" file="Source/FaustBoxAPI.cpp"/>
<FILE id="cbiWR9" name="FaustSignalAPI.h" compile="1" resource="0"
file="Source/FaustSignalAPI.h"/>
<FILE id="CCmZvB" name="FaustSignalAPI.cpp" compile="1" resource="0"
<FILE id="zRcFDg" name="FaustSignalAPI.cpp" compile="1" resource="0"
file="Source/FaustSignalAPI.cpp"/>
<FILE id="QYs4bq" name="FilterProcessor.cpp" compile="1" resource="0"
file="Source/FilterProcessor.cpp"/>
Expand Down Expand Up @@ -173,7 +173,8 @@
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="dawdreamer"
libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Debug/lib&#10;../../thirdparty/libsamplerate/build_release/src"/>
<CONFIGURATION name="Release" isDebug="0" targetName="dawdreamer" libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Release/lib&#10;../../thirdparty/libsamplerate/build_release/src"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="dawdreamer"
libraryPath="/usr/local/lib&#10;../../thirdparty/libfaust/ubuntu-x86_64/Release/lib&#10;../../thirdparty/libsamplerate/build_release/src"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_core" path="JuceLibraryCode/modules"/>
Expand Down
2 changes: 1 addition & 1 deletion JuceLibraryCode/AppConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

#define JUCE_USE_DARK_SPLASH_SCREEN 1

#define JUCE_PROJUCER_VERSION 0x70007
#define JUCE_PROJUCER_VERSION 0x70005

//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
Expand Down
143 changes: 20 additions & 123 deletions JuceLibraryCode/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,34 +107,6 @@ String AudioChannelSet::getChannelTypeName (AudioChannelSet::ChannelType type)
case ambisonicACN33: return NEEDS_TRANS("Ambisonic 33");
case ambisonicACN34: return NEEDS_TRANS("Ambisonic 34");
case ambisonicACN35: return NEEDS_TRANS("Ambisonic 35");
case ambisonicACN36: return NEEDS_TRANS("Ambisonic 36");
case ambisonicACN37: return NEEDS_TRANS("Ambisonic 37");
case ambisonicACN38: return NEEDS_TRANS("Ambisonic 38");
case ambisonicACN39: return NEEDS_TRANS("Ambisonic 39");
case ambisonicACN40: return NEEDS_TRANS("Ambisonic 40");
case ambisonicACN41: return NEEDS_TRANS("Ambisonic 41");
case ambisonicACN42: return NEEDS_TRANS("Ambisonic 42");
case ambisonicACN43: return NEEDS_TRANS("Ambisonic 43");
case ambisonicACN44: return NEEDS_TRANS("Ambisonic 44");
case ambisonicACN45: return NEEDS_TRANS("Ambisonic 45");
case ambisonicACN46: return NEEDS_TRANS("Ambisonic 46");
case ambisonicACN47: return NEEDS_TRANS("Ambisonic 47");
case ambisonicACN48: return NEEDS_TRANS("Ambisonic 48");
case ambisonicACN49: return NEEDS_TRANS("Ambisonic 49");
case ambisonicACN50: return NEEDS_TRANS("Ambisonic 50");
case ambisonicACN51: return NEEDS_TRANS("Ambisonic 51");
case ambisonicACN52: return NEEDS_TRANS("Ambisonic 52");
case ambisonicACN53: return NEEDS_TRANS("Ambisonic 53");
case ambisonicACN54: return NEEDS_TRANS("Ambisonic 54");
case ambisonicACN55: return NEEDS_TRANS("Ambisonic 55");
case ambisonicACN56: return NEEDS_TRANS("Ambisonic 56");
case ambisonicACN57: return NEEDS_TRANS("Ambisonic 57");
case ambisonicACN58: return NEEDS_TRANS("Ambisonic 58");
case ambisonicACN59: return NEEDS_TRANS("Ambisonic 59");
case ambisonicACN60: return NEEDS_TRANS("Ambisonic 60");
case ambisonicACN61: return NEEDS_TRANS("Ambisonic 61");
case ambisonicACN62: return NEEDS_TRANS("Ambisonic 62");
case ambisonicACN63: return NEEDS_TRANS("Ambisonic 63");
case bottomFrontLeft: return NEEDS_TRANS("Bottom Front Left");
case bottomFrontCentre: return NEEDS_TRANS("Bottom Front Centre");
case bottomFrontRight: return NEEDS_TRANS("Bottom Front Right");
Expand Down Expand Up @@ -219,34 +191,6 @@ String AudioChannelSet::getAbbreviatedChannelTypeName (AudioChannelSet::ChannelT
case ambisonicACN33: return "ACN33";
case ambisonicACN34: return "ACN34";
case ambisonicACN35: return "ACN35";
case ambisonicACN36: return "ACN36";
case ambisonicACN37: return "ACN37";
case ambisonicACN38: return "ACN38";
case ambisonicACN39: return "ACN39";
case ambisonicACN40: return "ACN40";
case ambisonicACN41: return "ACN41";
case ambisonicACN42: return "ACN42";
case ambisonicACN43: return "ACN43";
case ambisonicACN44: return "ACN44";
case ambisonicACN45: return "ACN45";
case ambisonicACN46: return "ACN46";
case ambisonicACN47: return "ACN47";
case ambisonicACN48: return "ACN48";
case ambisonicACN49: return "ACN49";
case ambisonicACN50: return "ACN50";
case ambisonicACN51: return "ACN51";
case ambisonicACN52: return "ACN52";
case ambisonicACN53: return "ACN53";
case ambisonicACN54: return "ACN54";
case ambisonicACN55: return "ACN55";
case ambisonicACN56: return "ACN56";
case ambisonicACN57: return "ACN57";
case ambisonicACN58: return "ACN58";
case ambisonicACN59: return "ACN59";
case ambisonicACN60: return "ACN60";
case ambisonicACN61: return "ACN61";
case ambisonicACN62: return "ACN62";
case ambisonicACN63: return "ACN63";
case topSideLeft: return "Tsl";
case topSideRight: return "Tsr";
case bottomFrontLeft: return "Bfl";
Expand All @@ -264,6 +208,9 @@ String AudioChannelSet::getAbbreviatedChannelTypeName (AudioChannelSet::ChannelT
default: break;
}

if (type >= ambisonicACN4 && type <= ambisonicACN35)
return "ACN" + String (type - ambisonicACN4 + 4);

return {};
}

Expand Down Expand Up @@ -336,34 +283,6 @@ AudioChannelSet::ChannelType AudioChannelSet::getChannelTypeFromAbbreviation (co
if (abbr == "ACN33") return ambisonicACN33;
if (abbr == "ACN34") return ambisonicACN34;
if (abbr == "ACN35") return ambisonicACN35;
if (abbr == "ACN36") return ambisonicACN36;
if (abbr == "ACN37") return ambisonicACN37;
if (abbr == "ACN38") return ambisonicACN38;
if (abbr == "ACN39") return ambisonicACN39;
if (abbr == "ACN40") return ambisonicACN40;
if (abbr == "ACN41") return ambisonicACN41;
if (abbr == "ACN42") return ambisonicACN42;
if (abbr == "ACN43") return ambisonicACN43;
if (abbr == "ACN44") return ambisonicACN44;
if (abbr == "ACN45") return ambisonicACN45;
if (abbr == "ACN46") return ambisonicACN46;
if (abbr == "ACN47") return ambisonicACN47;
if (abbr == "ACN48") return ambisonicACN48;
if (abbr == "ACN49") return ambisonicACN49;
if (abbr == "ACN50") return ambisonicACN50;
if (abbr == "ACN51") return ambisonicACN51;
if (abbr == "ACN52") return ambisonicACN52;
if (abbr == "ACN53") return ambisonicACN53;
if (abbr == "ACN54") return ambisonicACN54;
if (abbr == "ACN55") return ambisonicACN55;
if (abbr == "ACN56") return ambisonicACN56;
if (abbr == "ACN57") return ambisonicACN57;
if (abbr == "ACN58") return ambisonicACN58;
if (abbr == "ACN59") return ambisonicACN59;
if (abbr == "ACN60") return ambisonicACN60;
if (abbr == "ACN61") return ambisonicACN61;
if (abbr == "ACN62") return ambisonicACN62;
if (abbr == "ACN63") return ambisonicACN63;
if (abbr == "Tsl") return topSideLeft;
if (abbr == "Tsr") return topSideRight;
if (abbr == "Bfl") return bottomFrontLeft;
Expand Down Expand Up @@ -419,8 +338,6 @@ String AudioChannelSet::getDescription() const
if (*this == createLCRS()) return "LCRS";

if (*this == create5point0()) return "5.0 Surround";
if (*this == create5point0point2()) return "5.0.2 Surround";
if (*this == create5point0point4()) return "5.0.4 Surround";
if (*this == create5point1()) return "5.1 Surround";
if (*this == create5point1point2()) return "5.1.2 Surround";
if (*this == create5point1point4()) return "5.1.4 Surround";
Expand All @@ -434,13 +351,9 @@ String AudioChannelSet::getDescription() const
if (*this == create7point1SDDS()) return "7.1 Surround SDDS";
if (*this == create7point0point2()) return "7.0.2 Surround";
if (*this == create7point0point4()) return "7.0.4 Surround";
if (*this == create7point0point6()) return "7.0.6 Surround";
if (*this == create7point1point2()) return "7.1.2 Surround";
if (*this == create7point1point4()) return "7.1.4 Surround";
if (*this == create7point1point6()) return "7.1.6 Surround";
if (*this == create9point0point4()) return "9.0.4 Surround";
if (*this == create9point1point4()) return "9.1.4 Surround";
if (*this == create9point0point6()) return "9.0.6 Surround";
if (*this == create9point1point6()) return "9.1.6 Surround";

if (*this == quadraphonic()) return "Quadraphonic";
Expand Down Expand Up @@ -473,11 +386,11 @@ String AudioChannelSet::getDescription() const

bool AudioChannelSet::isDiscreteLayout() const noexcept
{
const auto channelTypes = getChannelTypes();
for (auto& speaker : getChannelTypes())
if (speaker <= ambisonicACN35)
return false;

return std::none_of (std::begin (channelTypes),
std::end (channelTypes),
[] (const auto& t) { return t < discreteChannel0; });
return true;
}

int AudioChannelSet::size() const noexcept
Expand Down Expand Up @@ -554,44 +467,26 @@ AudioChannelSet AudioChannelSet::quadraphonic() { return AudioChannelSet
AudioChannelSet AudioChannelSet::pentagonal() { return AudioChannelSet ({ left, right, centre, leftSurroundRear, rightSurroundRear }); }
AudioChannelSet AudioChannelSet::hexagonal() { return AudioChannelSet ({ left, right, centre, centreSurround, leftSurroundRear, rightSurroundRear }); }
AudioChannelSet AudioChannelSet::octagonal() { return AudioChannelSet ({ left, right, centre, leftSurround, rightSurround, centreSurround, wideLeft, wideRight }); }
AudioChannelSet AudioChannelSet::create5point0point2() { return AudioChannelSet ({ left, right, centre, leftSurround, rightSurround, topSideLeft, topSideRight }); }
AudioChannelSet AudioChannelSet::create5point1point2() { return AudioChannelSet ({ left, right, centre, LFE, leftSurround, rightSurround, topSideLeft, topSideRight }); }
AudioChannelSet AudioChannelSet::create5point0point4() { return AudioChannelSet ({ left, right, centre, leftSurround, rightSurround, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create5point1point4() { return AudioChannelSet ({ left, right, centre, LFE, leftSurround, rightSurround, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create7point0point2() { return AudioChannelSet ({ left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topSideLeft, topSideRight }); }
AudioChannelSet AudioChannelSet::create7point1point2() { return AudioChannelSet ({ left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topSideLeft, topSideRight }); }
AudioChannelSet AudioChannelSet::create7point0point4() { return AudioChannelSet ({ left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create7point1point4() { return AudioChannelSet ({ left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create7point0point6() { return AudioChannelSet ({ left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topFrontLeft, topFrontRight, topSideLeft, topSideRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create7point1point6() { return AudioChannelSet ({ left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, topFrontLeft, topFrontRight, topSideLeft, topSideRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create9point0point4() { return AudioChannelSet ({ left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, wideLeft, wideRight, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create9point1point4() { return AudioChannelSet ({ left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, wideLeft, wideRight, topFrontLeft, topFrontRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create9point0point6() { return AudioChannelSet ({ left, right, centre, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, wideLeft, wideRight, topFrontLeft, topFrontRight, topSideLeft, topSideRight, topRearLeft, topRearRight }); }
AudioChannelSet AudioChannelSet::create9point1point6() { return AudioChannelSet ({ left, right, centre, LFE, leftSurroundSide, rightSurroundSide, leftSurroundRear, rightSurroundRear, wideLeft, wideRight, topFrontLeft, topFrontRight, topSideLeft, topSideRight, topRearLeft, topRearRight }); }

AudioChannelSet AudioChannelSet::ambisonic (int order)
{
jassert (isPositiveAndBelow (order, 8));

static constexpr std::pair<int, int> continuousRanges[] { { ambisonicACN0, ambisonicACN3 },
{ ambisonicACN4, ambisonicACN35 },
{ ambisonicACN36, ambisonicACN63 } };
jassert (isPositiveAndBelow (order, 6));

AudioChannelSet set;
if (order == 0)
return AudioChannelSet ((uint32) (1 << ambisonicACN0));

const auto setBits = [&set] (auto range, auto maxNumToSet)
{
const auto numToSet = std::min (maxNumToSet, range.second - range.first + 1);
set.channels.setRange (range.first, numToSet, true);
return numToSet;
};
AudioChannelSet set ((1u << ambisonicACN0) | (1u << ambisonicACN1) | (1u << ambisonicACN2) | (1u << ambisonicACN3));

const auto numAmbisonicChannels = square (order + 1);

for (int rangeIdx = 0, bitsSet = 0; bitsSet < numAmbisonicChannels; ++rangeIdx)
{
bitsSet += setBits (continuousRanges[rangeIdx], numAmbisonicChannels - bitsSet);
}
auto numAmbisonicChannels = (order + 1) * (order + 1);
set.channels.setRange (ambisonicACN4, numAmbisonicChannels - 4, true);

return set;
}
Expand Down Expand Up @@ -736,13 +631,15 @@ int32 AudioChannelSet::getWaveChannelMask() const noexcept
}

//==============================================================================
int AudioChannelSet::getAmbisonicOrderForNumChannels (int numChannels, int maxOrderToCheck)
int JUCE_CALLTYPE AudioChannelSet::getAmbisonicOrderForNumChannels (int numChannels)
{
for (auto i = 0; i <= maxOrderToCheck; ++i)
if (numChannels == square (i + 1))
return i;
auto sqrtMinusOne = std::sqrt (static_cast<float> (numChannels)) - 1.0f;
auto ambisonicOrder = jmax (0, static_cast<int> (std::floor (sqrtMinusOne)));

return -1;
if (ambisonicOrder > 5)
return -1;

return (static_cast<float> (ambisonicOrder) == sqrtMinusOne ? ambisonicOrder : -1);
}


Expand Down
Loading

0 comments on commit 3e3be68

Please sign in to comment.