Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28874
Modified Files: Tag: desiredata s_midi.c s_midi_alsa.c Log Message: switch audio and midi to C++
Index: s_midi.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi.c,v retrieving revision 1.4.4.1.2.12.2.8 retrieving revision 1.4.4.1.2.12.2.9 diff -C2 -d -r1.4.4.1.2.12.2.8 -r1.4.4.1.2.12.2.9 *** s_midi.c 28 Jun 2007 16:50:36 -0000 1.4.4.1.2.12.2.8 --- s_midi.c 9 Jul 2007 18:01:30 -0000 1.4.4.1.2.12.2.9 *************** *** 5,8 **** --- 5,9 ---- /* Clock functions (which should move, but where?) and MIDI queueing */
+ #define PD_PLUSPLUS_FACE #include "desire.h" #include "s_stuff.h" *************** *** 475,480 **** void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
! void glob_midi_setapi(void *dummy, t_floatarg f) { ! int newapi = f; if (newapi) { if (newapi == sys_midiapi) { --- 476,481 ---- void glob_midi_properties(t_pd *dummy, t_floatarg flongform);
! void glob_midi_setapi(t_pd *dummy, t_floatarg f) { ! int newapi = int(f); if (newapi) { if (newapi == sys_midiapi) {
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.1 retrieving revision 1.1.2.2.2.6.2.2 diff -C2 -d -r1.1.2.2.2.6.2.1 -r1.1.2.2.2.6.2.2 *** s_midi_alsa.c 20 Dec 2006 10:34:39 -0000 1.1.2.2.2.6.2.1 --- s_midi_alsa.c 9 Jul 2007 18:01:30 -0000 1.1.2.2.2.6.2.2 *************** *** 203,207 **** { // repack into 1 byte char and put somewhere to point at ! unsigned char *dataptr = malloc(1); memcpy(dataptr,&byte,1);
--- 203,207 ---- { // repack into 1 byte char and put somewhere to point at ! unsigned char *dataptr = (unsigned char *)malloc(1); memcpy(dataptr,&byte,1);