checking in version 0.38test5.

Oops, I realize I forgot some more nice files, will add them and re-commit.

svn path=/trunk/; revision=2010

1 files changed, 92 insertions, 77 deletions

diff --git a/pd/src/s_midi_sgi.c b/pd/src/s_midi_sgi.c
index 7e58dbe3..4634b571 100644
--- a/pd/src/s_midi_sgi.c
+++ b/pd/src/s_midi_sgi.c
@@ -2,6 +2,7 @@
 * For information on usage and redistribution, and for a DISCLAIMER OF ALL
 * WARRANTIES, see the file, "LICENSE.txt," in this distribution.  */
 
+#include "m_pd.h"
 #include "s_stuff.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,7 +17,7 @@
 #include <dmedia/audio.h>
 #include <sys/fpu.h>
 #include <dmedia/midi.h>
-int mdInit(void);   	    	/* prototype was messed up in midi.h */
+int mdInit(void);               /* prototype was messed up in midi.h */
 /* #include "sys/select.h" */
 
 
@@ -51,33 +52,33 @@ void sgi_open_midi(int midiin, int midiout)
     else if (sgi_nports > NPORT) sgi_nports = NPORT;
     if (sys_verbose)
     {
-	if (!sgi_nports) 
-	{
-	    post("no serial ports are configured for MIDI;");
-	    post("if you want to use MIDI, try exiting Pd, typing");
-	    post("'startmidi -d /dev/ttyd2' to a shell, and restarting Pd.");
-	}
-	else if (sgi_nports == 1)
-	    post("Found one MIDI port on %s", mdGetName(0));
-	else if (sgi_nports == 2)
-	    post("Found MIDI ports on %s and %s",
-    	    	mdGetName(0), mdGetName(1));
+        if (!sgi_nports) 
+        {
+            post("no serial ports are configured for MIDI;");
+            post("if you want to use MIDI, try exiting Pd, typing");
+            post("'startmidi -d /dev/ttyd2' to a shell, and restarting Pd.");
+        }
+        else if (sgi_nports == 1)
+            post("Found one MIDI port on %s", mdGetName(0));
+        else if (sgi_nports == 2)
+            post("Found MIDI ports on %s and %s",
+                mdGetName(0), mdGetName(1));
     }
     if (midiin)
     {
-    	for (i = 0; i < sgi_nports; i++)
-    	{
-    	    if (!(sgi_inport[i] = mdOpenInPort(mdGetName(i)))) 
-    	    	error("MIDI input port %d: open failed", i+1);;
-    	}
+        for (i = 0; i < sgi_nports; i++)
+        {
+            if (!(sgi_inport[i] = mdOpenInPort(mdGetName(i)))) 
+                error("MIDI input port %d: open failed", i+1);;
+        }
     }
     if (midiout)
     {
-    	for (i = 0; i < sgi_nports; i++)
-    	{
-    	    if (!(sgi_outport[i] = mdOpenOutPort(mdGetName(i))))
-    	    	error("MIDI output port %d: open failed", i+1);;
-    	}
+        for (i = 0; i < sgi_nports; i++)
+        {
+            if (!(sgi_outport[i] = mdOpenOutPort(mdGetName(i))))
+                error("MIDI output port %d: open failed", i+1);;
+        }
     }
     return;
 }
@@ -94,7 +95,7 @@ void sys_putmidimess(int portno, int a, int b, int c)
     mdv.stamp = 0;
     mdv.msglen = 0;
     if (mdSend(sgi_outport[portno], &mdv, 1) < 0)
-    	error("MIDI output error\n");
+        error("MIDI output error\n");
     post("msg out %d %d %d", a, b, c);
 }
 
@@ -116,60 +117,60 @@ void sys_poll_midi(void)
     MDport *mp;
     for (i = 0, mp = sgi_inport; i < NPORT; i++, mp++)
     {
-	int ret,  status,  b1,  b2, nfds;
-	MDevent mdv;
-	fd_set inports;
-	struct timeval timeout;
-	timeout.tv_sec = 0;
-	timeout.tv_usec = 0;
-    	if (!*mp) continue;
-	FD_ZERO(&inports);
-	FD_SET(mdGetFd(*mp), &inports);
-
-	if (select(mdGetFd(*mp)+1 , &inports, 0, 0, &timeout) < 0)
-	    perror("midi select");
-	if (FD_ISSET(mdGetFd(*mp),&inports))
-	{
-    	    if (mdReceive(*mp, &mdv, 1) < 0)
-		error("failure receiving message\n");
-	    else if (mdv.msg[0] == MD_SYSEX) mdFree(mdv.sysexmsg);
-
-	    else
-	    {
-	    	int status = mdv.msg[0];
-	    	int channel = (status & 0xf) + 1;
-	    	int b1 = mdv.msg[1];
-	    	int b2 = mdv.msg[2];
-		switch(status & 0xf0)
-		{
-		case MD_NOTEOFF:
-		    inmidi_noteon(i, channel, b1, 0);
-		    break;
-		case MD_NOTEON:
-		    inmidi_noteon(i, channel, b1, b2);
-		    break;
-		case MD_POLYKEYPRESSURE:
-		    inmidi_polyaftertouch(i, channel, b1, b2);
-		    break;
-		case MD_CONTROLCHANGE:
-		    inmidi_controlchange(i, channel, b1, b2);
-		    break;
-		case MD_PITCHBENDCHANGE:
-		    inmidi_pitchbend(i, channel, ((b2 << 7) + b1));
-		    break;
-		case MD_PROGRAMCHANGE:
-		    inmidi_programchange(i, channel, b1);
-		    break;
-		case MD_CHANNELPRESSURE:
-		    inmidi_aftertouch(i, channel, b1);
-		    break;
-		}
-	    }
-	}
+        int ret,  status,  b1,  b2, nfds;
+        MDevent mdv;
+        fd_set inports;
+        struct timeval timeout;
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 0;
+        if (!*mp) continue;
+        FD_ZERO(&inports);
+        FD_SET(mdGetFd(*mp), &inports);
+
+        if (select(mdGetFd(*mp)+1 , &inports, 0, 0, &timeout) < 0)
+            perror("midi select");
+        if (FD_ISSET(mdGetFd(*mp),&inports))
+        {
+            if (mdReceive(*mp, &mdv, 1) < 0)
+                error("failure receiving message\n");
+            else if (mdv.msg[0] == MD_SYSEX) mdFree(mdv.sysexmsg);
+
+            else
+            {
+                int status = mdv.msg[0];
+                int channel = (status & 0xf) + 1;
+                int b1 = mdv.msg[1];
+                int b2 = mdv.msg[2];
+                switch(status & 0xf0)
+                {
+                case MD_NOTEOFF:
+                    inmidi_noteon(i, channel, b1, 0);
+                    break;
+                case MD_NOTEON:
+                    inmidi_noteon(i, channel, b1, b2);
+                    break;
+                case MD_POLYKEYPRESSURE:
+                    inmidi_polyaftertouch(i, channel, b1, b2);
+                    break;
+                case MD_CONTROLCHANGE:
+                    inmidi_controlchange(i, channel, b1, b2);
+                    break;
+                case MD_PITCHBENDCHANGE:
+                    inmidi_pitchbend(i, channel, ((b2 << 7) + b1));
+                    break;
+                case MD_PROGRAMCHANGE:
+                    inmidi_programchange(i, channel, b1);
+                    break;
+                case MD_CHANNELPRESSURE:
+                    inmidi_aftertouch(i, channel, b1);
+                    break;
+                }
+            }
+        }
     }
 }
 
-void sys_open_midi(int nmidiin, int *midiinvec,
+void sys_do_open_midi(int nmidiin, int *midiinvec,
     int nmidiout, int *midioutvec)
 {
     sgi_open_midi(nmidiin!=0, nmidiout!=0);
@@ -181,8 +182,22 @@ void sys_close_midi( void)
     /* ??? */
 }
 
-void sys_set_priority(int foo)
+
+void midi_getdevs(char *indevlist, int *nindevs,
+    char *outdevlist, int *noutdevs, int maxndev, int devdescsize)
 {
-    fprintf(stderr,
-    	"warning: priority boosting in IRIX not implemented yet\n");
+    int i, nindev = 0, noutdev = 0;
+    for (i = 0; i < mdInit(); i++)
+    {
+                if (nindev < maxndev)
+                {
+                    strcpy(indevlist + nindev * devdescsize, mdGetName(i));
+                    nindev++;
+
+                    strcpy(outdevlist + noutdev * devdescsize, mdGetName(i));
+                    noutdev++;
+                }
+    }
+    *nindevs = nindev;
+    *noutdevs = noutdev;
 }