Fix bundling media content for macOS (again)

This allows MIDI trigger tacks to distinguish between music-data
and control-data.

libs/ardour/track.cc

@@ -109,14 +109,8 @@ Track::init ()
 		boost::shared_ptr<TriggerBox> 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 ();
 	}
-	}
 
 	set_align_choice_from_io ();
 

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://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

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 -R $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,15 +800,28 @@ 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://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
 
 ################################################################################
 
 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
 

tools/x-win/package.sh

@@ -350,15 +350,27 @@ 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://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
 
 ################################################################################
 
 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