aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desiredata/src/s_audio_mmio.c1
-rw-r--r--desiredata/src/s_audio_pa.c1
-rw-r--r--desiredata/src/s_midi_alsa.c1
-rw-r--r--desiredata/src/s_midi_mmio.c1
-rw-r--r--desiredata/src/s_midi_none.c1
-rw-r--r--desiredata/src/s_midi_oss.c11
-rw-r--r--desiredata/src/s_midi_sgi.c1
7 files changed, 5 insertions, 12 deletions
diff --git a/desiredata/src/s_audio_mmio.c b/desiredata/src/s_audio_mmio.c
index c1d70442..eef24cfa 100644
--- a/desiredata/src/s_audio_mmio.c
+++ b/desiredata/src/s_audio_mmio.c
@@ -6,7 +6,6 @@
"wave" devices, which is how ADAT boards appear to the WAVE API. */
#include "desire.h"
-#include "s_stuff.h"
#include <stdio.h>
#include <windows.h>
#include <mmsystem.h>
diff --git a/desiredata/src/s_audio_pa.c b/desiredata/src/s_audio_pa.c
index 3649e568..480f4f4d 100644
--- a/desiredata/src/s_audio_pa.c
+++ b/desiredata/src/s_audio_pa.c
@@ -8,7 +8,6 @@
/* tb: requires portaudio >= V19 */
#include "m_pd.h"
-#include "s_stuff.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/desiredata/src/s_midi_alsa.c b/desiredata/src/s_midi_alsa.c
index 559b4a1b..02ae4555 100644
--- a/desiredata/src/s_midi_alsa.c
+++ b/desiredata/src/s_midi_alsa.c
@@ -16,7 +16,6 @@
#include <errno.h>
#include <alsa/asoundlib.h>
#include "desire.h"
-//#include "s_stuff.h"
#define MAX_EVENT_SIZE 256
diff --git a/desiredata/src/s_midi_mmio.c b/desiredata/src/s_midi_mmio.c
index 6d11128a..11c4e37b 100644
--- a/desiredata/src/s_midi_mmio.c
+++ b/desiredata/src/s_midi_mmio.c
@@ -3,7 +3,6 @@
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
#include "desire.h"
-#include "s_stuff.h"
#include <stdio.h>
#include <windows.h>
#include <mmsystem.h>
diff --git a/desiredata/src/s_midi_none.c b/desiredata/src/s_midi_none.c
index 9d83545e..fb96aa23 100644
--- a/desiredata/src/s_midi_none.c
+++ b/desiredata/src/s_midi_none.c
@@ -1,7 +1,6 @@
/* This is for compiling pd without any midi support. by matju, 2006.11.21 */
#include "m_pd.h"
-#include "s_stuff.h"
void sys_do_open_midi(int nmidiin, int *midiinvec, int nmidiout, int *midioutvec) {}
void sys_close_midi(void) {}
diff --git a/desiredata/src/s_midi_oss.c b/desiredata/src/s_midi_oss.c
index 4eef3e7e..c42b58ef 100644
--- a/desiredata/src/s_midi_oss.c
+++ b/desiredata/src/s_midi_oss.c
@@ -15,7 +15,6 @@
#include <fcntl.h>
#include <errno.h>
#include "desire.h"
-#include "s_stuff.h"
static int oss_nmidiin; static int oss_midiinfd [MAXMIDIINDEV];
static int oss_nmidiout; static int oss_midioutfd[MAXMIDIOUTDEV];
@@ -119,10 +118,10 @@ void sys_poll_midi() {
for (int i=0; i<oss_nmidiin; i++) {
char c;
int ret = read(oss_midiinfd[i], &c, 1);
- if (ret < 0) {
+ if (ret<0) {
if (errno != EAGAIN) perror("MIDI");
} else if (ret != 0) {
- sys_midibytein(i, (c & 0xff));
+ sys_midibytein(i, c&0xff);
did = 1;
}
}
@@ -146,9 +145,9 @@ void midi_oss_init() {
int fd;
char namebuf[80];
oss_nmidiindevs = i;
- if (i == 0) {fd = open("/dev/midi", O_RDONLY | O_NDELAY); if (fd>=0) {close(fd); continue;}}
- sprintf(namebuf, "/dev/midi%2.2d", i); fd = open(namebuf, O_RDONLY | O_NDELAY); if (fd>=0) {close(fd); continue;}
- sprintf(namebuf, "/dev/midi%d", i); fd = open(namebuf, O_RDONLY | O_NDELAY); if (fd>=0) {close(fd); continue;}
+ if (i == 0) {fd = open("/dev/midi", O_RDONLY|O_NDELAY); if (fd>=0) {close(fd); continue;}}
+ sprintf(namebuf, "/dev/midi%2.2d", i); fd = open(namebuf, O_RDONLY|O_NDELAY); if (fd>=0) {close(fd); continue;}
+ sprintf(namebuf, "/dev/midi%d", i); fd = open(namebuf, O_RDONLY|O_NDELAY); if (fd>=0) {close(fd); continue;}
break;
}
for (int i=0; i<NSEARCH; i++) {
diff --git a/desiredata/src/s_midi_sgi.c b/desiredata/src/s_midi_sgi.c
index 8a0895ba..2554e70b 100644
--- a/desiredata/src/s_midi_sgi.c
+++ b/desiredata/src/s_midi_sgi.c
@@ -3,7 +3,6 @@
* WARRANTIES, see the file, "LICENSE.txt," in this distribution. */
#include "m_pd.h"
-#include "s_stuff.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>