--- linuxsampler/trunk/src/engines/common/InstrumentScriptVMFunctions.cpp	2017/05/28 22:22:56	3246
+++ linuxsampler/trunk/src/engines/common/InstrumentScriptVMFunctions.cpp	2017/06/05 18:40:18	3277
@@ -23,7 +23,6 @@
     VMFnResult* InstrumentScriptVMFunction_play_note::exec(VMFnArgs* args) {
         int note = args->arg(0)->asInt()->evalInt();
         int velocity = (args->argsCount() >= 2) ? args->arg(1)->asInt()->evalInt() : 127;
-        int sampleoffset = (args->argsCount() >= 3) ? args->arg(2)->asInt()->evalInt() : 0;
         int duration = (args->argsCount() >= 4) ? args->arg(3)->asInt()->evalInt() : 0; //TODO: -1 might be a better default value instead of 0
 
         if (note < 0 || note > 127) {
@@ -36,15 +35,8 @@
             return errorResult(0);
         }
 
-        if (sampleoffset < 0) {
-            errMsg("play_note(): argument 3 may not be a negative sample offset");
-            return errorResult(0);
-        } else if (sampleoffset != 0) {
-            wrnMsg("play_note(): argument 3 does not support a sample offset other than 0 yet");
-        }
-
-        if (duration < -1) {
-            errMsg("play_note(): argument 4 must be a duration value of at least -1 or higher");
+        if (duration < -2) {
+            errMsg("play_note(): argument 4 must be a duration value of at least -2 or higher");
             return errorResult(0);
         }
 
@@ -63,10 +55,30 @@
                 return errorResult(0);
             }
             e.Param.Note.ParentNoteID = m_vm->m_event->cause.Param.Note.ID;
+            // check if that requested parent note is actually still alive
+            NoteBase* pParentNote =
+                pEngineChannel->pEngine->NoteByID( e.Param.Note.ParentNoteID );
+            // if parent note is already gone then this new note is not required anymore
+            if (!pParentNote)
+                return successResult(0);
         }
 
         const note_id_t id = pEngineChannel->ScheduleNoteMicroSec(&e, 0);
 
+        // if a sample offset is supplied, assign the offset as override
+        // to the previously created Note object
+        if (args->argsCount() >= 3) {
+            int sampleoffset = args->arg(2)->asInt()->evalInt();
+            if (sampleoffset >= 0) {
+                NoteBase* pNote = pEngineChannel->pEngine->NoteByID(id);
+                if (pNote) {
+                    pNote->Override.SampleOffset = sampleoffset;
+                }
+            } else if (sampleoffset < -1) {
+                errMsg("play_note(): sample offset of argument 3 may not be less than -1");
+            }
+        }
+
         // if a duration is supplied (and play-note event was scheduled
         // successfully above), then schedule a subsequent stop-note event
         if (id && duration > 0) {
@@ -1793,6 +1805,41 @@
         return successResult();
     }
 
+    // change_play_pos() function
+
+    InstrumentScriptVMFunction_change_play_pos::InstrumentScriptVMFunction_change_play_pos(InstrumentScriptVM* parent)
+    : m_vm(parent)
+    {
+    }
+
+    VMFnResult* InstrumentScriptVMFunction_change_play_pos::exec(VMFnArgs* args) {
+        const ScriptID id = args->arg(0)->asInt()->evalInt();
+        if (!id) {
+            wrnMsg("change_play_pos(): note ID for argument 1 may not be zero");
+            return successResult();
+        }
+        if (!id.isNoteID()) {
+            wrnMsg("change_play_pos(): argument 1 is not a note ID");
+            return successResult();
+        }
+
+        const int pos = args->arg(1)->asInt()->evalInt();
+        if (pos < 0) {
+            wrnMsg("change_play_pos(): playback position of argument 2 may not be negative");
+            return successResult();
+        }
+
+        AbstractEngineChannel* pEngineChannel =
+            static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);
+
+        NoteBase* pNote = pEngineChannel->pEngine->NoteByID( id.noteID() );
+        if (!pNote) return successResult();
+
+        pNote->Override.SampleOffset = pos;
+
+        return successResult();
+    }
+
     // event_status() function
 
     InstrumentScriptVMFunction_event_status::InstrumentScriptVMFunction_event_status(InstrumentScriptVM* parent)
@@ -1863,5 +1910,30 @@
 
         return successResult();
     }
+
+    // abort() function
+
+    InstrumentScriptVMFunction_abort::InstrumentScriptVMFunction_abort(InstrumentScriptVM* parent)
+    : m_vm(parent)
+    {
+    }
+
+    VMFnResult* InstrumentScriptVMFunction_abort::exec(VMFnArgs* args) {
+        const script_callback_id_t id = args->arg(0)->asInt()->evalInt();
+        if (!id) {
+            wrnMsg("abort(): callback ID for argument 1 may not be zero");
+            return successResult();
+        }
+
+        AbstractEngineChannel* pEngineChannel =
+            static_cast<AbstractEngineChannel*>(m_vm->m_event->cause.pEngineChannel);
+
+        RTList<ScriptEvent>::Iterator itCallback = pEngineChannel->ScriptCallbackByID(id);
+        if (!itCallback) return successResult(); // ignore if callback is i.e. not alive anymore
+
+        itCallback->execCtx->signalAbort();
+
+        return successResult();
+    }
 
 } // namespace LinuxSampler