diff --git a/projects/resources/BITTBOY/lgpt.sh b/projects/resources/BITTBOY/lgpt.sh index ffa8a6ce..b1913ea1 100755 --- a/projects/resources/BITTBOY/lgpt.sh +++ b/projects/resources/BITTBOY/lgpt.sh @@ -1,3 +1,3 @@ #!/bin/sh -LD_PRELOAD=./librtmidi.so ./lgpt-bittboy.elf > lgpt.log +LD_PRELOAD=./librtmidi.so ./lgpt-bittboy.elf &> lgpt.log diff --git a/projects/resources/GARLICPLUS/garlicos/LittleGPTracker.sh b/projects/resources/GARLICPLUS/garlicos/LittleGPTracker.sh index f82c0450..0dd1c3a4 100755 --- a/projects/resources/GARLICPLUS/garlicos/LittleGPTracker.sh +++ b/projects/resources/GARLICPLUS/garlicos/LittleGPTracker.sh @@ -2,5 +2,5 @@ progdir=$(dirname "$0")/lgpt cd $progdir HOME=$progdir -LD_LIBRARY_PATH=$PROGDIR:$LD_LIBRARY_PATH ./lgpt-rg35xxplus.elf > ./lgpt.log +LD_LIBRARY_PATH=$PROGDIR:$LD_LIBRARY_PATH ./lgpt-rg35xxplus.elf &> ./lgpt.log sync diff --git a/projects/resources/MIYOO/launch.sh b/projects/resources/MIYOO/launch.sh index 7a79e525..11c4b2f7 100644 --- a/projects/resources/MIYOO/launch.sh +++ b/projects/resources/MIYOO/launch.sh @@ -2,4 +2,4 @@ PROGDIR=`dirname "$0"` cd $PROGDIR -LD_LIBRARY_PATH=$PROGDIR:$LD_LIBRARY_PATH ./lgpt-miyoo.elf > ./lgpt.log +LD_LIBRARY_PATH=$PROGDIR:$LD_LIBRARY_PATH ./lgpt-miyoo.elf &> ./lgpt.log diff --git a/projects/resources/packaging/lgpt_package.sh b/projects/resources/packaging/lgpt_package.sh index 03f9ea21..cedd7b1d 100755 --- a/projects/resources/packaging/lgpt_package.sh +++ b/projects/resources/packaging/lgpt_package.sh @@ -1,14 +1,8 @@ #!/bin/bash cd "$(git rev-parse --show-toplevel)/projects/" -if [[ "$(uname)" == "Darwin" ]]; then #MacOS - PROJECT_NUMBER=$(perl -nle 'print $1 if /PROJECT_NUMBER "([^"]*)"/' ../sources/Application/Model/Project.h) - PROJECT_RELEASE=$(perl -nle 'print $1 if /PROJECT_RELEASE "([^"]*)"/' ../sources/Application/Model/Project.h) - BUILD_COUNT=$(perl -nle 'print $1 if /BUILD_COUNT "([^"]*)"/' ../sources/Application/Model/Project.h) -else - PROJECT_NUMBER=$(grep -oP 'PROJECT_NUMBER "\K[^"]*' ../sources/Application/Model/Project.h) - PROJECT_RELEASE=$(grep -oP 'PROJECT_RELEASE "\K[^"]*' ../sources/Application/Model/Project.h) - BUILD_COUNT=$(grep -oP 'BUILD_COUNT "\K[^"]*' ../sources/Application/Model/Project.h) -fi +PROJECT_NUMBER=$(perl -nle 'print $1 if /PROJECT_NUMBER "([^"]*)"/' ../sources/Application/Model/Project.h) +PROJECT_RELEASE=$(perl -nle 'print $1 if /PROJECT_RELEASE "([^"]*)"/' ../sources/Application/Model/Project.h) +BUILD_COUNT=$(perl -nle 'print $1 if /BUILD_COUNT "([^"]*)"/' ../sources/Application/Model/Project.h) VERSION="${PROJECT_NUMBER}.${PROJECT_RELEASE}.${BUILD_COUNT}" collect_resources() { #1PLATFORM #2lgpt.*-exe @@ -20,17 +14,19 @@ collect_resources() { #1PLATFORM #2lgpt.*-exe fi PACKAGE=LGPT-$1-$VERSION.zip echo "-=-=Packaging $PACKAGE=-=-" + BINARY=" $(find . -iname $2)" + chmod +x $BINARY CONTENTS="./resources/$1/*" CONTENTS+=" ./custom_font.xml" - CONTENTS+=" $(find . -iname $2)" + CONTENTS+=" $BINARY" if [ "$1" == "PSP" ] || [ "$1" == "GARLIC" ] || [ "$1" == "RG35XXPLUS" ] || [ "$1" == "BITTBOY" ]; then # All files go in the root folder zip -9 $PACKAGE -j $CONTENTS elif [ "$1" == "MACOS" ]; then # .app is a folder - zip -9 $PACKAGE -j $CONTENTS - zip -9yr $PACKAGE LittleGPTracker.app/ + zip -9 $PACKAGE -j $CONTENTS + zip -9yr $PACKAGE LittleGPTracker.app/ else # all the others go in the bin mkdir bin ; cp $CONTENTS bin zip -9 $PACKAGE bin/* && rm -r bin/ diff --git a/sources/Application/Model/Project.h b/sources/Application/Model/Project.h index 011f2274..6dd1a61e 100644 --- a/sources/Application/Model/Project.h +++ b/sources/Application/Model/Project.h @@ -20,7 +20,7 @@ #define PROJECT_NUMBER "1" #define PROJECT_RELEASE "4" -#define BUILD_COUNT "3-bacon4" +#define BUILD_COUNT "3-bacon5" #define MAX_TAP 3 diff --git a/sources/Application/Views/InstrumentView.cpp b/sources/Application/Views/InstrumentView.cpp index 738c973f..0e359273 100644 --- a/sources/Application/Views/InstrumentView.cpp +++ b/sources/Application/Views/InstrumentView.cpp @@ -387,10 +387,11 @@ void InstrumentView::ProcessButtonMask(unsigned short mask,bool pressed) { // A modifier if (mask==EPBM_A) { - FourCC varID=((UIIntVarField *)GetFocus())->GetVariableID() ; - if ((varID==SIP_TABLE)||(varID==MIP_TABLE)||(varID==SIP_SAMPLE)) { - viewMode_=VM_NEW ; - } ; + FourCC varID = ((UIIntVarField *)GetFocus())->GetVariableID(); + if ((varID == SIP_TABLE) || (varID == MIP_TABLE) || + (varID == SIP_SAMPLE) || (varID == SIP_PRINTFX)) { + viewMode_ = VM_NEW; + } } else { // R Modifier