From 8e1197b7f03c05e17a0507759656a63912292a2a Mon Sep 17 00:00:00 2001 From: Ben Kuper Date: Fri, 22 Dec 2023 14:00:04 +0100 Subject: [PATCH] 18b1 mapping input triggersProcess and organic update --- Builds/LinuxMakefile/Makefile | 4 +- .../Chataigne.xcodeproj/project.pbxproj | 18 +- Builds/MacOSX/Info-App.plist | 4 +- .../Chataigne.xcodeproj/project.pbxproj | 10 +- Builds/MacOSX_CI/Info-App.plist | 4 +- Builds/Raspberry/Makefile | 4 +- Builds/Raspberry64/Makefile | 4 +- Builds/VisualStudio2022/Chataigne_App.vcxproj | 9 +- .../Chataigne_App.vcxproj.filters | 3 + Builds/VisualStudio2022/resources.rc | 6 +- .../VisualStudio2022_CI/Chataigne_App.vcxproj | 9 +- .../Chataigne_App.vcxproj.filters | 3 + Builds/VisualStudio2022_CI/resources.rc | 6 +- .../Chataigne_App.vcxproj | 9 +- .../Chataigne_App.vcxproj.filters | 3 + Builds/VisualStudio2022_Win7CI/resources.rc | 6 +- Chataigne.jucer | 3 +- JuceLibraryCode/BinaryData.cpp | 318 +++++++++--------- JuceLibraryCode/BinaryData.h | 5 +- JuceLibraryCode/JuceHeader.h | 4 +- Modules/juce_organicui | 2 +- Modules/juce_timeline | 2 +- Resources/process.png | Bin 0 -> 717 bytes .../Processor/Mapping/Input/MappingInput.cpp | 3 + .../Processor/Mapping/Input/MappingInput.h | 1 + .../Mapping/Input/ui/MappingInputEditor.cpp | 22 +- .../Mapping/Input/ui/MappingInputEditor.h | 1 + Source/Common/Processor/Mapping/Mapping.cpp | 4 +- 28 files changed, 258 insertions(+), 209 deletions(-) create mode 100644 Resources/process.png diff --git a/Builds/LinuxMakefile/Makefile b/Builds/LinuxMakefile/Makefile index 8f59f1fd2..9b413f1bf 100644 --- a/Builds/LinuxMakefile/Makefile +++ b/Builds/LinuxMakefile/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -m64 endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -m64 endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DGDK_BACKEND=x11" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne diff --git a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj index 3b558e187..d837c81a7 100644 --- a/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj @@ -122,6 +122,7 @@ 01FB0EC51EDF5579E6446D73 /* Action.cpp */ /* Action.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Action.cpp; path = ../../Source/Common/Processor/Action/Action.cpp; sourceTree = SOURCE_ROOT; }; 021E427BFA3E8B6BC6AC3D5A /* TCPClientModule.cpp */ /* TCPClientModule.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TCPClientModule.cpp; path = ../../Source/Module/modules/tcp/tcpclient/TCPClientModule.cpp; sourceTree = SOURCE_ROOT; }; 02719A9820DD6EE1547FA8FE /* ZeroconfManager.h */ /* ZeroconfManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ZeroconfManager.h; path = ../../Source/Common/Zeroconf/ZeroconfManager.h; sourceTree = SOURCE_ROOT; }; + 0330DBB20FDF9D9EBD0F983A /* process.png */ /* process.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = process.png; path = ../../Resources/process.png; sourceTree = SOURCE_ROOT; }; 03AB9E7E2EEBA80B4F45E924 /* CustomValuesCommandArgumentManager.cpp */ /* CustomValuesCommandArgumentManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CustomValuesCommandArgumentManager.cpp; path = ../../Source/Common/Command/CustomValues/CustomValuesCommandArgumentManager.cpp; sourceTree = SOURCE_ROOT; }; 03B34F65CD67AA62113F23C3 /* include_juce_organicui2.cpp */ /* include_juce_organicui2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_organicui2.cpp; path = ../../JuceLibraryCode/include_juce_organicui2.cpp; sourceTree = SOURCE_ROOT; }; 03BEA098E001E6F85A88913C /* StreamDeckCommand.h */ /* StreamDeckCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StreamDeckCommand.h; path = ../../Source/Module/modules/controller/streamdeck/commands/StreamDeckCommand.h; sourceTree = SOURCE_ROOT; }; @@ -2875,6 +2876,7 @@ C220F6DC306F1E9F6178C370 /* Resources */ = { isa = PBXGroup; children = ( + 0330DBB20FDF9D9EBD0F983A, 3817618A6541867A57699C53, 1801A84E852A7D8B922A5D78, B304D7517FFA94986E5C1C15, @@ -3815,8 +3817,8 @@ "USE_ABLETONLINK=1", "LINK_PLATFORM_MACOSX=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -3896,8 +3898,8 @@ "USE_ABLETONLINK=1", "LINK_PLATFORM_MACOSX=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -4027,8 +4029,8 @@ "USE_ABLETONLINK=1", "LINK_PLATFORM_MACOSX=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -4108,8 +4110,8 @@ "USE_ABLETONLINK=1", "LINK_PLATFORM_MACOSX=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist index c63d25913..d5a365fa7 100644 --- a/Builds/MacOSX/Info-App.plist +++ b/Builds/MacOSX/Info-App.plist @@ -25,9 +25,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 1.9.17 + 1.9.18b1 CFBundleVersion - 1.9.17 + 1.9.18b1 NSHumanReadableCopyright Ben Kuper NSHighResolutionCapable diff --git a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj index eae7a06ea..7dc2c8529 100644 --- a/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj +++ b/Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj @@ -122,6 +122,7 @@ 01FB0EC51EDF5579E6446D73 /* Action.cpp */ /* Action.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Action.cpp; path = ../../Source/Common/Processor/Action/Action.cpp; sourceTree = SOURCE_ROOT; }; 021E427BFA3E8B6BC6AC3D5A /* TCPClientModule.cpp */ /* TCPClientModule.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TCPClientModule.cpp; path = ../../Source/Module/modules/tcp/tcpclient/TCPClientModule.cpp; sourceTree = SOURCE_ROOT; }; 02719A9820DD6EE1547FA8FE /* ZeroconfManager.h */ /* ZeroconfManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ZeroconfManager.h; path = ../../Source/Common/Zeroconf/ZeroconfManager.h; sourceTree = SOURCE_ROOT; }; + 0330DBB20FDF9D9EBD0F983A /* process.png */ /* process.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = process.png; path = ../../Resources/process.png; sourceTree = SOURCE_ROOT; }; 03AB9E7E2EEBA80B4F45E924 /* CustomValuesCommandArgumentManager.cpp */ /* CustomValuesCommandArgumentManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CustomValuesCommandArgumentManager.cpp; path = ../../Source/Common/Command/CustomValues/CustomValuesCommandArgumentManager.cpp; sourceTree = SOURCE_ROOT; }; 03B34F65CD67AA62113F23C3 /* include_juce_organicui2.cpp */ /* include_juce_organicui2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = include_juce_organicui2.cpp; path = ../../JuceLibraryCode/include_juce_organicui2.cpp; sourceTree = SOURCE_ROOT; }; 03BEA098E001E6F85A88913C /* StreamDeckCommand.h */ /* StreamDeckCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StreamDeckCommand.h; path = ../../Source/Module/modules/controller/streamdeck/commands/StreamDeckCommand.h; sourceTree = SOURCE_ROOT; }; @@ -2875,6 +2876,7 @@ C220F6DC306F1E9F6178C370 /* Resources */ = { isa = PBXGroup; children = ( + 0330DBB20FDF9D9EBD0F983A, 3817618A6541867A57699C53, 1801A84E852A7D8B922A5D78, B304D7517FFA94986E5C1C15, @@ -3767,8 +3769,8 @@ "LINK_PLATFORM_MACOSX=1", "OS_SYSINFO_SUPPORT=0", "JUCER_XCODE_MAC_2F3811D6=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -3850,8 +3852,8 @@ "LINK_PLATFORM_MACOSX=1", "OS_SYSINFO_SUPPORT=0", "JUCER_XCODE_MAC_2F3811D6=1", - "JUCE_APP_VERSION=1.9.17", - "JUCE_APP_VERSION_HEX=0x10911", + "JUCE_APP_VERSION=1.9.18b1", + "JUCE_APP_VERSION_HEX=0x10912", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/Builds/MacOSX_CI/Info-App.plist b/Builds/MacOSX_CI/Info-App.plist index c63d25913..d5a365fa7 100644 --- a/Builds/MacOSX_CI/Info-App.plist +++ b/Builds/MacOSX_CI/Info-App.plist @@ -25,9 +25,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 1.9.17 + 1.9.18b1 CFBundleVersion - 1.9.17 + 1.9.18b1 NSHumanReadableCopyright Ben Kuper NSHighResolutionCapable diff --git a/Builds/Raspberry/Makefile b/Builds/Raspberry/Makefile index e1fb4d8c0..c8554a47c 100644 --- a/Builds/Raspberry/Makefile +++ b/Builds/Raspberry/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=armv8-a endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_9C1B7400=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne diff --git a/Builds/Raspberry64/Makefile b/Builds/Raspberry64/Makefile index a066731ea..bb863e4e0 100644 --- a/Builds/Raspberry64/Makefile +++ b/Builds/Raspberry64/Makefile @@ -39,7 +39,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne @@ -60,7 +60,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := endif - JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.17" "-DJUCE_APP_VERSION_HEX=0x10911" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DVST_LOGGING=0" "-DUSE_ABLETONLINK=1" "-DLINK_PLATFORM_LINUX=1" "-DUSE_GPIO=1" "-DJUCER_LINUX_MAKE_30E7ABE=1" "-DJUCE_APP_VERSION=1.9.18b1" "-DJUCE_APP_VERSION_HEX=0x10912" $(shell $(PKG_CONFIG) --cflags alsa freetype2 gl libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../JUCE/modules -I../../Modules -I/usr/include/freetype2 -I../../Source -I../../External/wiiuse -I../../External/asio -I../../External/asiodriver -I../../External/kinect/include -I../../External/joycon/include -I../../External/servus/include -I../../External/dnssd/include -I../../External/ois/include -I../../External/sdl/include -I../../External/hidapi/include -I../../External/abletonlink/include -I../../External/libusb/include/libusb-1.0 -I../../External/mosquitto/include -I../../External/posistagenet/include -I../../External/simpleble/include $(CPPFLAGS) JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" "-DJucePlugin_Build_LV2=0" JUCE_TARGET_APP := Chataigne diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj b/Builds/VisualStudio2022/Chataigne_App.vcxproj index e0bc5007f..dba4c9806 100644 --- a/Builds/VisualStudio2022/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022/Chataigne_App.vcxproj @@ -66,7 +66,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;D:\Softwares\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -81,7 +81,7 @@ ..\..\JuceLibraryCode;D:\Softwares\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -116,7 +116,7 @@ Full ProgramDatabase ..\..\JuceLibraryCode;D:\Softwares\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -131,7 +131,7 @@ ..\..\JuceLibraryCode;D:\Softwares\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78A503E=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -4906,6 +4906,7 @@ + diff --git a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters index 4eb728964..cccd7208e 100644 --- a/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022/Chataigne_App.vcxproj.filters @@ -10169,6 +10169,9 @@ + + Chataigne\Resources + Chataigne\Resources diff --git a/Builds/VisualStudio2022/resources.rc b/Builds/VisualStudio2022/resources.rc index b45f05766..f031cc7a7 100644 --- a/Builds/VisualStudio2022/resources.rc +++ b/Builds/VisualStudio2022/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,9,17,0 +FILEVERSION 1,9,18b1,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -18,9 +18,9 @@ BEGIN VALUE "CompanyName", "Ben Kuper\0" VALUE "LegalCopyright", "Ben Kuper\0" VALUE "FileDescription", "Chataigne\0" - VALUE "FileVersion", "1.9.17\0" + VALUE "FileVersion", "1.9.18b1\0" VALUE "ProductName", "Chataigne\0" - VALUE "ProductVersion", "1.9.17\0" + VALUE "ProductVersion", "1.9.18b1\0" END END diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj index 75b190b43..6f4d30f89 100644 --- a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj @@ -66,7 +66,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -81,7 +81,7 @@ ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -116,7 +116,7 @@ Full ProgramDatabase ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -131,7 +131,7 @@ ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=1;USE_ABLETONLINK=1;LINK_PLATFORM_WINDOWS=1;BLE_SUPPORT=0;JUCER_VS2022_78B14C07=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -4906,6 +4906,7 @@ + diff --git a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters index 109a30cc5..0627d5f33 100644 --- a/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022_CI/Chataigne_App.vcxproj.filters @@ -10169,6 +10169,9 @@ + + Chataigne\Resources + Chataigne\Resources diff --git a/Builds/VisualStudio2022_CI/resources.rc b/Builds/VisualStudio2022_CI/resources.rc index b45f05766..f031cc7a7 100644 --- a/Builds/VisualStudio2022_CI/resources.rc +++ b/Builds/VisualStudio2022_CI/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,9,17,0 +FILEVERSION 1,9,18b1,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -18,9 +18,9 @@ BEGIN VALUE "CompanyName", "Ben Kuper\0" VALUE "LegalCopyright", "Ben Kuper\0" VALUE "FileDescription", "Chataigne\0" - VALUE "FileVersion", "1.9.17\0" + VALUE "FileVersion", "1.9.18b1\0" VALUE "ProductName", "Chataigne\0" - VALUE "ProductVersion", "1.9.17\0" + VALUE "ProductVersion", "1.9.18b1\0" END END diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj index 14c11537e..a2e581670 100644 --- a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj +++ b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj @@ -66,7 +66,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true NotUsing @@ -81,7 +81,7 @@ ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -115,7 +115,7 @@ Full ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) MultiThreadedDLL true NotUsing @@ -130,7 +130,7 @@ ..\..\JuceLibraryCode;..\..\JUCE\modules;..\..\Modules;../../Source;../../External/wiiuse;../../External/asio;../../External/asiodriver;../../External/kinect/include;../../External/joycon/include;../../External/servus/include;../../External/dnssd/include;../../External/ois/include;../../External/sdl/include;../../External/hidapi/include;../../External/abletonlink/include;../../External/libusb/include/libusb-1.0;../../External/mosquitto/include;../../External/posistagenet/include;../../External/simpleble/include;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.17;JUCE_APP_VERSION_HEX=0x10911;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;VST_LOGGING=0;USE_KINECT=0;USE_ABLETONLINK=0;BLE_SUPPORT=0;PING_SUPPORT=0;OS_SYSINFO_SUPPORT=0;JUCER_VS2022_BA4A4C2=1;JUCE_APP_VERSION=1.9.18b1;JUCE_APP_VERSION_HEX=0x10912;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;JucePlugin_Build_Unity=0;JucePlugin_Build_LV2=0;%(PreprocessorDefinitions) $(OutDir)\Chataigne.exe @@ -4905,6 +4905,7 @@ + diff --git a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters index 109a30cc5..0627d5f33 100644 --- a/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters +++ b/Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj.filters @@ -10169,6 +10169,9 @@ + + Chataigne\Resources + Chataigne\Resources diff --git a/Builds/VisualStudio2022_Win7CI/resources.rc b/Builds/VisualStudio2022_Win7CI/resources.rc index b45f05766..f031cc7a7 100644 --- a/Builds/VisualStudio2022_Win7CI/resources.rc +++ b/Builds/VisualStudio2022_Win7CI/resources.rc @@ -9,7 +9,7 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,9,17,0 +FILEVERSION 1,9,18b1,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -18,9 +18,9 @@ BEGIN VALUE "CompanyName", "Ben Kuper\0" VALUE "LegalCopyright", "Ben Kuper\0" VALUE "FileDescription", "Chataigne\0" - VALUE "FileVersion", "1.9.17\0" + VALUE "FileVersion", "1.9.18b1\0" VALUE "ProductName", "Chataigne\0" - VALUE "ProductVersion", "1.9.17\0" + VALUE "ProductVersion", "1.9.18b1\0" END END diff --git a/Chataigne.jucer b/Chataigne.jucer index f532ae017..28087b00c 100644 --- a/Chataigne.jucer +++ b/Chataigne.jucer @@ -1,6 +1,6 @@ - + diff --git a/JuceLibraryCode/BinaryData.cpp b/JuceLibraryCode/BinaryData.cpp index a56475148..196c6f287 100644 --- a/JuceLibraryCode/BinaryData.cpp +++ b/JuceLibraryCode/BinaryData.cpp @@ -9,8 +9,23 @@ namespace BinaryData { -//================== keyframe_off.png ================== +//================== process.png ================== static const unsigned char temp_binary_data_0[] = +{ 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,24,0,0,0,24,8,6,0,0,0,224,119,61,248,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112,72,89,115,0,0,0,177,0,0,0,177,1,198,45,73,141,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,119,119, +119,46,105,110,107,115,99,97,112,101,46,111,114,103,155,238,60,26,0,0,2,74,73,68,65,84,72,137,229,149,203,75,148,81,24,198,127,239,231,167,51,141,50,35,66,23,68,103,16,178,48,196,232,2,133,81,34,218,63,16,129,155,10,2,181,168,22,65,11,161,203,42,34,35, +161,149,139,8,162,168,77,81,224,62,180,145,36,6,187,16,35,57,74,74,89,45,82,70,141,201,201,111,156,203,219,34,103,28,157,102,140,38,55,245,236,158,239,125,222,243,156,243,156,115,190,3,255,61,180,183,212,147,171,110,228,53,184,175,204,73,129,222,88,51, +3,172,104,23,162,238,53,49,208,62,87,19,72,235,106,58,51,87,241,218,208,199,11,170,234,1,232,153,156,169,179,155,198,89,111,227,118,159,250,202,156,88,177,219,128,228,101,160,232,33,132,157,0,95,22,34,84,74,225,102,192,135,21,189,14,226,70,108,22,68, +114,26,172,58,131,12,211,62,87,19,134,62,97,99,203,59,194,129,66,194,254,25,105,8,237,254,109,131,171,254,137,246,116,62,242,45,188,97,124,62,50,59,208,188,163,123,49,26,63,98,56,168,125,80,202,251,203,159,153,243,23,32,114,101,217,32,9,25,148,198,175, +111,224,23,17,137,112,51,157,91,40,83,145,232,8,208,141,21,237,2,241,224,57,239,67,204,189,139,18,55,170,233,61,65,226,177,218,36,201,48,80,101,217,114,139,11,108,206,114,71,108,126,212,235,58,8,218,138,163,234,57,155,90,234,249,62,6,158,142,10,52,97, +1,48,121,231,19,211,189,213,136,156,150,230,240,100,134,65,231,219,113,183,198,205,245,73,222,63,19,114,91,90,244,204,219,184,53,248,51,26,245,3,17,202,79,218,8,189,14,0,38,197,91,42,144,162,117,204,14,12,51,221,87,3,250,72,26,66,15,211,39,184,180,130, +184,121,81,132,182,84,246,225,48,149,182,133,163,192,253,84,52,0,99,29,187,82,61,219,238,6,40,169,113,51,126,174,4,116,154,88,226,204,202,68,82,6,134,202,189,56,250,50,201,171,28,246,58,195,180,13,234,83,236,96,188,64,72,213,80,221,15,28,1,32,208,246, +138,68,236,0,34,45,233,209,228,5,237,119,181,171,215,169,58,124,220,171,94,103,66,251,157,61,217,180,25,155,220,57,52,161,217,196,151,70,63,16,61,220,176,116,180,167,30,239,1,130,152,137,246,108,61,153,55,89,185,149,77,92,93,226,168,31,94,254,201,14, +114,76,246,205,77,101,235,249,35,164,34,202,17,77,18,249,252,174,131,68,227,39,214,208,64,78,253,181,83,179,18,171,61,147,255,22,126,0,17,188,223,155,159,81,160,77,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; + +const char* process_png = (const char*) temp_binary_data_0; + +//================== keyframe_off.png ================== +static const unsigned char temp_binary_data_1[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0\x14\0\0\0\x14\x08\x06\0\0\0\x8d\x89\x1d\r\0\0\0\tpHYs\0\0\x0b\x13\0\0\x0b\x13\x01\0\x9a\x9c\x18\0\0\x05\xc8iTXtXML:com.adobe.xmp\0\0\0\0\0 x\xb7\0\0\0\0\0IEND\xae""B`\x82"; -const char* keyframe_on_png = (const char*) temp_binary_data_1; +const char* keyframe_on_png = (const char*) temp_binary_data_2; //================== nextkey.png ================== -static const unsigned char temp_binary_data_2[] = +static const unsigned char temp_binary_data_3[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x06\0\0\0szz\xf4\0\0\0\tpHYs\0\0\r\xd7\0\0\r\xd7\x01""B(\x9bx\0\0\x06\xb8iTXtXML:com.adobe.xmp\0\0\0\0\0 \x13\xce\x7fL\x1e""B`\x16""1" "hB\xce\xaa\t\x7f\x03\x1a""C\xdc\x0b\xb8X\r\xa1\0\0\0\0IEND\xae""B`\x82"; -const char* KinectV2_png = (const char*) temp_binary_data_15; +const char* KinectV2_png = (const char*) temp_binary_data_16; //================== Loupedeck.png ================== -static const unsigned char temp_binary_data_16[] = +static const unsigned char temp_binary_data_17[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x04\0\0\0\xd9s\xb2\x7f\0\0\0\tpHYs\0\0\x1c \0\0\x1c \x01\xcd\x0f\x9b\x9e\0\0\x05\xc8iTXtXML:com.adobe.xmp\0\0\0\0\0 I\x92\x94n2g\x06\x17\x02""3\x19" "\0\x1fw\xfa\xd5\xb7""b\x02""03\x1c%\x94J!\xfd\xab\0\x97\x10\xf3\xa5\xebSt\xa2\x97\x15\xedQ\xc6\xad#\x97\xf2t\xa4\xdf\xcd`+3\xfa]\x93\xca\xa9x\xe2(\xf1_\x90\0H\0\xfc\xef\x01\xfe\x01\x9b\xce\xdc\x8dK\xf6m?\0\0\0\0IEND\xae""B`\x82"; -const char* TCP_Client_png = (const char*) temp_binary_data_36; +const char* TCP_Client_png = (const char*) temp_binary_data_37; //================== TCP Server.png ================== -static const unsigned char temp_binary_data_37[] = +static const unsigned char temp_binary_data_38[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x06\0\0\0szz\xf4\0\0\0\tpHYs\0\0\0\xec\0\0\0\xec\x01y(q\xbd\0\0\x06\xcaiTXtXML:com.adobe.xmp\0\0\0\0\0 I\x92\x94n2g\x06\x17\x02""3\x19" "\0\x1fw\xfa\xd5\xb7""b\x02""03\x1c%\x94J!\xfd\xab\0\x97\x10\xf3\xa5\xebSt\xa2\x97\x15\xedQ\xc6\xad#\x97\xf2t\xa4\xdf\xcd`+3\xfa]\x93\xca\xa9x\xe2(\xf1_\x90\0H\0\xfc\xef\x01\xfe\x01\x9b\xce\xdc\x8dK\xf6m?\0\0\0\0IEND\xae""B`\x82"; -const char* TCP_Server_png = (const char*) temp_binary_data_37; +const char* TCP_Server_png = (const char*) temp_binary_data_38; //================== Time.png ================== -static const unsigned char temp_binary_data_38[] = +static const unsigned char temp_binary_data_39[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,3,0,0,0,68,164,138,198,0,0,0,3,115,66,73,84,8,8,8,219,225,79,224,0,0,0,9,112,72,89,115,0,0,7,98,0,0,7,98,1,56,122,153,219,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0,119,119, 119,46,105,110,107,115,99,97,112,101,46,111,114,103,155,238,60,26,0,0,0,216,80,76,84,69,255,255,255,223,223,223,137,78,59,143,80,48,136,85,51,230,230,230,229,229,229,230,230,230,158,109,83,230,230,230,230,230,230,230,230,230,158,108,83,156,106,81,169, 126,106,230,230,230,179,136,92,231,231,231,195,150,71,230,230,230,138,83,54,230,230,230,138,83,54,157,106,81,230,227,215,230,227,217,230,228,221,230,228,222,230,228,223,230,229,223,230,229,224,230,230,228,230,230,230,231,217,168,231,217,170,231,219,179, @@ -1551,10 +1566,10 @@ static const unsigned char temp_binary_data_38[] = 190,220,118,238,174,37,173,182,184,240,230,55,123,91,17,195,114,184,48,227,113,60,138,113,35,222,184,88,125,255,206,179,143,162,112,245,69,183,159,65,224,247,18,33,244,162,100,59,244,255,37,176,209,43,148,142,40,132,70,239,220,240,158,30,255,61,176,44, 70,188,110,2,3,59,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* Time_png = (const char*) temp_binary_data_38; +const char* Time_png = (const char*) temp_binary_data_39; //================== UDP.png ================== -static const unsigned char temp_binary_data_39[] = +static const unsigned char temp_binary_data_40[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,244,0,0,0,9,112,72,89,115,0,0,0,236,0,0,0,236,1,121,40,113,189,0,0,5,250,105,84,88,116,88,77,76,58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120, 112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60,120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34, 97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,49,52,53,32,55,57,46,49,54,51,52,57,57,44,32,50,48,49,56,47,48,56,47,49,51,45,49,54,58,52,48,58, @@ -1594,10 +1609,10 @@ static const unsigned char temp_binary_data_39[] = 104,158,247,35,2,48,51,10,200,149,16,52,210,219,96,228,48,83,215,144,222,119,142,249,140,254,56,113,235,32,215,42,50,26,118,130,217,206,224,102,191,234,253,37,170,152,142,253,23,196,0,98,0,255,123,128,127,1,165,214,218,89,248,124,238,185,0,0,0,0,73,69, 78,68,174,66,96,130,0,0 }; -const char* UDP_png = (const char*) temp_binary_data_39; +const char* UDP_png = (const char*) temp_binary_data_40; //================== Watchout.png ================== -static const unsigned char temp_binary_data_40[] = +static const unsigned char temp_binary_data_41[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x06\0\0\0szz\xf4\0\0\0\tpHYs\0\0\x0b\x13\0\0\x0b\x13\x01\0\x9a\x9c\x18\0\0\x06""biTXtXML:com.adobe.xmp\0\0\0\0\0 \x8d" "oTx\xd1{\xee{\x0b\x02\0\0\0\0IEND\xae""B`\x82"; -const char* Wiimote_png = (const char*) temp_binary_data_43; +const char* Wiimote_png = (const char*) temp_binary_data_44; //================== commandScriptTemplate.js ================== -static const unsigned char temp_binary_data_44[] = +static const unsigned char temp_binary_data_45[] = "/* ********** COMMAND SPECIFIC SCRIPTING ********************** */\n" "\n" "\n" @@ -1774,10 +1789,10 @@ static const unsigned char temp_binary_data_44[] = " script.log(\"Trigger !\");\n" "}"; -const char* commandScriptTemplate_js = (const char*) temp_binary_data_44; +const char* commandScriptTemplate_js = (const char*) temp_binary_data_45; //================== conditionScriptTemplate.js ================== -static const unsigned char temp_binary_data_45[] = +static const unsigned char temp_binary_data_46[] = "/* ********** GENERAL SCRIPTING **********************\n" "\n" "\t\tThis templates shows what you can do in this is module script\n" @@ -1862,10 +1877,10 @@ static const unsigned char temp_binary_data_45[] = "\tYou can check its usage in the scriptParameterChanged\n" "*/"; -const char* conditionScriptTemplate_js = (const char*) temp_binary_data_45; +const char* conditionScriptTemplate_js = (const char*) temp_binary_data_46; //================== filterScriptTemplate.js ================== -static const unsigned char temp_binary_data_46[] = +static const unsigned char temp_binary_data_47[] = "/* ********** FILTER SPECIFIC SCRIPTING **********************\n" "\n" "\tThe \"local\" variable refers to the object containing the scripts. In this case, the local variable refers to the filter.\n" @@ -1898,10 +1913,10 @@ static const unsigned char temp_binary_data_46[] = "\treturn result;\n" "}"; -const char* filterScriptTemplate_js = (const char*) temp_binary_data_46; +const char* filterScriptTemplate_js = (const char*) temp_binary_data_47; //================== genericScriptTemplate.js ================== -static const unsigned char temp_binary_data_47[] = +static const unsigned char temp_binary_data_48[] = "\n" "/* ********** GENERAL SCRIPTING **********************\n" "\n" @@ -1993,10 +2008,10 @@ static const unsigned char temp_binary_data_47[] = "}\n" "*/"; -const char* genericScriptTemplate_js = (const char*) temp_binary_data_47; +const char* genericScriptTemplate_js = (const char*) temp_binary_data_48; //================== httpScriptTemplate.js ================== -static const unsigned char temp_binary_data_48[] = +static const unsigned char temp_binary_data_49[] = "\n" "\n" "/* ********** HTTP MODULE SPECIFIC SCRIPTING ********************* */\n" @@ -2056,10 +2071,10 @@ static const unsigned char temp_binary_data_48[] = "\tscript.log(\"Data received, request URL :\"+requestURL+\"\\nContent :\\n\" +data);\n" "}"; -const char* httpScriptTemplate_js = (const char*) temp_binary_data_48; +const char* httpScriptTemplate_js = (const char*) temp_binary_data_49; //================== midiScriptTemplate.js ================== -static const unsigned char temp_binary_data_49[] = +static const unsigned char temp_binary_data_50[] = "/* ********** MIDI MODULE SPECIFIC SCRIPTING ********************* */\n" "/*\n" "\n" @@ -2126,10 +2141,10 @@ static const unsigned char temp_binary_data_49[] = "\tscript.log(\"After Touch received \"+channel+\", \"+note+\", \"+value);\n" "}"; -const char* midiScriptTemplate_js = (const char*) temp_binary_data_49; +const char* midiScriptTemplate_js = (const char*) temp_binary_data_50; //================== moduleScriptTemplate.js ================== -static const unsigned char temp_binary_data_50[] = +static const unsigned char temp_binary_data_51[] = "/* ********** MODULE SPECIFIC SCRIPTING **********************\n" "\n" "\tThe \"local\" variable refers to the object containing the scripts. In this case, the local variable refers to the module.\n" @@ -2168,10 +2183,10 @@ static const unsigned char temp_binary_data_50[] = "\t}\n" "}"; -const char* moduleScriptTemplate_js = (const char*) temp_binary_data_50; +const char* moduleScriptTemplate_js = (const char*) temp_binary_data_51; //================== oscScriptTemplate.js ================== -static const unsigned char temp_binary_data_51[] = +static const unsigned char temp_binary_data_52[] = "/* ********** OSC MODULE SPECIFIC SCRIPTING ********************* */\n" "/*\n" "\n" @@ -2197,10 +2212,10 @@ static const unsigned char temp_binary_data_51[] = "\t}\n" "}"; -const char* oscScriptTemplate_js = (const char*) temp_binary_data_51; +const char* oscScriptTemplate_js = (const char*) temp_binary_data_52; //================== pjlinkScriptTemplate.js ================== -static const unsigned char temp_binary_data_52[] = +static const unsigned char temp_binary_data_53[] = "/* ********** PJLINK MODULE SPECIFIC SCRIPTING ********************* */\n" "\n" "\n" @@ -2213,10 +2228,10 @@ static const unsigned char temp_binary_data_52[] = " script.log(\"PJLink data received from projector #\" + id + \" : \" + message);\n" "}"; -const char* pjlinkScriptTemplate_js = (const char*) temp_binary_data_52; +const char* pjlinkScriptTemplate_js = (const char*) temp_binary_data_53; //================== streamingScriptTemplate.js ================== -static const unsigned char temp_binary_data_53[] = +static const unsigned char temp_binary_data_54[] = "/* ********** WEBSOCKET MODULE SPECIFIC SCRIPTING ********************* */\n" "/*\n" "\n" @@ -2246,10 +2261,10 @@ static const unsigned char temp_binary_data_53[] = "\t}\n" "}"; -const char* streamingScriptTemplate_js = (const char*) temp_binary_data_53; +const char* streamingScriptTemplate_js = (const char*) temp_binary_data_54; //================== wsClientScriptTemplate.js ================== -static const unsigned char temp_binary_data_54[] = +static const unsigned char temp_binary_data_55[] = "\n" "\n" "/* ********** STREAMING MODULE (UDP, TCP, SERIAL, WEBSOCKET) SPECIFIC SCRIPTING ********************* */\n" @@ -2270,10 +2285,10 @@ static const unsigned char temp_binary_data_54[] = "\tscript.log(\"Websocket data received : \" +data);\n" "}"; -const char* wsClientScriptTemplate_js = (const char*) temp_binary_data_54; +const char* wsClientScriptTemplate_js = (const char*) temp_binary_data_55; //================== wsServerScriptTemplate.js ================== -static const unsigned char temp_binary_data_55[] = +static const unsigned char temp_binary_data_56[] = "\n" "\n" "/* ********** WEBSOCKET SERVER SPECIFIC SCRIPTING ********************* */\n" @@ -2295,10 +2310,10 @@ static const unsigned char temp_binary_data_55[] = "\tscript.log(\"Websocket data received from \"+connectionId+\" : \" +data);\n" "}"; -const char* wsServerScriptTemplate_js = (const char*) temp_binary_data_55; +const char* wsServerScriptTemplate_js = (const char*) temp_binary_data_56; //================== about.png ================== -static const unsigned char temp_binary_data_56[] = +static const unsigned char temp_binary_data_57[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,3,32,0,0,1,224,8,6,0,0,0,93,7,9,245,0,0,0,9,112,72,89,115,0,0,14,196,0,0,14,196,1,149,43,14,27,0,0,6,233,105,84,88,116,88,77,76,58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120,112, 97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60,120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34,97,100, 111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,49,52,50,32,55,57,46,49,54,48,57,50,52,44,32,50,48,49,55,47,48,55,47,49,51,45,48,49,58,48,54,58,51,57, @@ -2816,10 +2831,10 @@ static const unsigned char temp_binary_data_56[] = 1,4,0,0,0,0,1,4,0,0,0,0,1,4,0,0,0,0,8,32,0,0,0,0,8,32,0,0,0,0,64,0,1,0,0,0,64,0,1,0,0,0,0,78,2,0,0,0,0,2,8,0,0,0,0,2,8,0,0,0,0,16,64,0,0,0,0,16,64,0,0,0,0,128,0,2,0,0,0,128,0,2,0,0,0,128,0,2,0,0,0,0,4,16,0,0,0,0,4,16,0,0,0,0,32,128,0,0,0,0,32,128,0,0, 0,0,32,128,0,0,0,0,0,1,4,0,0,0,0,1,4,0,0,0,0,8,32,0,0,0,0,8,32,0,0,0,0,8,32,0,0,0,0,80,19,254,31,186,211,221,255,42,1,230,166,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* about_png = (const char*) temp_binary_data_56; +const char* about_png = (const char*) temp_binary_data_57; //================== add.png ================== -static const unsigned char temp_binary_data_57[] = +static const unsigned char temp_binary_data_58[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0\x18\0\0\0\x18\x08\x06\0\0\0\xe0w=\xf8\0\0\0\tpHYs\0\0\x0b\x13\0\0\x0b\x13\x01\0\x9a\x9c\x18\0\0\x07\xd0iTXtXML:com.adobe.xmp\0\0\0\0\0 \x94|W\xa9(E\0\0\0\0IEND\xae""B`\x82"; -const char* play_png = (const char*) temp_binary_data_67; +const char* play_png = (const char*) temp_binary_data_68; //================== prevcue.png ================== -static const unsigned char temp_binary_data_68[] = +static const unsigned char temp_binary_data_69[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x06\0\0\0szz\xf4\0\0\0\tpHYs\0\0\r\xd7\0\0\r\xd7\x01""B(\x9bx\0\0\x06\xbbiTXtXML:com.adobe.xmp\0\0\0\0\0 D\xd7u\xf9\x9a\x08\xc0h4\xfa/\0\x80<\x9dN\xc7\xe3\xd1\xfc\xc5R\xa9\xf4g\xcf_\x82\xfd\x89\"\x99\x91\xa5\xe2\0\0" "\0\0IEND\xae""B`\x82"; -const char* smallstripe_png = (const char*) temp_binary_data_69; +const char* smallstripe_png = (const char*) temp_binary_data_70; //================== snap.png ================== -static const unsigned char temp_binary_data_70[] = +static const unsigned char temp_binary_data_71[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0,0,115,122,122,244,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24,0,0,6,182,105,84,88,116,88,77,76,58,99,111,109,46,97,100,111,98,101,46,120,109,112,0,0,0,0,0,60,63,120, 112,97,99,107,101,116,32,98,101,103,105,110,61,34,239,187,191,34,32,105,100,61,34,87,53,77,48,77,112,67,101,104,105,72,122,114,101,83,122,78,84,99,122,107,99,57,100,34,63,62,32,60,120,58,120,109,112,109,101,116,97,32,120,109,108,110,115,58,120,61,34, 97,100,111,98,101,58,110,115,58,109,101,116,97,47,34,32,120,58,120,109,112,116,107,61,34,65,100,111,98,101,32,88,77,80,32,67,111,114,101,32,53,46,54,45,99,49,52,50,32,55,57,46,49,54,48,57,50,52,44,32,50,48,49,55,47,48,55,47,49,51,45,48,49,58,48,54,58, @@ -4854,10 +4869,10 @@ static const unsigned char temp_binary_data_70[] = 111,198,135,9,25,33,129,146,15,82,242,115,23,208,169,18,8,24,134,97,68,26,30,173,5,149,163,227,145,125,191,240,126,218,227,55,86,42,97,165,178,177,236,218,253,180,85,142,163,5,65,156,243,5,134,97,102,136,8,31,38,52,179,251,84,117,76,68,94,3,14,139,10, 228,158,112,37,195,54,4,32,252,139,97,24,198,144,138,52,2,194,70,102,25,113,24,17,106,206,144,55,195,204,248,111,252,19,142,97,179,28,126,185,64,78,0,0,0,0,73,69,78,68,174,66,96,130,0,0 }; -const char* snap_png = (const char*) temp_binary_data_70; +const char* snap_png = (const char*) temp_binary_data_71; //================== stop.png ================== -static const unsigned char temp_binary_data_71[] = +static const unsigned char temp_binary_data_72[] = "\x89PNG\r\n" "\x1a\n" "\0\0\0\rIHDR\0\0\0 \0\0\0 \x08\x06\0\0\0szz\xf4\0\0\0\tpHYs\0\0\r\xd7\0\0\r\xd7\x01""B(\x9bx\0\0\x05\x1ciTXtXML:com.adobe.xmp\0\0\0\0\0 qRyAUHeN=jKRQbvu*$#0y?+ahNioo0+C zH}&kE?|t6$ob#M>z61X~w71lgt8U~qxUbAff!@&^}iaNb71kGgtB2 z(8mj^>H+APoT;;$##wLUcAxsnoLI5jfaGPM=plri0ACg&R7&Ayz=svR4&p{^7DRFy ztU7}X(>_-dhCX3q%R9n>Lc;zTX$bB9ZG)@+iS~3p@-4h!d_FQe(7dC2F&aN&IH-M4 z%KOWone!JQa%I^d2^o~euW#TN5s7d!om(hVk?07}jTP+z@!&b{L(IL45;v;pJwf8J z+9b&^P-WS2iwkVdaz|`_)ayD3+KQv^lKQU->~y*TWRL>Qn4syg*3RP~8t40U*%!ibU)HA}#6B0N#w5J~L0fLx`_G~?wH(9xrO-i(3 zBFYg>68ZeDgGA#e*3dvs{k2oG601Fv{}z4#5xn1hideInEditor = true; } MappingInput::~MappingInput() diff --git a/Source/Common/Processor/Mapping/Input/MappingInput.h b/Source/Common/Processor/Mapping/Input/MappingInput.h index 90352b87e..0262c7fdd 100644 --- a/Source/Common/Processor/Mapping/Input/MappingInput.h +++ b/Source/Common/Processor/Mapping/Input/MappingInput.h @@ -18,6 +18,7 @@ class MappingInput : MappingInput(const String& name = "Input", var params = var(), Multiplex* multiplex = nullptr); virtual ~MappingInput(); + BoolParameter* triggersProcess; WeakReference inputReference; virtual void clear() override; diff --git a/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.cpp b/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.cpp index 4746c816c..1fc9c76e2 100644 --- a/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.cpp +++ b/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.cpp @@ -1,20 +1,23 @@ /* ============================================================================== - MappingInputUI.cpp - Created: 28 Oct 2016 8:11:42pm - Author: bkupe + MappingInputUI.cpp + Created: 28 Oct 2016 8:11:42pm + Author: bkupe ============================================================================== */ +#include "Common/Processor/ProcessorIncludes.h" -MappingInputEditor::MappingInputEditor(MappingInput * _input, bool isRoot) : - BaseItemEditor(_input,isRoot), +MappingInputEditor::MappingInputEditor(MappingInput* _input, bool isRoot) : + BaseItemEditor(_input, isRoot), input(_input) { input->addAsyncMappingInputListener(this); updateSourceUI(); + triggersProcessUI.reset(input->triggersProcess->createToggle(ImageCache::getFromMemory(BinaryData::process_png, BinaryData::process_pngSize))); + addAndMakeVisible(triggersProcessUI.get()); } MappingInputEditor::~MappingInputEditor() @@ -25,7 +28,7 @@ MappingInputEditor::~MappingInputEditor() void MappingInputEditor::updateSourceUI() { if (sourceFeedbackUI != nullptr) removeChildComponent(sourceFeedbackUI.get()); - if (Parameter * p = input->getInputAt(input->getPreviewIndex())) + if (Parameter* p = input->getInputAt(input->getPreviewIndex())) { sourceFeedbackUI.reset(p->createDefaultUI()); if (p->type == Parameter::POINT2D) @@ -43,11 +46,12 @@ void MappingInputEditor::updateSourceUI() void MappingInputEditor::resizedInternalHeaderItemInternal(Rectangle& r) { - if (sourceFeedbackUI != nullptr) sourceFeedbackUI->setBounds(r.removeFromRight(jlimit(100,300,r.getWidth())).reduced(2)); + triggersProcessUI->setBounds(r.removeFromRight(r.getHeight()).reduced(2)); + if (sourceFeedbackUI != nullptr) sourceFeedbackUI->setBounds(r.removeFromRight(jlimit(100, 300, r.getWidth())).reduced(2)); BaseItemEditor::resizedInternalHeaderItemInternal(r); } -void MappingInputEditor::newMessage(const MappingInput::MappingInputEvent & e) +void MappingInputEditor::newMessage(const MappingInput::MappingInputEvent& e) { switch (e.type) { @@ -65,7 +69,7 @@ void MappingInputEditor::newMessage(const MappingInput::MappingInputEvent & e) } -void MappingInputEditor::inputReferenceChangedAsync(MappingInput *) +void MappingInputEditor::inputReferenceChangedAsync(MappingInput*) { updateSourceUI(); } diff --git a/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.h b/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.h index 18a3f8e0a..938b75b6a 100644 --- a/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.h +++ b/Source/Common/Processor/Mapping/Input/ui/MappingInputEditor.h @@ -22,6 +22,7 @@ class MappingInputEditor : MappingInput * input; std::unique_ptr sourceFeedbackUI; + std::unique_ptr triggersProcessUI; void updateSourceUI(); void resizedInternalHeaderItemInternal(Rectangle &r) override; diff --git a/Source/Common/Processor/Mapping/Mapping.cpp b/Source/Common/Processor/Mapping/Mapping.cpp index 69b394add..f3ce42d8d 100644 --- a/Source/Common/Processor/Mapping/Mapping.cpp +++ b/Source/Common/Processor/Mapping/Mapping.cpp @@ -386,8 +386,10 @@ void Mapping::inputReferenceChanged(MappingInput*) updateMappingChain(); } -void Mapping::inputParameterValueChanged(MappingInput*, int multiplexIndex) +void Mapping::inputParameterValueChanged(MappingInput* mi, int multiplexIndex) { + if (!mi->triggersProcess->boolValue()) return; + if (processMode == VALUE_CHANGE && !isThreadRunning()) { process(true, multiplexIndex);