Merge branch 'ardour'
This commit is contained in:
commit
c731fcd0c1
|
@ -355,9 +355,12 @@ RegionFxPlugin::set_default_automation (timepos_t end)
|
||||||
{
|
{
|
||||||
for (auto const& i : _controls) {
|
for (auto const& i : _controls) {
|
||||||
std::shared_ptr<AutomationControl> ac = std::dynamic_pointer_cast<AutomationControl> (i.second);
|
std::shared_ptr<AutomationControl> ac = std::dynamic_pointer_cast<AutomationControl> (i.second);
|
||||||
assert (ac->alist ()->empty ());
|
if (ac->alist ()->empty ()) {
|
||||||
ac->alist ()->fast_simple_add (timepos_t (time_domain ()), ac->normal ());
|
ac->alist ()->fast_simple_add (timepos_t (time_domain ()), ac->normal ());
|
||||||
ac->alist ()->fast_simple_add (end, ac->normal ());
|
ac->alist ()->fast_simple_add (end, ac->normal ());
|
||||||
|
} else {
|
||||||
|
ac->alist ()->truncate_end (end);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ WITH_COMMERCIAL_X42_LV2=
|
||||||
WITH_GRATIS_X42_LV2=
|
WITH_GRATIS_X42_LV2=
|
||||||
WITH_GMSYNYTH=
|
WITH_GMSYNYTH=
|
||||||
WITH_HARVID=
|
WITH_HARVID=
|
||||||
|
WITH_XJADEO=
|
||||||
STRIP=all
|
STRIP=all
|
||||||
PRINT_SYSDEPS=
|
PRINT_SYSDEPS=
|
||||||
WITH_NLS=
|
WITH_NLS=
|
||||||
|
@ -60,25 +61,14 @@ while [ $# -gt 0 ] ; do
|
||||||
WITH_COMMERCIAL_X42_LV2=1
|
WITH_COMMERCIAL_X42_LV2=1
|
||||||
WITH_GRATIS_X42_LV2=1
|
WITH_GRATIS_X42_LV2=1
|
||||||
WITH_GMSYNYTH=1
|
WITH_GMSYNYTH=1
|
||||||
|
WITH_HARVID=1
|
||||||
|
WITH_XJADEO=1
|
||||||
WITH_NLS=1 ;
|
WITH_NLS=1 ;
|
||||||
STRIP=all
|
STRIP=all
|
||||||
APPNAME=Mixbus ;
|
APPNAME=Mixbus ;
|
||||||
VENDOR=Harrison ;
|
VENDOR=Harrison ;
|
||||||
EXENAME=mixbus ;
|
EXENAME=mixbus ;
|
||||||
shift ;;
|
shift ;;
|
||||||
--mixbus32c)
|
|
||||||
MIXBUS=1;
|
|
||||||
WITH_HARRISON_LV2=1 ;
|
|
||||||
WITH_COMMERCIAL_X42_LV2=1
|
|
||||||
WITH_GRATIS_X42_LV2=1
|
|
||||||
WITH_GMSYNYTH=1
|
|
||||||
WITH_NLS=1 ;
|
|
||||||
STRIP=all
|
|
||||||
APPNAME=Mixbus32C ;
|
|
||||||
VENDOR=Harrison ;
|
|
||||||
EXENAME=mixbus32c ;
|
|
||||||
major_version=""
|
|
||||||
shift ;;
|
|
||||||
--livetrax)
|
--livetrax)
|
||||||
LIVETRAX=1 ;
|
LIVETRAX=1 ;
|
||||||
STRIP=all ;
|
STRIP=all ;
|
||||||
|
@ -89,6 +79,8 @@ while [ $# -gt 0 ] ; do
|
||||||
--public)
|
--public)
|
||||||
WITH_HARRISON_LV2=1 ;
|
WITH_HARRISON_LV2=1 ;
|
||||||
WITH_GMSYNYTH=1
|
WITH_GMSYNYTH=1
|
||||||
|
WITH_HARVID=1
|
||||||
|
WITH_XJADEO=1
|
||||||
WITH_NLS=1 ;
|
WITH_NLS=1 ;
|
||||||
STRIP=all ;
|
STRIP=all ;
|
||||||
APPNAME=Ardour ;
|
APPNAME=Ardour ;
|
||||||
|
@ -107,7 +99,7 @@ while [ $# -gt 0 ] ; do
|
||||||
--strip) STRIP=$2 ; shift ; shift ;;
|
--strip) STRIP=$2 ; shift ; shift ;;
|
||||||
--sysdeps) PRINT_SYSDEPS=1; shift ;;
|
--sysdeps) PRINT_SYSDEPS=1; shift ;;
|
||||||
--nls) WITH_NLS=1 ; shift ;;
|
--nls) WITH_NLS=1 ; shift ;;
|
||||||
--harvid) WITH_HARVID=1 ; shift ;;
|
--harvid) shift ;;
|
||||||
--gcc5abi) shift ;;
|
--gcc5abi) shift ;;
|
||||||
--chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
|
--chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
|
||||||
|
|
||||||
|
@ -817,19 +809,24 @@ fi
|
||||||
if test x$WITH_HARVID != x ; then
|
if test x$WITH_HARVID != x ; then
|
||||||
cd $APPBIN
|
cd $APPBIN
|
||||||
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
||||||
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
|
||||||
|
|
||||||
rsync -Pa \
|
rsync -Pa \
|
||||||
rsync://ardour.org/video-tools/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \
|
rsync://ardour.org/video-tools/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz \
|
||||||
"$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz"
|
"$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz"
|
||||||
|
|
||||||
rsync -Pa \
|
|
||||||
rsync://ardour.org/video-tools/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz \
|
|
||||||
"$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz"
|
|
||||||
|
|
||||||
tar -x -z \
|
tar -x -z \
|
||||||
--exclude=README --exclude=harvid.1 --strip-components=1 \
|
--exclude=README --exclude=harvid.1 --strip-components=1 \
|
||||||
-f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1
|
-f "$CACHEDIR/harvid-${MULTIARCH}-${HARVID_VERSION}.tgz" || exit 1
|
||||||
|
cd -
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$WITH_XJADEO != x ; then
|
||||||
|
cd $APPBIN
|
||||||
|
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
||||||
|
|
||||||
|
rsync -Pa \
|
||||||
|
rsync://ardour.org/video-tools/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz \
|
||||||
|
"$CACHEDIR/xjadeo-${MULTIARCH}-${XJADEO_VERSION}.tgz"
|
||||||
|
|
||||||
tar -x -z \
|
tar -x -z \
|
||||||
--exclude=README --exclude=xjadeo.1 --strip-components=1 \
|
--exclude=README --exclude=xjadeo.1 --strip-components=1 \
|
||||||
|
|
|
@ -16,6 +16,7 @@ mkdir -p "$CACHEDIR"
|
||||||
MIXBUS=
|
MIXBUS=
|
||||||
MIXBUS32C=
|
MIXBUS32C=
|
||||||
WITH_HARVID=1
|
WITH_HARVID=1
|
||||||
|
WITH_XJADEO=1
|
||||||
WITH_HARRISON_LV2=
|
WITH_HARRISON_LV2=
|
||||||
WITH_COMMERCIAL_X42_LV2=
|
WITH_COMMERCIAL_X42_LV2=
|
||||||
WITH_GRATIS_X42_LV2=
|
WITH_GRATIS_X42_LV2=
|
||||||
|
@ -50,22 +51,9 @@ while [ $# -gt 0 ] ; do
|
||||||
lower_case_appname=mixbus;
|
lower_case_appname=mixbus;
|
||||||
BUNDLE_ID_BASE=com.harrisonconsoles
|
BUNDLE_ID_BASE=com.harrisonconsoles
|
||||||
shift ;;
|
shift ;;
|
||||||
--mixbus32c) MIXBUS=1;
|
|
||||||
MIXBUS32C=1;
|
|
||||||
WITH_HARRISON_LV2=1 ;
|
|
||||||
WITH_COMMERCIAL_X42_LV2=1
|
|
||||||
WITH_GRATIS_X42_LV2=1
|
|
||||||
WITH_GMSYNTH=1
|
|
||||||
STRIP= ;
|
|
||||||
PRODUCT_PKG_DIR=Mixbus32C;
|
|
||||||
lower_case_appname=mixbus32c;
|
|
||||||
BUNDLE_ID_BASE=com.harrisonconsoles
|
|
||||||
APPNAME=Mixbus32C ;
|
|
||||||
BUNDLENAME=Mixbus32C-${major_version} ;
|
|
||||||
shift ;;
|
|
||||||
--livetrax)
|
--livetrax)
|
||||||
LIVETRAX=1 ;
|
LIVETRAX=1 ;
|
||||||
WITH_HARVID= ;
|
WITH_XJADEO= ;
|
||||||
APPNAME=LiveTrax ;
|
APPNAME=LiveTrax ;
|
||||||
PRODUCT_PKG_DIR=LiveTrax;
|
PRODUCT_PKG_DIR=LiveTrax;
|
||||||
BUNDLENAME=LiveTrax${major_version} ;
|
BUNDLENAME=LiveTrax${major_version} ;
|
||||||
|
@ -86,7 +74,7 @@ while [ $# -gt 0 ] ; do
|
||||||
# specific build flags
|
# specific build flags
|
||||||
#
|
#
|
||||||
|
|
||||||
--noharvid) WITH_HARVID= ; shift ;;
|
--noharvid) shift ;;
|
||||||
--nostrip) STRIP= ; shift ;;
|
--nostrip) STRIP= ; shift ;;
|
||||||
--sysdeps) PRINT_SYSDEPS=1; shift ;;
|
--sysdeps) PRINT_SYSDEPS=1; shift ;;
|
||||||
--no-nls) WITH_NLS= ; shift ;;
|
--no-nls) WITH_NLS= ; shift ;;
|
||||||
|
@ -711,28 +699,25 @@ if test x$WITH_HARRISON_LV2 != x ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$WITH_HARVID != x ; then
|
if test x$WITH_HARVID != x ; then
|
||||||
echo "installing video tools.."
|
echo "installing harvid..."
|
||||||
if test $OSX_ARCH = ppc; then
|
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
||||||
# EOL
|
|
||||||
HARVID_VERSION=v0.8.2
|
|
||||||
XJADEO_VERSION=v0.8.8
|
|
||||||
else
|
|
||||||
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
|
||||||
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
|
||||||
fi
|
|
||||||
echo "copying harvid and xjadeo ..."
|
|
||||||
|
|
||||||
rsync -Pa \
|
rsync -Pa \
|
||||||
rsync://ardour.org/video-tools/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz \
|
rsync://ardour.org/video-tools/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz \
|
||||||
"$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz"
|
"$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz"
|
||||||
|
|
||||||
rsync -Pa \
|
|
||||||
rsync://ardour.org/video-tools/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg \
|
|
||||||
"$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg"
|
|
||||||
|
|
||||||
tar -x -z \
|
tar -x -z \
|
||||||
-C $PRODUCT_PKG_DIR/$APPROOT \
|
-C $PRODUCT_PKG_DIR/$APPROOT \
|
||||||
-f "$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz" || exit 1
|
-f "$CACHEDIR/harvid-${HARVID_ARCH}-${HARVID_VERSION}.tgz" || exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$WITH_XJADEO != x ; then
|
||||||
|
echo "installing video monitor.."
|
||||||
|
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
||||||
|
|
||||||
|
rsync -Pa \
|
||||||
|
rsync://ardour.org/video-tools/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg \
|
||||||
|
"$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg"
|
||||||
|
|
||||||
JADEO=$(hdiutil attach "$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
|
JADEO=$(hdiutil attach "$CACHEDIR/jadeo${XJADEO_ARCH}-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
|
||||||
cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
|
cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
|
||||||
|
|
|
@ -34,6 +34,8 @@ WITH_HARRISON_LV2=1 ;
|
||||||
WITH_COMMERCIAL_X42_LV2=
|
WITH_COMMERCIAL_X42_LV2=
|
||||||
WITH_GRATIS_X42_LV2=
|
WITH_GRATIS_X42_LV2=
|
||||||
WITH_GMSYNTH=1
|
WITH_GMSYNTH=1
|
||||||
|
WITH_HARVID=1
|
||||||
|
WITH_XJADEO=1
|
||||||
|
|
||||||
# TODO: grep from build/config.log instead
|
# TODO: grep from build/config.log instead
|
||||||
while [ $# -gt 0 ] ; do
|
while [ $# -gt 0 ] ; do
|
||||||
|
@ -49,20 +51,9 @@ while [ $# -gt 0 ] ; do
|
||||||
PRODUCT_NAME=Mixbus
|
PRODUCT_NAME=Mixbus
|
||||||
MANUAL_NAME="mixbus-live-manual"
|
MANUAL_NAME="mixbus-live-manual"
|
||||||
shift ;;
|
shift ;;
|
||||||
--mixbus32c)
|
|
||||||
MIXBUS=1
|
|
||||||
WITH_HARRISON_LV2=1 ;
|
|
||||||
WITH_COMMERCIAL_X42_LV2=1
|
|
||||||
WITH_GRATIS_X42_LV2=1
|
|
||||||
PRODUCT_NAME=Mixbus32C
|
|
||||||
PROGRAM_KEY=Mixbus32C
|
|
||||||
PROGRAM_NAME=Mixbus32C-${PROGRAM_VERSION}
|
|
||||||
PROGRAM_VERSION=""
|
|
||||||
MANUAL_NAME="mixbus32c-live-manual"
|
|
||||||
shift ;;
|
|
||||||
--livetrax)
|
--livetrax)
|
||||||
LIVETRAX=1 ;
|
LIVETRAX=1 ;
|
||||||
NOVIDEOTOOLS=1 ;
|
WITH_XJADEO=
|
||||||
WITH_HARRISON_LV2="" ;
|
WITH_HARRISON_LV2="" ;
|
||||||
WITH_GMSYNTH="" ;
|
WITH_GMSYNTH="" ;
|
||||||
PROGRAM_NAME=LiveTrax
|
PROGRAM_NAME=LiveTrax
|
||||||
|
@ -248,26 +239,29 @@ du -sh $DESTDIR
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
### get video tools
|
### get video tools
|
||||||
if test -z "$NOVIDEOTOOLS"; then
|
|
||||||
echo " === Including video-tools"
|
if test -n "$WITH_HARVID"; then
|
||||||
|
echo " === Including harvid"
|
||||||
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
|
||||||
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
|
||||||
|
|
||||||
rsync -a -q --partial \
|
rsync -a -q --partial \
|
||||||
rsync://ardour.org/video-tools/harvid_${WARCH}-${HARVID_VERSION}.tar.xz \
|
rsync://ardour.org/video-tools/harvid_${WARCH}-${HARVID_VERSION}.tar.xz \
|
||||||
"${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz"
|
"${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz"
|
||||||
|
|
||||||
|
mkdir -p $DESTDIR/video
|
||||||
|
tar -xf "${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz" -C "$DESTDIR/video/"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -n "$WITH_XJADEO"; then
|
||||||
|
echo " === Including video-monitor"
|
||||||
|
XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
|
||||||
|
|
||||||
rsync -a -q --partial \
|
rsync -a -q --partial \
|
||||||
rsync://ardour.org/video-tools/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz \
|
rsync://ardour.org/video-tools/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz \
|
||||||
"${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz"
|
"${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz"
|
||||||
|
|
||||||
mkdir $DESTDIR/video
|
mkdir -p $DESTDIR/video
|
||||||
tar -xf "${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz" -C "$DESTDIR/video/"
|
|
||||||
tar -xf "${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz" -C "$DESTDIR/video/"
|
tar -xf "${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz" -C "$DESTDIR/video/"
|
||||||
|
|
||||||
echo " === unzipped"
|
|
||||||
du -sh $DESTDIR/video
|
|
||||||
du -sh $DESTDIR
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -525,10 +519,10 @@ Section "${PROGRAM_NAME}${PROGRAM_VERSION} (required)" SecMainProg
|
||||||
SectionEnd
|
SectionEnd
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if test -z "$NOVIDEOTOOLS"; then
|
if test -n "$WITH_HARVID$WITH_XJADEO"; then
|
||||||
|
|
||||||
cat >> $NSISFILE << EOF
|
cat >> $NSISFILE << EOF
|
||||||
Section "Videotimeline Tools (required)" SecVideo
|
Section "A/V Tools (required)" SecVideo
|
||||||
WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\video" "Install_Dir" "\$INSTDIR\\video"
|
WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\video" "Install_Dir" "\$INSTDIR\\video"
|
||||||
SectionIn RO
|
SectionIn RO
|
||||||
SetOutPath \$INSTDIR
|
SetOutPath \$INSTDIR
|
||||||
|
@ -577,7 +571,7 @@ if test -f "$DESTDIR/debug.bat"; then
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$NOVIDEOTOOLS"; then
|
if test -n "$WITH_XJADEO"; then
|
||||||
cat >> $NSISFILE << EOF
|
cat >> $NSISFILE << EOF
|
||||||
IfFileExists "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 +2
|
IfFileExists "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 +2
|
||||||
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Video Monitor.lnk" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" "" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0
|
CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Video Monitor.lnk" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" "" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0
|
||||||
|
@ -591,11 +585,20 @@ LangString DESC_SecMainProg \${LANG_ENGLISH} "${PROGRAM_NAME} ${ARDOURVERSION}\$
|
||||||
LangString DESC_SecWASAPI \${LANG_ENGLISH} "WASAPI Audio Driver\$\\r\$\\nOnly works on Vista or later. Windows 10 Users may currently also experience issues if this is installed."
|
LangString DESC_SecWASAPI \${LANG_ENGLISH} "WASAPI Audio Driver\$\\r\$\\nOnly works on Vista or later. Windows 10 Users may currently also experience issues if this is installed."
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if test -z "$NOVIDEOTOOLS"; then
|
if test -n "$WITH_XJADEO" -a -n "$WITH_HARVID"; then
|
||||||
cat >> $NSISFILE << EOF
|
cat >> $NSISFILE << EOF
|
||||||
LangString DESC_SecVideo \${LANG_ENGLISH} "Video Tools\$\\r\$\\nxjadeo-${XJADEO_VERSION}\$\\r\$\\nharvid-${HARVID_VERSION}"
|
LangString DESC_SecVideo \${LANG_ENGLISH} "Video Tools\$\\r\$\\nxjadeo-${XJADEO_VERSION}\$\\r\$\\nharvid-${HARVID_VERSION}"
|
||||||
EOF
|
EOF
|
||||||
|
elif test -n "$WITH_HAVID"; then
|
||||||
|
cat >> $NSISFILE << EOF
|
||||||
|
LangString DESC_SecVideo \${LANG_ENGLISH} "Video Tools\$\\r\$\\nharvid-${HARVID_VERSION}"
|
||||||
|
EOF
|
||||||
|
elif test -n "$WITH_XJADEO"; then
|
||||||
|
cat >> $NSISFILE << EOF
|
||||||
|
LangString DESC_SecVideo \${LANG_ENGLISH} "Video Tools\$\\r\$\\nxjadeo-${XJADEO_VERSION}"
|
||||||
|
EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$WITH_HARRISON_LV2 != x ; then
|
if test x$WITH_HARRISON_LV2 != x ; then
|
||||||
cat >> $NSISFILE << EOF
|
cat >> $NSISFILE << EOF
|
||||||
LangString DESC_SecXT \${LANG_ENGLISH} "These are proprietary additions, but the DSP is not license encumbered. XT-plugin GUIs are commercial, the additional a-*/ACE plugin GUIs are free."
|
LangString DESC_SecXT \${LANG_ENGLISH} "These are proprietary additions, but the DSP is not license encumbered. XT-plugin GUIs are commercial, the additional a-*/ACE plugin GUIs are free."
|
||||||
|
@ -609,7 +612,7 @@ LangString DESC_SecMenu \${LANG_ENGLISH} "Create Start-Menu Shortcuts (recommend
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT \${SecWASAPI} \$(DESC_SecWASAPI)
|
!insertmacro MUI_DESCRIPTION_TEXT \${SecWASAPI} \$(DESC_SecWASAPI)
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if test -z "$NOVIDEOTOOLS"; then
|
if test -n "$WITH_XJADEO$WITH_HARVID"; then
|
||||||
cat >> $NSISFILE << EOF
|
cat >> $NSISFILE << EOF
|
||||||
!insertmacro MUI_DESCRIPTION_TEXT \${SecVideo} \$(DESC_SecVideo)
|
!insertmacro MUI_DESCRIPTION_TEXT \${SecVideo} \$(DESC_SecVideo)
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue