eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make optional MIDI implementation more separate to the audio processing

Browse source
This commit is contained in:
Volker Fischer 2019-09-27 07:11:16 +02:00
parent dbb6e9eb83
commit d19bd6fc36
1 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
linux/sound.cpp
View file

@ -79,18 +79,30 @@ void CSound::OpenJack()
output_port_right = jack_port_register ( pJackClient, "output right", output_port_right = jack_port_register ( pJackClient, "output right",
JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 ); JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0 );
input_port_midi = jack_port_register ( pJackClient, "input midi",
JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0 );
if ( ( input_port_left == NULL ) || if ( ( input_port_left == NULL ) ||
( input_port_right == NULL ) || ( input_port_right == NULL ) ||
( output_port_left == NULL ) || ( output_port_left == NULL ) ||
( output_port_right == NULL ) || ( output_port_right == NULL ) )
( input_port_midi == NULL ) )
{ {
throw CGenErr ( tr ( "The Jack port registering failed." ) ); throw CGenErr ( tr ( "The Jack port registering failed." ) );
} }
// optional MIDI initialization
if ( iCtrlMIDIChannel != INVALID_MIDI_CH )
{
input_port_midi = jack_port_register ( pJackClient, "input midi",
JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0 );
if ( input_port_midi == NULL )
{
throw CGenErr ( tr ( "The Jack port registering failed." ) );
}
}
else
{
input_port_midi = NULL;
}
// tell the JACK server that we are ready to roll // tell the JACK server that we are ready to roll
if ( jack_activate ( pJackClient ) ) if ( jack_activate ( pJackClient ) )
{ {
@ -229,9 +241,6 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
(jack_default_audio_sample_t*) jack_port_get_buffer ( (jack_default_audio_sample_t*) jack_port_get_buffer (
pSound->input_port_right, nframes ); pSound->input_port_right, nframes );
void* in_midi = jack_port_get_buffer (
pSound->input_port_midi, nframes );
// copy input audio data // copy input audio data
if ( in_left != 0 && in_right != 0 ) if ( in_left != 0 && in_right != 0 )
{ {
@ -245,25 +254,32 @@ int CSound::process ( jack_nframes_t nframes, void* arg )
} }
} }
// akt on MIDI data // akt on MIDI data if MIDI is enabled
if ( in_midi != 0 ) if ( pSound->input_port_midi != NULL )
{ {
jack_nframes_t event_count = jack_midi_get_event_count ( in_midi ); void* in_midi = jack_port_get_buffer (
pSound->input_port_midi, nframes );
for ( jack_nframes_t j = 0; j < event_count; j++ ) if ( in_midi != 0 )
{ {
jack_midi_event_t in_event; jack_nframes_t event_count = jack_midi_get_event_count ( in_midi );
jack_midi_event_get ( &in_event, in_midi, j ); for ( jack_nframes_t j = 0; j < event_count; j++ )
// copy packet and send it to the MIDI parser
CVector<uint8_t> vMIDIPaketBytes ( in_event.size );
for ( i = 0; i < static_cast<int> ( in_event.size ); i++ )
{ {
vMIDIPaketBytes[i] = static_cast<uint8_t> ( in_event.buffer[i] ); jack_midi_event_t in_event;
jack_midi_event_get ( &in_event, in_midi, j );
// copy packet and send it to the MIDI parser
// TODO do not call malloc in real-time callback
CVector<uint8_t> vMIDIPaketBytes ( in_event.size );
for ( i = 0; i < static_cast<int> ( in_event.size ); i++ )
{
vMIDIPaketBytes[i] = static_cast<uint8_t> ( in_event.buffer[i] );
}
pSound->ParseMIDIMessage ( vMIDIPaketBytes );
} }
pSound->ParseMIDIMessage ( vMIDIPaketBytes );
} }
} }