summaryrefslogtreecommitdiff
path: root/muse2/muse/driver
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-06-19 01:26:26 +0000
committerTim E. Real <termtech@rogers.com>2011-06-19 01:26:26 +0000
commit02941424387a064301372c12bda3e8c3ab3fee45 (patch)
treee4cdea4400d8a34060a1c4d2b32da8e7ef46ab90 /muse2/muse/driver
parent448d81436ed8c2bc501506c2663a9bdb8c0dd023 (diff)
Major work, all synthesizers. Other fixes. Please see ChangeLog.
Diffstat (limited to 'muse2/muse/driver')
-rw-r--r--muse2/muse/driver/jack.cpp3
-rw-r--r--muse2/muse/driver/jackmidi.cpp11
2 files changed, 9 insertions, 5 deletions
diff --git a/muse2/muse/driver/jack.cpp b/muse2/muse/driver/jack.cpp
index c4d7a8ca..4857ede5 100644
--- a/muse2/muse/driver/jack.cpp
+++ b/muse2/muse/driver/jack.cpp
@@ -75,7 +75,8 @@ inline bool checkJackClient(jack_client_t* _client)
bool checkAudioDevice()
{
if (audioDevice == NULL) {
- printf("Muse:checkAudioDevice: no audioDevice\n");
+ if(debugMsg)
+ printf("Muse:checkAudioDevice: no audioDevice\n");
return false;
}
return true;
diff --git a/muse2/muse/driver/jackmidi.cpp b/muse2/muse/driver/jackmidi.cpp
index 1765fabb..e514af7a 100644
--- a/muse2/muse/driver/jackmidi.cpp
+++ b/muse2/muse/driver/jackmidi.cpp
@@ -1061,7 +1061,8 @@ void MidiJackDevice::eventReceived(jack_midi_event_t* ev)
// For now, do not accept if the last byte is not EOX, meaning it's a chunk with more chunks to follow.
if(*(((unsigned char*)ev->buffer) + ev->size - 1) != ME_SYSEX_END)
{
- printf("MidiJackDevice::eventReceived sysex chunks not supported!\n");
+ if(debugMsg)
+ printf("MidiJackDevice::eventReceived sysex chunks not supported!\n");
return;
}
@@ -1092,15 +1093,17 @@ void MidiJackDevice::eventReceived(jack_midi_event_t* ev)
//break;
// return;
default:
- printf("MidiJackDevice::eventReceived unsupported system event 0x%02x\n", type);
+ if(debugMsg)
+ printf("MidiJackDevice::eventReceived unsupported system event 0x%02x\n", type);
return;
}
}
//return;
break;
default:
- printf("MidiJackDevice::eventReceived unknown event 0x%02x\n", type);
- //printf("MidiJackDevice::eventReceived unknown event 0x%02x size:%d buf:0x%02x 0x%02x 0x%02x ...0x%02x\n", type, ev->size, *(ev->buffer), *(ev->buffer + 1), *(ev->buffer + 2), *(ev->buffer + (ev->size - 1)));
+ if(debugMsg)
+ printf("MidiJackDevice::eventReceived unknown event 0x%02x\n", type);
+ //printf("MidiJackDevice::eventReceived unknown event 0x%02x size:%d buf:0x%02x 0x%02x 0x%02x ...0x%02x\n", type, ev->size, *(ev->buffer), *(ev->buffer + 1), *(ev->buffer + 2), *(ev->buffer + (ev->size - 1)));
return;
}