Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-04-30 01:34:07 +02:00
Code Issues Releases Wiki Activity

Minor bug fixes for EXPERIMENTAL_MIDI_OUT. Also added files for autoconf/automake to portmidi and libscorealign. I also modified my local build-related files in src and lib-src to handle EXPERIMENTAL_MIDI_OUT and EXPERIMENTAL_SCOREALIGN, but while I can build with these options, the build-related files are not entirely working, so I will not commit them and break the "normal" builds. I suspect these new build files in this commit are not entirely correct -- some review is in order.

Browse Source
This commit is contained in:
rbdannenberg
2010-10-28 15:35:29 +00:00
parent b87a808468
commit 932ca88255
34 changed files with 19537 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib-src/portmidi/pm_linux/pmlinuxalsa.c
View File

@@ -201,7 +201,7 @@ static PmError alsa_write_byte(PmInternal *midi, unsigned char byte,
/* compute relative time of event = timestamp - now + latency */
PmTimestamp now = (midi->time_proc ?
midi->time_proc(midi->time_info) :
Pt_Time(NULL));
Pt_Time());
int when = timestamp;
/* if timestamp is zero, send immediately */
/* otherwise compute time delay and use delay if positive */
@@ -242,8 +242,8 @@ static PmError alsa_out_close(PmInternal *midi)
alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
if (!desc) return pmBadPtr;
if (pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port,
desc->client, desc->port)) {
if ((pm_hosterror = snd_seq_disconnect_to(seq, desc->this_port,
desc->client, desc->port))) {
// if there's an error, try to delete the port anyway, but don't
// change the pm_hosterror value so we retain the first error
snd_seq_delete_port(seq, desc->this_port);
@@ -332,8 +332,8 @@ static PmError alsa_in_close(PmInternal *midi)
{
alsa_descriptor_type desc = (alsa_descriptor_type) midi->descriptor;
if (!desc) return pmBadPtr;
if (pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port,
desc->client, desc->port)) {
if ((pm_hosterror = snd_seq_disconnect_from(seq, desc->this_port,
desc->client, desc->port))) {
snd_seq_delete_port(seq, desc->this_port); /* try to close port */
} else {
pm_hosterror = snd_seq_delete_port(seq, desc->this_port);