summaryrefslogtreecommitdiff
path: root/muse/muse/mididev.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'muse/muse/mididev.cpp')
-rw-r--r--muse/muse/mididev.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/muse/muse/mididev.cpp b/muse/muse/mididev.cpp
index 48a8fa9f..7d02cc74 100644
--- a/muse/muse/mididev.cpp
+++ b/muse/muse/mididev.cpp
@@ -34,6 +34,8 @@ extern bool initMidiJack();
MidiDeviceList midiDevices;
extern void processMidiInputTransformPlugins(MEvent&);
+extern unsigned int volatile lastExtMidiSyncTick;
+
//---------------------------------------------------------
// initMidiDevices
//---------------------------------------------------------
@@ -50,6 +52,7 @@ void initMidiDevices()
"your configuration.");
exit(-1);
}
+
if(initMidiJack())
{
QMessageBox::critical(NULL, "MusE fatal error.", "MusE failed to initialize the\n"
@@ -158,7 +161,11 @@ MREventList* MidiDevice::recordEvents()
void MidiDevice::recordEvent(MidiRecordEvent& event)
{
- event.setTime(audio->timestamp());
+ // p3.3.35
+ // TODO: Tested, but record resolution not so good. Switch to wall clock based separate list in MidiDevice. And revert this line.
+ //event.setTime(audio->timestamp());
+ event.setTime(extSyncFlag.value() ? lastExtMidiSyncTick : audio->timestamp());
+
// Added by Tim. p3.3.8
// By T356. Set the loop number which the event came in at.