Mercurial > hg > svcore
diff data/midi/rtmidi/RtMidi.cpp @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 17 Apr 2018 10:35:42 +0100 |
| parents | 48e9f538e6e9 |
| children |
line wrap: on
line diff
--- a/data/midi/rtmidi/RtMidi.cpp Tue Apr 17 10:03:51 2018 +0100 +++ b/data/midi/rtmidi/RtMidi.cpp Tue Apr 17 10:35:42 2018 +0100 @@ -1226,7 +1226,7 @@ if ( !( data->ignoreFlags & 0x04 ) ) doDecode = true; break; - case SND_SEQ_EVENT_SYSEX: + case SND_SEQ_EVENT_SYSEX: if ( (data->ignoreFlags & 0x01) ) break; if ( ev->data.ext.len > apiData->bufferSize ) { apiData->bufferSize = ev->data.ext.len; @@ -1238,6 +1238,8 @@ break; } } + doDecode = true; + break; default: doDecode = true; @@ -1573,11 +1575,11 @@ snd_seq_port_info_t *pinfo; snd_seq_port_info_alloca( &pinfo ); snd_seq_port_info_set_capability( pinfo, - SND_SEQ_PORT_CAP_WRITE | - SND_SEQ_PORT_CAP_SUBS_WRITE ); + SND_SEQ_PORT_CAP_WRITE | + SND_SEQ_PORT_CAP_SUBS_WRITE ); snd_seq_port_info_set_type( pinfo, - SND_SEQ_PORT_TYPE_MIDI_GENERIC | - SND_SEQ_PORT_TYPE_APPLICATION ); + SND_SEQ_PORT_TYPE_MIDI_GENERIC | + SND_SEQ_PORT_TYPE_APPLICATION ); snd_seq_port_info_set_midi_channels(pinfo, 16); #ifndef AVOID_TIMESTAMPING snd_seq_port_info_set_timestamping(pinfo, 1); @@ -1689,7 +1691,7 @@ errorString_ = "MidiOutAlsa::initialize: error creating ALSA sequencer client object."; error( RtMidiError::DRIVER_ERROR, errorString_ ); return; - } + } // Set client name. snd_seq_set_client_name( seq, clientName.c_str() ); @@ -1722,8 +1724,8 @@ unsigned int MidiOutAlsa :: getPortCount() { - snd_seq_port_info_t *pinfo; - snd_seq_port_info_alloca( &pinfo ); + snd_seq_port_info_t *pinfo; + snd_seq_port_info_alloca( &pinfo ); AlsaMidiData *data = static_cast<AlsaMidiData *> (apiData_); return portInfo( data->seq, pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, -1 ); @@ -1772,8 +1774,8 @@ return; } - snd_seq_port_info_t *pinfo; - snd_seq_port_info_alloca( &pinfo ); + snd_seq_port_info_t *pinfo; + snd_seq_port_info_alloca( &pinfo ); AlsaMidiData *data = static_cast<AlsaMidiData *> (apiData_); if ( portInfo( data->seq, pinfo, SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, (int) portNumber ) == 0 ) { std::ostringstream ost;