AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-07-14 09:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux sync for MIDI timing

Browse Source
This commit is contained in:
Jack Andersen 2016-06-07 19:20:26 -10:00
parent 52c0cca593
commit 65a63bcab5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/audiodev/ALSA.cpp
View File

@ -7,6 +7,11 @@
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <signal.h> #include <signal.h>
static inline double TimespecToDouble(struct timespec& ts)
{
return ts.tv_sec + ts.tv_nsec / 1.0e9;
}
namespace boo namespace boo
{ {
static logvisor::Module Log("boo::ALSA"); static logvisor::Module Log("boo::ALSA");
@ -377,9 +382,15 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
s.sa_flags = 0; s.sa_flags = 0;
sigaction(SIGQUIT, &s, nullptr); sigaction(SIGQUIT, &s, nullptr);
snd_rawmidi_status_t* midiStatus;
snd_rawmidi_status_malloc(&midiStatus);
uint8_t buf[512]; uint8_t buf[512];
while (running) while (running)
{ {
snd_htimestamp_t ts;
snd_rawmidi_status(midi, midiStatus);
snd_rawmidi_status_get_tstamp(midiStatus, &ts);
int rdBytes = snd_rawmidi_read(midi, buf, 512); int rdBytes = snd_rawmidi_read(midi, buf, 512);
if (rdBytes < 0) if (rdBytes < 0)
{ {
@ -389,8 +400,10 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
break; break;
} }
receiver(std::vector<uint8_t>(std::cbegin(buf), std::cbegin(buf) + rdBytes)); receiver(std::vector<uint8_t>(std::cbegin(buf), std::cbegin(buf) + rdBytes), TimespecToDouble(ts));
} }
snd_rawmidi_status_free(midiStatus);
} }
struct MIDIIn : public IMIDIIn struct MIDIIn : public IMIDIIn
@ -539,6 +552,8 @@ struct ALSAAudioVoiceEngine : BaseAudioVoiceEngine
return {}; return {};
return std::make_unique<MIDIInOut>(midiIn, midiOut, true, std::move(receiver)); return std::make_unique<MIDIInOut>(midiIn, midiOut, true, std::move(receiver));
} }
bool useMIDILock() const {return true;}
}; };
std::unique_ptr<IAudioVoiceEngine> NewAudioVoiceEngine() std::unique_ptr<IAudioVoiceEngine> NewAudioVoiceEngine()