valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Query port 17:0 as well as default port

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2953
This commit is contained in:
Peter Veenstra 2007-08-08 08:04:53 +00:00
parent 5b8517762e
commit 4fdda4e51e
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gui/midi_alsa.h
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: midi_alsa.h,v 1.16 2007-06-14 08:23:46 qbix79 Exp $ */
/* $Id: midi_alsa.h,v 1.17 2007-08-08 08:04:53 qbix79 Exp $ */
#define ALSA_PCM_OLD_HW_PARAMS_API
#define ALSA_PCM_OLD_SW_PARAMS_API
@ -125,7 +125,8 @@ public:
bool Open(const char * conf) {
char var[10];
unsigned int caps;
bool defaultport = true; //try 17:0 as well. Seems to be default nowadays
// try to use port specified in config file
if (conf && conf[0]) {
safe_strncpy(var, conf, 10);
@ -133,6 +134,7 @@ public:
LOG_MSG("ALSA:Invalid alsa port %s", var);
return false;
}
defaultport = false;
}
// default port if none specified
else if (parse_addr("65:0", &seq_client, &seq_port) < 0) {
@ -153,8 +155,8 @@ public:
if (seq_client == SND_SEQ_ADDRESS_SUBSCRIBERS)
caps = ~SND_SEQ_PORT_CAP_SUBS_READ;
my_port =
snd_seq_create_simple_port(seq_handle, "DOSBOX", caps,
SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
snd_seq_create_simple_port(seq_handle, "DOSBOX", caps,
SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION);
if (my_port < 0) {
snd_seq_close(seq_handle);
LOG_MSG("ALSA:Can't create ALSA port");
@ -164,9 +166,18 @@ public:
if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
/* subscribe to MIDI port */
if (snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
snd_seq_close(seq_handle);
LOG_MSG("ALSA:Can't subscribe to MIDI port (%d:%d)", seq_client, seq_port);
return false;
if (defaultport) { //if port "65:0" (default) try "17:0" as well
seq_client = 17; seq_port = 0; //Update reported values
if(snd_seq_connect_to(seq_handle,my_port,seq_client,seq_port) < 0) {
snd_seq_close(seq_handle);
LOG_MSG("ALSA:Can't subscribe to MIDI port (65:0) nor (17:0)");
return false;
}
} else {
snd_seq_close(seq_handle);
LOG_MSG("ALSA:Can't subscribe to MIDI port (%d:%d)", seq_client, seq_port);
return false;
}
}
}