bzr branch
/loggerhead/users/piem/portmidi
| Line | Revision | Contents |
| 1 | 16 | --- portmidi~/pm_linux/pmlinuxalsa.c 2009-09-16 05:41:04.000000000 +0200 |
| 2 | +++ portmidi/pm_linux/pmlinuxalsa.c 2009-09-16 05:45:29.000000000 +0200 |
|
| 3 | @@ -243,8 +243,8 @@ |
|
| 4 | 3 | alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor; |
| 5 | if (!desc) return pmBadPtr; |
|
| 6 | |
|
| 7 | - if (pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, |
|
| 8 | - desc->client, desc->port)) { |
|
| 9 | + if ((pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port, |
|
| 10 | + desc->client, desc->port))) { |
|
| 11 | // if there's an error, try to delete the port anyway, but don't |
|
| 12 | // change the pm_hosterror value so we retain the first error |
|
| 13 | snd_seq_delete_port(seq, desc->this_port); |
|
| 14 | 16 | @@ -333,8 +333,8 @@ |
| 15 | 3 | { |
| 16 | alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor; |
|
| 17 | if (!desc) return pmBadPtr; |
|
| 18 | - if (pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, |
|
| 19 | - desc->client, desc->port)) { |
|
| 20 | + if ((pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port, |
|
| 21 | + desc->client, desc->port))) { |
|
| 22 | snd_seq_delete_port(seq, desc->this_port); /* try to close port */ |
|
| 23 | } else { |
|
| 24 | pm_hosterror = snd_seq_delete_port(seq, desc->this_port); |
|
| 25 | 16 | @@ -421,7 +421,7 @@ |
| 26 | } |
|
| 27 | if (desc->error < 0) return pmHostError; |
|
| 28 | 3 | |
| 29 | - VERBOSE printf("snd_seq_drain_output: 0x%x\n", seq); |
|
| 30 | + VERBOSE printf("snd_seq_drain_output: 0x%x\n", (unsigned int)seq); |
|
| 31 | desc->error = snd_seq_drain_output(seq); |
|
| 32 | if (desc->error < 0) return pmHostError; |
|
| 33 | |
|
| 34 | 16 | @@ -607,7 +607,7 @@ |
| 35 | 3 | case SND_SEQ_EVENT_SYSEX: { |
| 36 | const BYTE *ptr = (const BYTE *) ev->data.ext.ptr; |
|
| 37 | 16 | /* assume there is one sysex byte to process */ |
| 38 | - pm_read_bytes(midi, ptr, ev->data.ext.len, timestamp); |
|
| 39 | + pm_read_bytes(midi, (unsigned char*)ptr, ev->data.ext.len, timestamp); |
|
| 40 | break; |
|
| 41 | } |
|
| 42 | } |
Loggerhead 1.17 is a web-based interface for Bazaar branches