Updated yield definition and FL Studio mode requiring change to CC 115

sauraen · Jul 15, 2022 · afa783c · afa783c
1 parent 8f8d8c6
commit afa783c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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; m<mastertrack->getNumEvents(); 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
@@ -407,10 +407,8 @@
            cname="wait">
     <parameter datasrc="variable" name="Delay" meaning="Delay"/>
   </command>
-  <command cmd="254" name="yield" action="Delay" validinseq="1" validinchn="1"
-           cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle. Effectively delay by 1 tick.">
-    <parameter name="Constant delay" meaning="Delay" datasrc="constant" datalen="1"/>
-  </command>
+  <command cmd="254" name="yield" action="No Action" cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle."
+           validinseq="1" validinchn="1" validintrk="1"/>
   <command cmd="255" name="end" action="End of Data" validinseq="1" validinchn="1"
            validintrk="1" cname="fin"/>
 </cmdlist>
diff --git a/abi/2 - SM64 EU.xml b/abi/2 - SM64 EU.xml
@@ -465,10 +465,8 @@
            cname="wait">
     <parameter datasrc="variable" name="Delay" meaning="Delay"/>
   </command>
-  <command cmd="254" name="yield" action="Delay" validinseq="1" validinchn="1"
-           cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle. Effectively delay by 1 tick.">
-    <parameter name="Constant delay" meaning="Delay" datasrc="constant" datalen="1"/>
-  </command>
+  <command cmd="254" name="yield" action="No Action" cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle."
+           validinseq="1" validinchn="1" validintrk="1"/>
   <command cmd="255" name="end" action="End of Data" validinseq="1" validinchn="1"
            validintrk="1" cname="fin"/>
 </cmdlist>
diff --git a/abi/3 - SF64.xml b/abi/3 - SF64.xml
@@ -487,10 +487,8 @@
            cname="wait">
     <parameter datasrc="variable" name="Delay" meaning="Delay"/>
   </command>
-  <command cmd="254" name="yield" action="Delay" validinseq="1" validinchn="1"
-           cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle. Effectively delay by 1 tick.">
-    <parameter name="Constant delay" meaning="Delay" datasrc="constant" datalen="1"/>
-  </command>
+  <command cmd="254" name="yield" action="No Action" cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle."
+           validinseq="1" validinchn="1" validintrk="1"/>
   <command cmd="255" name="end" action="End of Data" validinseq="1" validinchn="1"
            validintrk="1" cname="fin"/>
 </cmdlist>
diff --git a/abi/4 - Zelda.xml b/abi/4 - Zelda.xml
@@ -186,9 +186,11 @@
   <command cmd="186" name="gaterand" action="No Action" validinchn="1" comments="Sets gate length humanization (durationRandomVariance).">
     <parameter name="Value" meaning="None" datasrc="fixed" datalen="1"/>
   </command>
-  <command cmd="187" name="unk_BB" action="No Action" validinchn="1" comments="Sets channel[0xF] to param 1 and channel[0x20] to param 2.">
-    <parameter name="Param 1" meaning="None" datasrc="fixed" datalen="1"/>
-    <parameter name="Param 2" meaning="None" datasrc="fixed" datalen="2"/>
+  <command cmd="187" name="chorus" action="CC or CC Group" validinchn="1"
+           comments="Chorus">
+    <parameter name="Length" meaning="None" datasrc="constant" datalen="16"/>
+    <parameter name="Chorus" meaning="CC" datasrc="fixed" datalen="1" cc="93"/>
+    <parameter name="Chorus LSB" meaning="CC" datasrc="fixed" datalen="1" cc="94"/>
   </command>
   <command cmd="188" name="addp" action="No Action" comments="P += immediate"
            validinchn="1">
@@ -574,10 +576,8 @@
            validintrk="1" validinchn="1">
     <parameter datasrc="variable" name="Delay" meaning="Delay"/>
   </command>
-  <command cmd="254" name="yield" action="Delay" cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle. Effectively delay by 1 tick."
-           validinseq="1" validinchn="1" validintrk="1">
-    <parameter name="Constant delay" meaning="Delay" datasrc="constant" datalen="1"/>
-  </command>
+  <command cmd="254" name="yield" action="No Action" cname="return" comments="Return from parsing, to pick up from the next command on the next parse cycle."
+           validinseq="1" validinchn="1" validintrk="1"/>
   <command cmd="255" name="end" action="End of Data" validinchn="1" validintrk="1"
            cname="fin" validinseq="1"/>
 </cmdlist>
diff --git a/abi/4b - Zelda community only.xml b/abi/4b - Zelda community only.xml
@@ -567,10 +567,8 @@
            validinchn="1">
     <parameter datasrc="variable" name="Delay" meaning="Delay"/>
   </command>
-  <command cmd="254" name="yield" action="Delay" comments="Return from parsing, to pick up from the next command on the next parse cycle. Effectively delay by 1 tick."
-           validinseq="1" validinchn="1" validintrk="1">
-    <parameter name="Constant delay" meaning="Delay" datasrc="constant" datalen="1"/>
-  </command>
+  <command cmd="254" name="yield" action="No Action" comments="Return from parsing, to pick up from the next command on the next parse cycle."
+           validinseq="1" validinchn="1" validintrk="1"/>
   <command cmd="255" name="end" action="End of Data" validinchn="1" validintrk="1"
            validinseq="1"/>
 </cmdlist>