Skip to content

Commit

Permalink
bump aap-core and aap-juce to use the latest extensions API (v2) and …
Browse files Browse the repository at this point in the history 
…web UI.
  • Loading branch information
@atsushieno
atsushieno committed Apr 14, 2023
1 parent d801d00 commit 136e305
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
14 changes: 7 additions & 7 deletions apps/override.vitaloid.jucer
View file
Original file line number Diff line number Diff line change
Expand Up @@ -843,12 +843,12 @@
<MODULEPATH id="juce_gui_extra" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_opengl" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_dsp" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juceaap_audio_plugin_client" path="../../../external/aap-juce/aap-modules" />
<MODULEPATH id="aap_audio_processors" path="../../../external/aap-juce/aap-modules" />
</MODULEPATHS>
</LINUX_MAKE>
<ANDROIDSTUDIO targetFolder="Builds/Android" bigIcon="JqKIEw" smallIcon="oFf3hH"
androidMinimumSDK="29" androidTargetSDK="33"
androidDependencies="implementation libs.libcxx.provider&#10;implementation libs.aap.core&#10;implementation libs.aap.midi.device.service"
androidDependencies="implementation libs.libcxx.provider&#10;implementation libs.aap.core&#10;implementation libs.aap.midi.device.service&#10;libs.aap.ui.web"
extraCompilerFlags="-ffast-math -ftree-vectorize -ftree-slp-vectorize -funroll-loops"
extraLinkerFlags="-ffast-math -ftree-vectorize -ftree-slp-vectorize"
extraDefs="REQUIRE_AUTH=0&#10;NO_AUTH=1&#10;OPENGL_ES=1&#10;BUILD_DATE=2021_12_00_00_00&#10;_GLIBCXX_USE_CXX11_ABI=0&#10;JUCE_JACK_CLIENT_NAME=&quot;Vital&quot;&#10;JUCE_ALSA_MIDI_INPUT_NAME=&quot;Vital&quot;&#10;JUCE_ALSA_MIDI_OUTPUT_NAME=&quot;Vital&quot;&#10;JUCE_USE_XRANDR=0&#10;JUCE_OPENGL3=1&#10;JUCE_DSP_USE_SHARED_FFTW=1"
Expand Down Expand Up @@ -880,7 +880,7 @@
<MODULEPATH id="juce_audio_formats" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_devices" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_basics" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juceaap_audio_plugin_client" path="../../../external/aap-juce/aap-modules" />
<MODULEPATH id="aap_audio_processors" path="../../../external/aap-juce/aap-modules" />
</MODULEPATHS>
</ANDROIDSTUDIO>
<XCODE_MAC targetFolder="builds/osx" vst3Folder="../third_party/VST3_SDK"
Expand Down Expand Up @@ -915,7 +915,7 @@
<MODULEPATH id="juce_gui_extra" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_opengl" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_dsp" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juceaap_audio_plugin_client" path="../../../external/aap-juce/aap-modules" />
<MODULEPATH id="aap_audio_processors" path="../../../external/aap-juce/aap-modules" />
</MODULEPATHS>
</XCODE_MAC>
<XCODE_IPHONE targetFolder="builds/iOS" iosScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight"
Expand All @@ -942,7 +942,7 @@
<MODULEPATH id="juce_audio_formats" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_devices" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_basics" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juceaap_audio_plugin_client" path="../../../external/aap-juce/aap-modules" />
<MODULEPATH id="aap_audio_processors" path="../../../external/aap-juce/aap-modules" />
</MODULEPATHS>
</XCODE_IPHONE>
<VS2017 targetFolder="builds/vs17" vst3Folder="../third_party/VST3_SDK"
Expand Down Expand Up @@ -976,12 +976,12 @@
<MODULEPATH id="juce_audio_formats" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_devices" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juce_audio_basics" path="../third_party/JUCE/modules"/>
<MODULEPATH id="juceaap_audio_plugin_client" path="../../../external/aap-juce/aap-modules" />
<MODULEPATH id="aap_audio_processors" path="../../../external/aap-juce/aap-modules" />
</MODULEPATHS>
</VS2017>
</EXPORTFORMATS>
<MODULES>
<MODULE id="juceaap_audio_plugin_client" showAllCode="1" useLocalCopy="0"
<MODULE id="aap_audio_processors" showAllCode="1" useLocalCopy="0"
useGlobalPath="0"/>
<MODULES id="juce_audio_basics" showAllCode="1" useLocalCopy="0"/>
<MODULES id="juce_audio_devices" showAllCode="1" useLocalCopy="0"/>
Expand Down
6 changes: 5 additions & 1 deletion apps/vitaloid.aap_metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
manufacturer="github.com/atsushieno/aap-juce-vital" unique-id="juceaap:56746c64"
library="libjuce_jni.so" entrypoint="GetJuceAAPFactory" assets="">
<extensions>
<extension uri="urn://androidaudioplugin.org/extensions/presets/v1"/>
<extension uri="urn://androidaudioplugin.org/extensions/plugin-info/v2"/>
<extension uri="urn://androidaudioplugin.org/extensions/presets/v2"/>
<extension uri="urn://androidaudioplugin.org/extensions/state/v2"/>
<extension uri="urn://androidaudioplugin.org/extensions/midi2/v2"/>
<extension uri="urn://androidaudioplugin.org/extensions/gui/v2"/>
</extensions>
<parameters xmlns="urn://androidaudioplugin.org/extensions/parameters">
<parameter id="0" name="Beats Per Minute" direction="input" default="0.3571428656578064"
Expand Down
2 changes: 1 addition & 1 deletion external/aap-core
Submodule aap-core updated 86 files
+0 −3 .gitmodules
+2 −1 androidaudioplugin-midi-device-service/build.gradle.kts
+1 −1 androidaudioplugin-midi-device-service/src/main/cpp/AAPMidiProcessor.cpp
+6 −0 androidaudioplugin-midi-device-service/src/main/cpp/AAPMidiProcessor.h
+3 −8 androidaudioplugin-midi-device-service/src/main/cpp/CMakeLists.txt
+1 −1 androidaudioplugin-samples-host-engine/build.gradle.kts
+54 −82 ...idaudioplugin-samples-host-engine/src/main/java/org/androidaudioplugin/samples/host/engine/PluginPreview.kt
+1 −1 androidaudioplugin-testing/build.gradle.kts
+2 −2 androidaudioplugin-ui-compose/build.gradle.kts
+37 −3 androidaudioplugin-ui-compose/src/main/java/org/androidaudioplugin/ui/compose/PluginDetails.kt
+2 −1 androidaudioplugin-ui-web/build.gradle.kts
+3 −0 androidaudioplugin-ui-web/consumer-rules.pro
+2 −1 androidaudioplugin-ui-web/proguard-rules.pro
+4 −4 androidaudioplugin-ui-web/src/main/assets/web/index.html
+4 −10 androidaudioplugin-ui-web/src/main/java/org/androidaudioplugin/ui/web/AAPClientScriptInterface.kt
+33 −3 androidaudioplugin-ui-web/src/main/java/org/androidaudioplugin/ui/web/AAPScriptInterface.kt
+2 −7 androidaudioplugin-ui-web/src/main/java/org/androidaudioplugin/ui/web/AAPServiceScriptInterface.kt
+13 −4 androidaudioplugin-ui-web/src/main/java/org/androidaudioplugin/ui/web/WebUIHostHelper.kt
+5 −3 androidaudioplugin/build.gradle.kts
+2 −1 androidaudioplugin/proguard-rules.pro
+1 −1 androidaudioplugin/src/main/aidl/org/androidaudioplugin/AudioPluginInterface.aidl
+2 −1 androidaudioplugin/src/main/aidl/org/androidaudioplugin/AudioPluginInterfaceCallback.aidl
+33 −5 androidaudioplugin/src/main/cpp/android/AAPJniFacade.cpp
+6 −3 androidaudioplugin/src/main/cpp/android/AudioPluginInterfaceImpl.h
+35 −2 androidaudioplugin/src/main/cpp/android/AudioPluginNatives_jni.cpp
+18 −0 androidaudioplugin/src/main/cpp/android/audio-plugin-host-android-internal.h
+8 −20 androidaudioplugin/src/main/cpp/android/binder-client-as-plugin.cpp
+2 −2 androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/AudioPluginInterface.h
+6 −3 androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/AudioPluginInterfaceCallback.h
+2 −2 androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/BnAudioPluginInterface.h
+5 −2 ...idaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/BnAudioPluginInterfaceCallback.h
+1 −1 androidaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/BpAudioPluginInterface.h
+2 −1 ...idaudioplugin/src/main/cpp/android/gen/include/aidl/org/androidaudioplugin/BpAudioPluginInterfaceCallback.h
+7 −7 androidaudioplugin/src/main/cpp/android/gen/org/androidaudioplugin/AudioPluginInterface.cpp
+60 −12 androidaudioplugin/src/main/cpp/android/gen/org/androidaudioplugin/AudioPluginInterfaceCallback.cpp
+4 −0 androidaudioplugin/src/main/cpp/core/AAPJniFacade.h
+11 −16 androidaudioplugin/src/main/cpp/core/extensions/gui-service.cpp
+15 −14 androidaudioplugin/src/main/cpp/core/extensions/gui-service.h
+5 −4 androidaudioplugin/src/main/cpp/core/extensions/midi-service.h
+1 −0 androidaudioplugin/src/main/cpp/core/extensions/parameters-service.h
+6 −6 androidaudioplugin/src/main/cpp/core/extensions/port-config-service.cpp
+6 −5 androidaudioplugin/src/main/cpp/core/extensions/port-config-service.h
+12 −12 androidaudioplugin/src/main/cpp/core/extensions/presets-service.cpp
+13 −12 androidaudioplugin/src/main/cpp/core/extensions/presets-service.h
+8 −8 androidaudioplugin/src/main/cpp/core/extensions/state-service.cpp
+8 −8 androidaudioplugin/src/main/cpp/core/extensions/state-service.h
+96 −20 androidaudioplugin/src/main/cpp/core/hosting/audio-plugin-host.cpp
+31 −0 androidaudioplugin/src/main/cpp/core/hosting/utility.h
+73 −16 androidaudioplugin/src/main/java/org/androidaudioplugin/AudioPluginView.kt
+5 −0 androidaudioplugin/src/main/java/org/androidaudioplugin/NativeLocalPluginInstance.kt
+6 −1 androidaudioplugin/src/main/java/org/androidaudioplugin/hosting/AudioPluginClientBase.kt
+10 −11 androidaudioplugin/src/main/java/org/androidaudioplugin/hosting/AudioPluginHostHelper.kt
+18 −13 androidaudioplugin/src/main/java/org/androidaudioplugin/hosting/AudioPluginInstance.kt
+11 −6 androidaudioplugin/src/main/java/org/androidaudioplugin/hosting/NativePluginClient.kt
+39 −30 androidaudioplugin/src/main/java/org/androidaudioplugin/hosting/NativeRemotePluginInstance.kt
+1 −1 androidaudioplugin/src/main/update-binder.sh
+1 −1 external/cmidi2
+0 −1 external/oboe
+29 −16 gradle/libs.versions.toml
+147 −1 include/aap/android-audio-plugin.h
+107 −110 include/aap/core/aapxs/standard-extensions.h
+9 −2 include/aap/core/host/plugin-host.h
+58 −29 include/aap/core/host/plugin-instance.h
+15 −0 include/aap/core/plugin-information.h
+8 −13 include/aap/ext/gui.h
+3 −4 include/aap/ext/midi.h
+7 −9 include/aap/ext/parameters.h
+9 −12 include/aap/ext/plugin-info.h
+5 −7 include/aap/ext/port-config.h
+8 −13 include/aap/ext/presets.h
+11 −9 include/aap/ext/state.h
+0 −159 include/aap/unstable/aap-core.h
+1 −1 include/aap/unstable/aapxs.h
+2 −2 samples/aap-midi-device-service/build.gradle.kts
+2 −2 samples/aapbarebonepluginsample/build.gradle.kts
+7 −6 samples/aapbarebonepluginsample/src/main/cpp/aapbarebonepluginsample.cpp
+4 −4 samples/aapbarebonepluginsample/src/main/res/xml/aap_metadata.xml
+1 −1 samples/aaphostsample/build.gradle.kts
+2 −2 samples/aapinstrumentsample/build.gradle.kts
+142 −171 samples/aapinstrumentsample/src/main/cpp/aapinstrumentsample.cpp
+5 −5 samples/aapinstrumentsample/src/main/res/xml/aap_metadata.xml
+2 −2 samples/aapxssample/build.gradle.kts
+2 −2 samples/aapxssample/src/main/cpp/include/aap/examples/aapxs/test-extension.h
+4 −4 samples/aapxssample/src/main/cpp/test-extension-service.cpp
+2 −2 samples/aapxssample/src/main/cpp/test-plugin.cpp
+3 −3 samples/aapxssample/src/main/res/xml/aap_metadata.xml
2 changes: 1 addition & 1 deletion external/aap-juce
Submodule aap-juce updated 22 files
+5 −0 .github/workflows/build-dist-with-cmake.yml
+3 −0 .github/workflows/defaults.yml
+4 −4 Makefile.cmake-common
+1 −1 Makefile.common
+7 −15 README.md
+0 −0 aap-modules/aap_audio_plugin_client/aap_audio_plugin_client.cpp
+3 −3 aap-modules/aap_audio_plugin_client/aap_audio_plugin_client.h
+0 −0 aap-modules/aap_audio_plugin_client/cmidi2.h
+21 −2 aap-modules/aap_audio_plugin_client/juceaap_audio_plugin_format.cpp
+5 −1 aap-modules/aap_audio_plugin_client/juceaap_audio_plugin_format.h
+0 −0 aap-modules/aap_audio_processors/aap_audio_processors.cpp
+4 −4 aap-modules/aap_audio_processors/aap_audio_processors.h
+1 −0 aap-modules/aap_audio_processors/cmidi2.h
+25 −22 aap-modules/aap_audio_processors/juceaap_AAPWrappers.cpp
+4 −4 aap-modules/aap_audio_processors/juceaap_metadata_generator.cpp
+0 −1 aap-modules/juceaap_audio_plugin_client/cmidi2.h
+287 −0 docs/PLUGIN_PORTING_GUIDE.md
+4 −4 sample-project.build.gradle
+1 −1 sample-project.gradle-wrapper.properties
+23 −15 sample-project.libs.versions.toml
+41 −0 template.CMakeLists.txt.plugin.frag
+6 −0 template.gitignore

0 comments on commit 136e305

Please sign in to comment.