From 45361cd53518b910f44b4277c18f706eec7a2b7b Mon Sep 17 00:00:00 2001 From: kevin Date: Sun, 15 Dec 2013 18:19:27 -0500 Subject: [PATCH] cmMidiFilePlay.c : _cmMfpCb() now generates a zeroed timestamp. --- cmMidiFilePlay.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmMidiFilePlay.c b/cmMidiFilePlay.c index 0912208..f1b0457 100644 --- a/cmMidiFilePlay.c +++ b/cmMidiFilePlay.c @@ -7,6 +7,7 @@ #include "cmMem.h" #include "cmMallocDebug.h" #include "cmFile.h" +#include "cmTime.h" #include "cmMidi.h" #include "cmMidiPort.h" #include "cmMidiFile.h" @@ -410,7 +411,8 @@ void _cmMfpCb( void* userCbPtr, unsigned dmicros, const cmMidiTrackMsg_t* msgPtr cmMidiMsg msg; _cmMfpTest2CbData_t* d = (_cmMfpTest2CbData_t*)userCbPtr; - msg.deltaUs = dmicros; + msg.timeStamp.tv_sec = 0; + msg.timeStamp.tv_nsec = 0; msg.status = msgPtr->status + msgPtr->u.chMsgPtr->ch; msg.d0 = msgPtr->u.chMsgPtr->d0; msg.d1 = msgPtr->u.chMsgPtr->d1; @@ -535,10 +537,8 @@ cmRC_t cmMfpTest2( const char* midiFn, const char* audioFn, cmCtx_t* ctx ) cmErrMsg(&err,kProcObjFailMfptRC,"Audio file write failed."); goto errLabel; } - } - errLabel: if( cmMidiSynthFree(&msp) != cmOkRC ) cmErrMsg(&err,kProcObjFailMfptRC,"MIDI synth. free failed.");