Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Add back juce6.0, to be used for vitalium
Signed-off-by: falkTX <falktx@falktx.com>
- Loading branch information
Showing
1,577 changed files
with
607,150 additions
and
0 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| ############################################################################### | ||
|
|
||
| if linux_embed | ||
| juce60_srcs = [ | ||
| 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||
| 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||
| 'source/modules/juce_audio_processors/juce_audio_processors.cpp', | ||
| 'source/modules/juce_audio_utils/juce_audio_utils.cpp', | ||
| 'source/modules/juce_core/juce_core.cpp', | ||
| 'source/modules/juce_cryptography/juce_cryptography.cpp', | ||
| 'source/modules/juce_data_structures/juce_data_structures.cpp', | ||
| 'source/modules/juce_dsp/juce_dsp.cpp', | ||
| 'source/modules/juce_events/juce_events.cpp', | ||
| ] | ||
| else | ||
| juce60_srcs = [ | ||
| 'source/modules/juce_audio_basics/juce_audio_basics.cpp', | ||
| 'source/modules/juce_audio_formats/juce_audio_formats.cpp', | ||
| 'source/modules/juce_audio_processors/juce_audio_processors.cpp', | ||
| 'source/modules/juce_audio_utils/juce_audio_utils.cpp', | ||
| 'source/modules/juce_core/juce_core.cpp', | ||
| 'source/modules/juce_cryptography/juce_cryptography.cpp', | ||
| 'source/modules/juce_data_structures/juce_data_structures.cpp', | ||
| 'source/modules/juce_dsp/juce_dsp.cpp', | ||
| 'source/modules/juce_events/juce_events.cpp', | ||
| 'source/modules/juce_graphics/juce_graphics.cpp', | ||
| 'source/modules/juce_gui_basics/juce_gui_basics.cpp', | ||
| 'source/modules/juce_gui_extra/juce_gui_extra.cpp', | ||
| 'source/modules/juce_opengl/juce_opengl.cpp', | ||
| ] | ||
| endif | ||
|
|
||
| juce60_devices_srcs = [ | ||
| 'source/modules/juce_audio_devices/juce_audio_devices.cpp', | ||
| ] | ||
|
|
||
| juce60_extra_cpp_args = [ | ||
| '-std=gnu++14', | ||
| '-Wno-non-virtual-dtor', | ||
| ] | ||
|
|
||
| if os_windows | ||
| juce60_extra_cpp_args += [ | ||
| '-D_NATIVE_WCHAR_T_DEFINED', | ||
| '-D__wchar_t=wchar_t', | ||
| '-Wno-unknown-pragmas', | ||
| ] | ||
| if host_machine.cpu() == 'x86' | ||
| juce60_extra_cpp_args += [ | ||
| '-mpreferred-stack-boundary=2', | ||
| ] | ||
| endif | ||
| endif | ||
|
|
||
| lib_juce60 = static_library('juce60', | ||
| sources: juce60_srcs, | ||
| include_directories: [ | ||
| include_directories('.'), | ||
| include_directories('source'), | ||
| include_directories('source/modules'), | ||
| include_directories('../juced/source/dependancies/ladspa_sdk/src'), | ||
| ], | ||
| cpp_args: build_flags_cpp + juce60_extra_cpp_args, | ||
| dependencies: dependencies, | ||
| pic: true, | ||
| install: false, | ||
| ) | ||
|
|
||
| lib_juce60_device = static_library('juce60-devices', | ||
| sources: juce60_devices_srcs, | ||
| include_directories: [ | ||
| include_directories('.'), | ||
| include_directories('source'), | ||
| include_directories('source/modules'), | ||
| ], | ||
| cpp_args: build_flags_cpp + juce60_extra_cpp_args + ['-DJUCE_MODULE_AVAILABLE_juce_audio_devices=1'], | ||
| dependencies: dependencies_devices, | ||
| pic: true, | ||
| install: false, | ||
| ) | ||
|
|
||
| ############################################################################### |
14 changes: 14 additions & 0 deletions
14
libs/juce6.0/patches/01_audiodevicemanager-prefer-jack-over-alsa.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp | ||
| index a19c7b05e..deabba6db 100644 | ||
| --- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp | ||
| +++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.cpp | ||
| @@ -185,8 +185,8 @@ void AudioDeviceManager::createAudioDeviceTypes (OwnedArray<AudioIODeviceType>& | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_CoreAudio()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_iOSAudio()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_Bela()); | ||
| - addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_ALSA()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_JACK()); | ||
| + addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_ALSA()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_Oboe()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_OpenSLES()); | ||
| addIfNotNull (list, AudioIODeviceType::createAudioIODeviceType_Android()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| diff --git a/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c b/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c | ||
| index 4eac42e95..74d120e7d 100644 | ||
| --- a/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c | ||
| +++ b/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c | ||
| @@ -240,42 +240,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) | ||
| disable_sse(info); | ||
| # endif | ||
| #elif defined(__linux__) | ||
| - int sse = 0; | ||
| - struct sigaction sigill_save; | ||
| - struct sigaction sigill_sse; | ||
| - sigill_sse.sa_sigaction = sigill_handler_sse_os; | ||
| - #ifdef __ANDROID__ | ||
| - sigemptyset (&sigill_sse.sa_mask); | ||
| - #else | ||
| - __sigemptyset(&sigill_sse.sa_mask); | ||
| - #endif | ||
| - sigill_sse.sa_flags = SA_SIGINFO | SA_RESETHAND; /* SA_RESETHAND just in case our SIGILL return jump breaks, so we don't get stuck in a loop */ | ||
| - if(0 == sigaction(SIGILL, &sigill_sse, &sigill_save)) | ||
| - { | ||
| - /* http://www.ibiblio.org/gferg/ldp/GCC-Inline-Assembly-HOWTO.html */ | ||
| - /* see sigill_handler_sse_os() for an explanation of the following: */ | ||
| - asm volatile ( | ||
| - "xorps %%xmm0,%%xmm0\n\t" /* will cause SIGILL if unsupported by OS */ | ||
| - "incl %0\n\t" /* SIGILL handler will jump over this */ | ||
| - /* landing zone */ | ||
| - "nop\n\t" /* SIGILL jump lands here if "inc" is 9 bytes */ | ||
| - "nop\n\t" | ||
| - "nop\n\t" | ||
| - "nop\n\t" | ||
| - "nop\n\t" | ||
| - "nop\n\t" | ||
| - "nop\n\t" /* SIGILL jump lands here if "inc" is 3 bytes (expected) */ | ||
| - "nop\n\t" | ||
| - "nop" /* SIGILL jump lands here if "inc" is 1 byte */ | ||
| - : "=r"(sse) | ||
| - : "0"(sse) | ||
| - ); | ||
| - | ||
| - sigaction(SIGILL, &sigill_save, NULL); | ||
| - } | ||
| - | ||
| - if(!sse) | ||
| - disable_sse(info); | ||
| + int sse = 1; | ||
| #elif defined(_MSC_VER) | ||
| __try { | ||
| __asm { | ||
| @@ -287,30 +252,7 @@ void FLAC__cpu_info(FLAC__CPUInfo *info) | ||
| disable_sse(info); | ||
| } | ||
| #elif defined(__GNUC__) /* MinGW goes here */ | ||
| - int sse = 0; | ||
| - /* Based on the idea described in Agner Fog's manual "Optimizing subroutines in assembly language" */ | ||
| - /* In theory, not guaranteed to detect lack of OS SSE support on some future Intel CPUs, but in practice works (see the aforementioned manual) */ | ||
| - if (ia32_fxsr) { | ||
| - struct { | ||
| - FLAC__uint32 buff[128]; | ||
| - } __attribute__((aligned(16))) fxsr; | ||
| - FLAC__uint32 old_val, new_val; | ||
| - | ||
| - asm volatile ("fxsave %0" : "=m" (fxsr) : "m" (fxsr)); | ||
| - old_val = fxsr.buff[50]; | ||
| - fxsr.buff[50] ^= 0x0013c0de; /* change value in the buffer */ | ||
| - asm volatile ("fxrstor %0" : "=m" (fxsr) : "m" (fxsr)); /* try to change SSE register */ | ||
| - fxsr.buff[50] = old_val; /* restore old value in the buffer */ | ||
| - asm volatile ("fxsave %0 " : "=m" (fxsr) : "m" (fxsr)); /* old value will be overwritten if SSE register was changed */ | ||
| - new_val = fxsr.buff[50]; /* == old_val if FXRSTOR didn't change SSE register and (old_val ^ 0x0013c0de) otherwise */ | ||
| - fxsr.buff[50] = old_val; /* again restore old value in the buffer */ | ||
| - asm volatile ("fxrstor %0" : "=m" (fxsr) : "m" (fxsr)); /* restore old values of registers */ | ||
| - | ||
| - if ((old_val^new_val) == 0x0013c0de) | ||
| - sse = 1; | ||
| - } | ||
| - if(!sse) | ||
| - disable_sse(info); | ||
| + int sse = 1; | ||
| #else | ||
| /* no way to test, disable to be safe */ | ||
| disable_sse(info); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/modules/juce_audio_basics/midi/juce_MidiMessage.h b/modules/juce_audio_basics/midi/juce_MidiMessage.h | ||
| index 22ac79483..5c761f659 100644 | ||
| --- a/modules/juce_audio_basics/midi/juce_MidiMessage.h | ||
| +++ b/modules/juce_audio_basics/midi/juce_MidiMessage.h | ||
| @@ -979,7 +979,7 @@ private: | ||
| #endif | ||
|
|
||
| inline bool isHeapAllocated() const noexcept { return size > (int) sizeof (packedData); } | ||
| - inline uint8* getData() const noexcept { return isHeapAllocated() ? packedData.allocatedData : (uint8*) packedData.asBytes; } | ||
| + inline uint8* getData() const noexcept { return isHeapAllocated() ? packedData.allocatedData : const_cast<uint8*>(packedData.asBytes); } | ||
| uint8* allocateSpace (int); | ||
| }; | ||
|
|
Oops, something went wrong.