Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19863
Modified Files: Tag: desiredata s_midi_oss.c s_midi_sgi.c s_midi_mmio.c s_midi_alsa.c Log Message: remove blank lines in console
Index: s_midi_mmio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_mmio.c,v retrieving revision 1.4.12.1 retrieving revision 1.4.12.2 diff -C2 -d -r1.4.12.1 -r1.4.12.2 *** s_midi_mmio.c 2 Aug 2007 23:50:10 -0000 1.4.12.1 --- s_midi_mmio.c 3 Aug 2007 00:06:51 -0000 1.4.12.2 *************** *** 62,67 **** wRtn = midiOutGetDevCaps(i, (LPMIDIOUTCAPS) &mocap, sizeof(mocap)); if (result != MMSYSERR_NOERROR) { ! fprintf(stderr,"midiOutOpen: %s\n",midioutcaps.szPname); ! msw_midiouterror("midiOutOpen: %s\n", result); } else { if (sys_verbose) fprintf(stderr,"midiOutOpen: Open %s as Port %d\n", midioutcaps.szPname, dev); --- 62,67 ---- wRtn = midiOutGetDevCaps(i, (LPMIDIOUTCAPS) &mocap, sizeof(mocap)); if (result != MMSYSERR_NOERROR) { ! error("midiOutOpen: %s",midioutcaps.szPname); ! msw_midiouterror("midiOutOpen: %s", result); } else { if (sys_verbose) fprintf(stderr,"midiOutOpen: Open %s as Port %d\n", midioutcaps.szPname, dev); *************** *** 355,359 **** if (wRtn) { FreeCallbackInstanceData(lpCallbackInstanceData[ndev]); ! msw_midiinerror("midiInOpen: %s\n", wRtn); } else ndev++; } --- 355,359 ---- if (wRtn) { FreeCallbackInstanceData(lpCallbackInstanceData[ndev]); ! msw_midiinerror("midiInOpen: %s", wRtn); } else ndev++; } *************** *** 471,475 **** MIDIINCAPS micap; wRtn = midiInGetDevCaps(i, (LPMIDIINCAPS) &micap, sizeof(micap)); ! if (wRtn) msw_midiinerror("midiInGetDevCaps: %s\n", wRtn); else fprintf(stderr, "MIDI input device #%d: %s\n", i+1, micap.szPname); } --- 471,475 ---- MIDIINCAPS micap; wRtn = midiInGetDevCaps(i, (LPMIDIINCAPS) &micap, sizeof(micap)); ! if (wRtn) msw_midiinerror("midiInGetDevCaps: %s", wRtn); else fprintf(stderr, "MIDI input device #%d: %s\n", i+1, micap.szPname); } *************** *** 478,482 **** MIDIOUTCAPS mocap; wRtn = midiOutGetDevCaps(i, (LPMIDIOUTCAPS) &mocap, sizeof(mocap)); ! if (wRtn) msw_midiouterror("midiOutGetDevCaps: %s\n", wRtn); else fprintf(stderr, "MIDI output device #%d: %s\n", i+1, mocap.szPname); } --- 478,482 ---- MIDIOUTCAPS mocap; wRtn = midiOutGetDevCaps(i, (LPMIDIOUTCAPS) &mocap, sizeof(mocap)); ! if (wRtn) msw_midiouterror("midiOutGetDevCaps: %s", wRtn); else fprintf(stderr, "MIDI output device #%d: %s\n", i+1, mocap.szPname); }
Index: s_midi_oss.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_oss.c,v retrieving revision 1.3.8.2.2.1 retrieving revision 1.3.8.2.2.2 diff -C2 -d -r1.3.8.2.2.1 -r1.3.8.2.2.2 *** s_midi_oss.c 3 Aug 2007 00:01:07 -0000 1.3.8.2.2.1 --- s_midi_oss.c 3 Aug 2007 00:06:51 -0000 1.3.8.2.2.2 *************** *** 157,161 **** char c; int ret = read(oss_midiinfd[i], &c, 1); ! if (ret <= 0) fprintf(stderr, "Midi read error\n"); else sys_midibytein(i, (c & 0xff)); did = 1; --- 157,161 ---- char c; int ret = read(oss_midiinfd[i], &c, 1); ! if (ret <= 0) error("Midi read error"); else sys_midibytein(i, (c & 0xff)); did = 1;
Index: s_midi_sgi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_midi_sgi.c,v retrieving revision 1.2.12.1 retrieving revision 1.2.12.2 diff -C2 -d -r1.2.12.1 -r1.2.12.2 *** s_midi_sgi.c 2 Aug 2007 23:53:08 -0000 1.2.12.1 --- s_midi_sgi.c 3 Aug 2007 00:06:51 -0000 1.2.12.2 *************** *** 72,76 **** mdv.stamp = 0; mdv.msglen = 0; ! if (mdSend(sgi_outport[portno], &mdv, 1) < 0) error("MIDI output error\n"); post("msg out %d %d %d", a, b, c); } --- 72,76 ---- mdv.stamp = 0; mdv.msglen = 0; ! if (mdSend(sgi_outport[portno], &mdv, 1) < 0) error("MIDI output error"); post("msg out %d %d %d", a, b, c); } *************** *** 103,107 **** 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 { --- 103,107 ---- if (FD_ISSET(mdGetFd(*mp),&inports)) { if (mdReceive(*mp, &mdv, 1) < 0) ! error("failure receiving message"); else if (mdv.msg[0] == MD_SYSEX) mdFree(mdv.sysexmsg); else {
Index: s_midi_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_alsa.c,v retrieving revision 1.1.2.2.2.6.2.5 retrieving revision 1.1.2.2.2.6.2.6 diff -C2 -d -r1.1.2.2.2.6.2.5 -r1.1.2.2.2.6.2.6 *** s_midi_alsa.c 24 Jul 2007 21:17:14 -0000 1.1.2.2.2.6.2.5 --- s_midi_alsa.c 3 Aug 2007 00:06:51 -0000 1.1.2.2.2.6.2.6 *************** *** 180,184 **** alsa_source = midievent->dest.port; for(int i=0; i<count; i++) sys_midibytein(alsa_source, (buf[i] & 0xff)); ! //post("received %d midi bytes\n",count); } } --- 180,184 ---- alsa_source = midievent->dest.port; for(int i=0; i<count; i++) sys_midibytein(alsa_source, (buf[i] & 0xff)); ! //post("received %d midi bytes",count); } }