diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c850fe..a068789 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 3.12) set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "" FORCE) set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "" FORCE) -project(SEQ64 VERSION 2.0.0) +project(SEQ64 VERSION 2.1.4) if(NOT EXISTS "${CMAKE_SOURCE_DIR}/juce/CMakeLists.txt") message(FATAL_ERROR "You forgot to get the Git submodules, please run git submodule update --init") @@ -115,8 +115,8 @@ if(SEQ64_BUILD_GUI) JUCE_WEB_BROWSER=0 JUCE_USE_CURL=0 JUCE_DISPLAY_SPLASH_SCREEN=0 - JUCE_APPLICATION_NAME_STRING="SEQ64 V2.0" - JUCE_APPLICATION_VERSION_STRING="V2.0" + JUCE_APPLICATION_NAME_STRING="SEQ64 V2.1.4" + JUCE_APPLICATION_VERSION_STRING="V2.1.4" ) target_link_libraries(seq64_gui PRIVATE juce::juce_core diff --git a/Source/MainGUI.cpp b/Source/MainGUI.cpp index 9454678..99551fb 100644 --- a/Source/MainGUI.cpp +++ b/Source/MainGUI.cpp @@ -31,7 +31,7 @@ class seq64Application : public JUCEApplication public: seq64Application() {} - const String getApplicationName() override { return "SEQ64 V2.1"; } + const String getApplicationName() override { return "SEQ64 V2.1.4"; } const String getApplicationVersion() override { return ProjectInfo::versionString; } bool moreThanOneInstanceAllowed() override { return true; } diff --git a/Source/SeqEditor.cpp b/Source/SeqEditor.cpp index 79a6243..bfa65cf 100644 --- a/Source/SeqEditor.cpp +++ b/Source/SeqEditor.cpp @@ -908,7 +908,7 @@ void SeqEditor::buttonClicked (juce::Button* buttonThatWasClicked) "- Text events (Marker type text events are used by SEQ64 for temporal sections, including loop points)\n\n" "SEQ64's FL Studio compatibility mode replaces these with:\n" "- CC 114, channel 0 only: Master Volume\n" - "- CC 115, channel 0 only, any nonzero value: temporal section marker (e.g. loop point)\n" + "- CC 115, channel 0 only, value not zero and not the same as the last value: temporal section marker (e.g. loop point)\n" ); //[/UserButtonCode_btnFLStudioHelp] } diff --git a/Source/SeqFile.cpp b/Source/SeqFile.cpp index e77cd2d..9bdb7c0 100644 --- a/Source/SeqFile.cpp +++ b/Source/SeqFile.cpp @@ -875,6 +875,7 @@ int SeqFile::importMIDI(File midifile, ValueTree midiopts){ tsectimes.add(0); tsecnames.clear(); tsecnames.add("start"); + int lastCC115 = -1; for(int m=0; mgetNumEvents(); m++){ msg = mastertrack->getEventPointer(m)->message; String metatext; @@ -888,12 +889,17 @@ int SeqFile::importMIDI(File midifile, ValueTree midiopts){ if(!metatext.startsWithIgnoreCase("block:")) continue; } }else if((bool)midiopts.getProperty("flstudio") && msg.isController() - && msg.getControllerNumber() == 115 && msg.getControllerValue() != 0){ + && msg.getControllerNumber() == 115){ + if(msg.getControllerValue() == 0 || msg.getControllerValue() == lastCC115){ + dbgmsg("Ignoring spurious CC 115 value " + String(msg.getControllerValue()) + " inserted by FL Studio"); + continue; + } if(msg.getChannel() != 1){ dbgmsg("FL Studio mode, received CC 115 (temporal section marker) not on channel 1 (0 zero-indexed)! Ignoring!"); importresult |= 1; continue; } + lastCC115 = msg.getControllerValue(); metatext = "SectionX"; }else{ continue; diff --git a/abi/1 - SM64.xml b/abi/1 - SM64.xml index aeba2d2..e3a0ca8 100644 --- a/abi/1 - SM64.xml +++ b/abi/1 - SM64.xml @@ -407,10 +407,8 @@ cname="wait"> - - - + diff --git a/abi/2 - SM64 EU.xml b/abi/2 - SM64 EU.xml index 2b7b702..94b5a03 100644 --- a/abi/2 - SM64 EU.xml +++ b/abi/2 - SM64 EU.xml @@ -465,10 +465,8 @@ cname="wait"> - - - + diff --git a/abi/3 - SF64.xml b/abi/3 - SF64.xml index 5b582c4..43bff9c 100644 --- a/abi/3 - SF64.xml +++ b/abi/3 - SF64.xml @@ -487,10 +487,8 @@ cname="wait"> - - - + diff --git a/abi/4 - Zelda.xml b/abi/4 - Zelda.xml index 19b74bb..4e94a6d 100644 --- a/abi/4 - Zelda.xml +++ b/abi/4 - Zelda.xml @@ -186,9 +186,11 @@ - - - + + + + @@ -574,10 +576,8 @@ validintrk="1" validinchn="1"> - - - + diff --git a/abi/4b - Zelda community only.xml b/abi/4b - Zelda community only.xml index f3ed802..44ba924 100644 --- a/abi/4b - Zelda community only.xml +++ b/abi/4b - Zelda community only.xml @@ -567,10 +567,8 @@ validinchn="1"> - - - +