From e0f6ef43694da21d97a9f8b51341ec1e05d5a508 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 05:03:18 +0100 Subject: [PATCH 1/5] Always use a sidechain input to control triggers This allows MIDI trigger tacks to distinguish between music-data and control-data. --- libs/ardour/track.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 5074ebf0e3..0eaabbb365 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -109,13 +109,7 @@ Track::init () boost::shared_ptr tb (new TriggerBox (_session, data_type ())); tb->set_owner (this); add_processor (tb, _polarity); - if (data_type () == DataType::AUDIO) { - /* if placing this in a route where the default - * data type is AUDIO, the triggerbox will need - * a sidehcain MIDI input to be able to be MIDI controlled - */ - tb->add_midi_sidechain (); - } + tb->add_midi_sidechain (); } set_align_choice_from_io (); From 20824b6407bcdabde23baf4d4f001a99cdcce730 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 19:50:06 +0100 Subject: [PATCH 2/5] Fix bundling demo sessions (mac, win) --- tools/osx_packaging/osx_build | 4 ++-- tools/x-win/package.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 749631a23c..8a4d450b5c 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -797,10 +797,10 @@ fi ################################################################################ if test x$DEMO_SESSION_URL != x ; then - mkdir -p $Shared/sessions + mkdir -p ${PRODUCT_PKG_DIR}/$Shared/sessions DEMO_SESSIONS=$(curl -s -S --fail $DEMO_SESSION_URL/index.txt) for demo in $DEMO_SESSIONS; do - curl -s -S --fail -# -o $Shared/sessions/$demo $DEMO_SESSION_URL/$demo + curl -s -S --fail -# -o ${PRODUCT_PKG_DIR}/$Shared/sessions/$demo $DEMO_SESSION_URL/$demo done fi diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 0b38d3cceb..7186ba42d8 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -355,10 +355,10 @@ fi ################################################################################ if test x$DEMO_SESSION_URL != x ; then - mkdir -p $Shared/sessions + mkdir -p $DESTDIR/share/sessions DEMO_SESSIONS=$(curl -s -S --fail $DEMO_SESSION_URL/index.txt) for demo in $DEMO_SESSIONS; do - curl -s -S --fail -# -o $Shared/sessions/$demo $DEMO_SESSION_URL/$demo + curl -s -S --fail -# -o $DESTDIR/share/sessions/$demo $DEMO_SESSION_URL/$demo done fi From 0481b10d97fa13179807714f63cd6a00d577f3c5 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 19:50:34 +0100 Subject: [PATCH 3/5] Bundle Mixbus Media --- tools/linux_packaging/build | 12 ++++++++++++ tools/osx_packaging/osx_build | 23 ++++++++++++++++++++++- tools/x-win/package.sh | 12 ++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 8351ab3220..ed1c16c404 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -730,6 +730,18 @@ if test -n "$MIXBUS"; then cp "${CACHEDIR}/harrison_vamp.${VAMPARCH}.so" \ $APPLIB/harrison_vamp.so chmod +x $APPLIB/harrison_vamp.so + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${CACHEDIR}/MixbusBundledMedia.zip" \ + -o "${CACHEDIR}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f "${MediaClips}/"*.* + unzip -q -d "${MediaClips}" "${CACHEDIR}/MixbusBundledMedia.zip" + fi fi if true ; then diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 8a4d450b5c..a53bc652c1 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -172,10 +172,10 @@ mkdir -p $MackieControl mkdir -p $OSC mkdir -p $PatchFiles mkdir -p $LuaScripts +mkdir -p $MediaClips mkdir -p $Themes - EXECUTABLE=${BUNDLENAME} # @@ -362,6 +362,10 @@ done cp -R $BUILD_ROOT/../share/web_surfaces $WebSurfaces rm $WebSurfaces/wscript +# recusively copy clips/media +cp -a $BUILD_ROOT/../share/media $MediaClips +rm $MediaClips/wscript + # MackieControl data # got to be careful with names here for x in $BUILD_ROOT/../share/mcp/*.device $BUILD_ROOT/../share/mcp/*.profile ; do @@ -640,6 +644,10 @@ else fi +################################################################################ +# from here on $PRODUCT_PKG_DIR/ prefix is needed +################################################################################ + DMG_ARCH="" if file ${PRODUCT_PKG_DIR}/$APPROOT/MacOS/$MAIN_EXECUTABLE | grep -q x86_64; then OSX_ARCH=x86_64 @@ -792,6 +800,19 @@ if test -n "$MIXBUS"; then cp "${CACHEDIR}/harrison_vamp.${OSX_BENSID}.dylib" \ "${PRODUCT_PKG_DIR}/${APPROOT}/lib/harrison_vamp.dylib" + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${CACHEDIR}/MixbusBundledMedia.zip" \ + -o "${CACHEDIR}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f "${PRODUCT_PKG_DIR}/${MediaClips}/"*.* + bsdtar -C "${PRODUCT_PKG_DIR}/${MediaClips}" -xf \ + "${CACHEDIR}/MixbusBundledMedia.zip" + fi fi ################################################################################ diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 7186ba42d8..915217dcf9 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -350,6 +350,18 @@ if test -n "$MIXBUS"; then cp "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \ "$ALIBDIR/vamp/harrison_vamp.dll" + + # Mixbus Bundled Media Content + curl -s -S --fail -# \ + -z "${SRCCACHE}/MixbusBundledMedia.zip" \ + -o "${SRCCACHE}/MixbusBundledMedia.zip" \ + "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + + if test -f "${SRCCACHE}/MixbusBundledMedia.zip"; then + echo "Adding Mixbus Bundled Content" + rm -f $DESTDIR/share/media/*.* + unzip -q -d "$DESTDIR/share/media/" "${SRCCACHE}/MixbusBundledMedia.zip" + fi fi ################################################################################ From 7e36daecd6f4752354354efe0ee33bc26e8030f2 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 20:04:52 +0100 Subject: [PATCH 4/5] Fix bundling media content --- tools/linux_packaging/build | 2 +- tools/osx_packaging/osx_build | 8 ++++---- tools/x-win/package.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index ed1c16c404..a6c6f09e4b 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -735,7 +735,7 @@ if test -n "$MIXBUS"; then curl -s -S --fail -# \ -z "${CACHEDIR}/MixbusBundledMedia.zip" \ -o "${CACHEDIR}/MixbusBundledMedia.zip" \ - "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + "http://rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then echo "Adding Mixbus Bundled Content" diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index a53bc652c1..d6bc4982a7 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -363,7 +363,7 @@ cp -R $BUILD_ROOT/../share/web_surfaces $WebSurfaces rm $WebSurfaces/wscript # recusively copy clips/media -cp -a $BUILD_ROOT/../share/media $MediaClips +cp -R $BUILD_ROOT/../share/media $MediaClips rm $MediaClips/wscript # MackieControl data @@ -803,9 +803,9 @@ if test -n "$MIXBUS"; then # Mixbus Bundled Media Content curl -s -S --fail -# \ - -z "${CACHEDIR}/MixbusBundledMedia.zip" \ - -o "${CACHEDIR}/MixbusBundledMedia.zip" \ - "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + -z "/tmp/MixbusBundledMedia.zip" \ + -o "/tmp/MixbusBundledMedia.zip" \ + "http://rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then echo "Adding Mixbus Bundled Content" diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh index 915217dcf9..b4ff56eefe 100755 --- a/tools/x-win/package.sh +++ b/tools/x-win/package.sh @@ -355,7 +355,7 @@ if test -n "$MIXBUS"; then curl -s -S --fail -# \ -z "${SRCCACHE}/MixbusBundledMedia.zip" \ -o "${SRCCACHE}/MixbusBundledMedia.zip" \ - "http://www.rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" + "http://rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" if test -f "${SRCCACHE}/MixbusBundledMedia.zip"; then echo "Adding Mixbus Bundled Content" From 2d46d9a8823ccc00caf2e1f79b4ed1c604f3b578 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 17 Jan 2022 20:26:24 +0100 Subject: [PATCH 5/5] Fix bundling media content for macOS (again) --- tools/osx_packaging/osx_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index d6bc4982a7..6524946ce8 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -803,8 +803,8 @@ if test -n "$MIXBUS"; then # Mixbus Bundled Media Content curl -s -S --fail -# \ - -z "/tmp/MixbusBundledMedia.zip" \ - -o "/tmp/MixbusBundledMedia.zip" \ + -z "${CACHEDIR}/MixbusBundledMedia.zip" \ + -o "${CACHEDIR}/MixbusBundledMedia.zip" \ "http://rsrc.harrisonconsoles.com/mixbus/mb8/content/MixbusBundledMedia.zip" if test -f "${CACHEDIR}/MixbusBundledMedia.zip"; then