|
@@ -7,6 +7,7 @@
|
7
|
7
|
#include "cmMem.h"
|
8
|
8
|
#include "cmMallocDebug.h"
|
9
|
9
|
#include "cmFile.h"
|
|
10
|
+#include "cmTime.h"
|
10
|
11
|
#include "cmMidi.h"
|
11
|
12
|
#include "cmMidiPort.h"
|
12
|
13
|
#include "cmMidiFile.h"
|
|
@@ -410,7 +411,8 @@ void _cmMfpCb( void* userCbPtr, unsigned dmicros, const cmMidiTrackMsg_t* msgPtr
|
410
|
411
|
cmMidiMsg msg;
|
411
|
412
|
_cmMfpTest2CbData_t* d = (_cmMfpTest2CbData_t*)userCbPtr;
|
412
|
413
|
|
413
|
|
- msg.deltaUs = dmicros;
|
|
414
|
+ msg.timeStamp.tv_sec = 0;
|
|
415
|
+ msg.timeStamp.tv_nsec = 0;
|
414
|
416
|
msg.status = msgPtr->status + msgPtr->u.chMsgPtr->ch;
|
415
|
417
|
msg.d0 = msgPtr->u.chMsgPtr->d0;
|
416
|
418
|
msg.d1 = msgPtr->u.chMsgPtr->d1;
|
|
@@ -535,10 +537,8 @@ cmRC_t cmMfpTest2( const char* midiFn, const char* audioFn, cmCtx_t* ctx )
|
535
|
537
|
cmErrMsg(&err,kProcObjFailMfptRC,"Audio file write failed.");
|
536
|
538
|
goto errLabel;
|
537
|
539
|
}
|
538
|
|
-
|
539
|
540
|
}
|
540
|
541
|
|
541
|
|
-
|
542
|
542
|
errLabel:
|
543
|
543
|
if( cmMidiSynthFree(&msp) != cmOkRC )
|
544
|
544
|
cmErrMsg(&err,kProcObjFailMfptRC,"MIDI synth. free failed.");
|