diff options
author | Florian Jung <flo@windfisch.org> | 2012-01-03 19:13:48 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2012-01-03 19:13:48 +0000 |
commit | 7993a73cece885bac45021dd021ac43f6f332040 (patch) | |
tree | 2f8296b31efa6d93cb53b8b735519163ec163a84 /muse2/muse/driver | |
parent | 845d28b2fba8f2c1d4211aee7beb5ab041315531 (diff) | |
parent | 1bc4ba9dfc00b6e7511fbf4765296a2002f83315 (diff) |
merged with trunk
added "copy drummap" to duplicate track dialog
Diffstat (limited to 'muse2/muse/driver')
-rw-r--r-- | muse2/muse/driver/alsamidi.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/muse2/muse/driver/alsamidi.cpp b/muse2/muse/driver/alsamidi.cpp index 2c6f9468..740de1fb 100644 --- a/muse2/muse/driver/alsamidi.cpp +++ b/muse2/muse/driver/alsamidi.cpp @@ -792,8 +792,9 @@ bool initMidiAlsa() const char* cname = snd_seq_client_info_get_name(cinfo); //printf( "ALSA client name: %s\n", cname); - // Put Midi Through and user clients after others. Insert other unwanted clients here: // p4.0.41 - if( !(snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT || strcmp("Midi Through", cname) == 0) ) + bool is_thru = (strcmp("Midi Through", cname) == 0); + // Put Midi Through and user clients after others. Insert other unwanted clients here: // p4.0.41 + if( !(snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT || is_thru) ) continue; snd_seq_port_info_t *pinfo; @@ -820,6 +821,8 @@ bool initMidiAlsa() if (capability & inCap) flags |= 2; dev->setrwFlags(flags); + if(is_thru) // Don't auto-open Midi Through. + dev->setOpenFlags(0); if (MusEGlobal::debugMsg) printf("ALSA port add: <%s>, %d:%d flags %d 0x%0x\n", snd_seq_port_info_get_name(pinfo), |