summaryrefslogtreecommitdiff
path: root/drumgizmo/input/jackmidi.cc
diff options
context:
space:
mode:
authorChristian Glöckner <cgloeckner@freenet.de>2016-01-29 14:05:53 +0100
committerAndré Nusser <andre.nusser@googlemail.com>2016-02-09 09:03:17 +0100
commitd991ef4d089bc67710512f7d2f3ffba38663d2e8 (patch)
tree29e3215fba167aa7d21ed33c1d2b0c1d3041dfb9 /drumgizmo/input/jackmidi.cc
parent67ac001b417e0a5497f02e59cd33a2248964eac5 (diff)
Fixed style issues
Diffstat (limited to 'drumgizmo/input/jackmidi.cc')
-rw-r--r--drumgizmo/input/jackmidi.cc30
1 files changed, 16 insertions, 14 deletions
diff --git a/drumgizmo/input/jackmidi.cc b/drumgizmo/input/jackmidi.cc
index 4aebf69..23c0ff1 100644
--- a/drumgizmo/input/jackmidi.cc
+++ b/drumgizmo/input/jackmidi.cc
@@ -32,7 +32,7 @@
static int const NOTE_ON = 0x90;
-JackMidiInputEngine::JackMidiInputEngine(JackClient &client)
+JackMidiInputEngine::JackMidiInputEngine(JackClient& client)
: AudioInputEngineMidi{}
, JackProcess{}
, client(client)
@@ -51,19 +51,21 @@ JackMidiInputEngine::~JackMidiInputEngine()
bool JackMidiInputEngine::init(Instruments& instruments)
{
- if (!loadMidiMap(midimap, instruments)) {
- std::cerr << "[MidifileInputEngine] Failed to parse midimap '" << midimap
- << "'\n";
+ if(!loadMidiMap(midimap, instruments))
+ {
+ std::cerr << "[MidifileInputEngine] Failed to parse midimap '"
+ << midimap << "'\n";
return false;
}
port = std::make_unique<JackPort>(client, "drumgizmo_midiin",
- JACK_DEFAULT_MIDI_TYPE, JackPortIsInput);
+ JACK_DEFAULT_MIDI_TYPE,
+ JackPortIsInput);
return true;
}
void JackMidiInputEngine::setParm(std::string parm, std::string value)
{
- if (parm == "midimap")
+ if(parm == "midimap")
{
// apply midimap filename
midimap = value;
@@ -89,12 +91,12 @@ void JackMidiInputEngine::pre()
{
}
-event_t *JackMidiInputEngine::run(size_t pos, size_t len, size_t *nevents)
+event_t* JackMidiInputEngine::run(size_t pos, size_t len, size_t* nevents)
{
*nevents = listsize;
- event_t *l = list;
+ event_t* l = list;
// todo: get rid of malloc
- list = (event_t *)malloc(sizeof(event_t) * 1000);
+ list = (event_t*)malloc(sizeof(event_t) * 1000);
listsize = 0;
return l;
}
@@ -106,18 +108,18 @@ void JackMidiInputEngine::post()
void JackMidiInputEngine::process(jack_nframes_t num_frames)
{
assert(port != nullptr);
- void *buffer = jack_port_get_buffer(port->port, num_frames);
+ void* buffer = jack_port_get_buffer(port->port, num_frames);
jack_nframes_t num_events = jack_midi_get_event_count(buffer);
- for (jack_nframes_t i = 0; i < num_events; ++i)
+ for(jack_nframes_t i = 0; i < num_events; ++i)
{
jack_midi_event_t event;
jack_midi_event_get(&event, buffer, i);
- if (event.size != 3)
+ if(event.size != 3)
{
continue;
}
- if ((event.buffer[0] & NOTE_ON) != NOTE_ON)
+ if((event.buffer[0] & NOTE_ON) != NOTE_ON)
{
continue;
}
@@ -125,7 +127,7 @@ void JackMidiInputEngine::process(jack_nframes_t num_frames)
int velocity = event.buffer[2];
printf("Event key:%d vel:%d\n", key, velocity);
int k = mmap.lookup(key);
- if (k != -1 && velocity)
+ if(k != -1 && velocity)
{
list[listsize].type = TYPE_ONSET;
list[listsize].instrument = k;