diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/mididev.cpp | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/mididev.cpp')
| -rw-r--r-- | muse2/muse/mididev.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/muse2/muse/mididev.cpp b/muse2/muse/mididev.cpp index 31a8f6fe..becab6f7 100644 --- a/muse2/muse/mididev.cpp +++ b/muse2/muse/mididev.cpp @@ -38,6 +38,7 @@ #include "gconfig.h" #include "globals.h" #include "audio.h" +#include "audiodev.h" #include "midiseq.h" #include "sync.h" #include "midiitransform.h" @@ -68,13 +69,16 @@ void initMidiDevices() #ifdef MIDI_DRIVER_MIDI_SERIAL initMidiSerial(); #endif - if(initMidiAlsa()) + if(MusEGlobal::useAlsaWithJack || MusEGlobal::audioDevice->deviceType() != AudioDevice::JACK_AUDIO) + { + if(initMidiAlsa()) { QMessageBox::critical(NULL, "MusE fatal error.", "MusE failed to initialize the\n" "Alsa midi subsystem, check\n" "your configuration."); exit(-1); } + } if(initMidiJack()) { |