fixing lua event function "play head" (#420)

Co-authored-by: samba <samba@manjaro>
werckme · Apr 6, 2024 · 67cc8ee · 67cc8ee
1 parent 7216f13
commit 67cc8ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/rendertests/tests/293_lua_event_function.sheet b/rendertests/tests/293_lua_event_function.sheet
@@ -2,15 +2,17 @@
 using "./293luaEventFunction.lua";
 using "./293_lua_event_function.conductions";
 
-device: MyDevice  midi _useDevice="DIN 3";
+device: MyDevice  midi _useDevice="FLUID";
 instrumentDef: piano _ch=0 _onDevice=MyDevice _pc=0;
 instrumentDef: piano2 _ch=1 _onDevice=MyDevice _pc=0;
 instrumentDef: piano3 _ch=2 _onDevice=MyDevice _pc=0;
 
 [
 instrument: piano;
 {
-    /call: 293luaEventFunction/ | g a b c' |
-    /call: 293luaEventFunction _octave=1/ | g' a' b' c'' |
+    -- lua event functions does not consume any time, so we need to add an rest after the call to 
+    -- set the "Play Head" on to the correct position
+     /call: 293luaEventFunction/ r1 | g4 a b c' |
+     /call: 293luaEventFunction _octave=1/ r1 | g'4 a' b' c'' |
 }
 ]
diff --git a/src/compiler/commands/ExecuteEventFunction.cpp b/src/compiler/commands/ExecuteEventFunction.cpp
@@ -16,13 +16,16 @@ namespace compiler
         AModification::Events events;
         theEventFunction->execute(context, events);
         const auto &originEvent = event();
+        com::Ticks passedTicks = 0;
         for(auto &event : events)
         {
             event.sourceId =  originEvent.sourceId;
             event.sourcePositionBegin = originEvent.sourcePositionBegin;
             event.sourcePositionEnd = originEvent.sourcePositionEnd;
             sheetEventRenderer_->addEvent(event);
+            passedTicks += event.duration;
         }
+        context->seek(-passedTicks);
     }
 
     LuaEventFunctionPtr ExecuteEventFunction::loadEventFunction(IContextPtr ctx, const com::String& modName)