Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26721
Modified Files: Tag: desiredata s_audio.c Log Message: first use of a C++ standard library component, std::stdostream
Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.14 retrieving revision 1.5.4.16.2.20.2.15 diff -C2 -d -r1.5.4.16.2.20.2.14 -r1.5.4.16.2.20.2.15 *** s_audio.c 9 Jul 2007 20:17:39 -0000 1.5.4.16.2.20.2.14 --- s_audio.c 9 Jul 2007 21:07:37 -0000 1.5.4.16.2.20.2.15 *************** *** 20,23 **** --- 20,24 ---- #include <string.h> #include <errno.h> + #include <sstream>
#define SYS_DEFAULTCH 2 *************** *** 444,448 **** }
- /* start an audio settings dialog window */ void glob_audio_properties(t_pd *dummy, t_floatarg flongform) { --- 445,448 ---- *************** *** 457,472 **** /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; ! int nindevs = 0, noutdevs = 0, canmulti = 0, i; ! char indevliststring[MAXNDEV*(DEVDESCSIZE+4)+80], ! outdevliststring[MAXNDEV*(DEVDESCSIZE+4)+80]; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! strcpy(indevliststring, "{"); ! for (i = 0; i < nindevs; i++) ! sprintf(indevliststring+strlen(indevliststring), ""%s" ", indevlist + i * DEVDESCSIZE); ! strcat(indevliststring, "}"); ! strcpy(outdevliststring, "{"); ! for (i = 0; i < noutdevs; i++) ! sprintf(outdevliststring+strlen(outdevliststring), ""%s" ", outdevlist + i * DEVDESCSIZE); ! strcat(outdevliststring, "}"); sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); --- 457,470 ---- /* these are all the devices on your system: */ char indevlist[MAXNDEV*DEVDESCSIZE], outdevlist[MAXNDEV*DEVDESCSIZE]; ! int nindevs = 0, noutdevs = 0, canmulti = 0; ! std::ostringstream indevliststring; ! std::ostringstream outdevliststring; audio_getdevs(indevlist, &nindevs, outdevlist, &noutdevs, &canmulti, MAXNDEV, DEVDESCSIZE); ! indevliststring << "{"; ! for (int i=0; i<nindevs; i++) indevliststring << "{" << (indevlist + i*DEVDESCSIZE) << "} "; ! indevliststring << "}"; ! outdevliststring << "{"; ! for (int i=0; i<noutdevs; i++) outdevliststring << "{" << (outdevlist + i*DEVDESCSIZE) << "} "; ! outdevliststring << "}"; sys_get_audio_params(&naudioindev, audioindev, chindev, &naudiooutdev, audiooutdev, choutdev, &rate, &dacblocksize, &advance, &scheduler); *************** *** 491,496 **** audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring, audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring, audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, rate, dacblocksize, advance, canmulti, flongform!=0); } --- 489,494 ---- audiooutchan4 = (naudiooutdev > 3 ? choutdev[3] : 0); sys_vgui("pdtk_audio_dialog %s {%d %d %d %d} {%d %d %d %d} %s {%d %d %d %d} {%d %d %d %d} %d %d %d %d %d\n", ! indevliststring.str().data(), audioindev1, audioindev2, audioindev3, audioindev4, audioinchan1, audioinchan2, audioinchan3, audioinchan4, ! outdevliststring.str().data(), audiooutdev1, audiooutdev2, audiooutdev3, audiooutdev4, audiooutchan1, audiooutchan2, audiooutchan3, audiooutchan4, rate, dacblocksize, advance, canmulti, flongform!=0); }