Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9515
Modified Files: Tag: desiredata s_audio.c Log Message: 0.40
Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.20.2.1 retrieving revision 1.5.4.16.2.20.2.2 diff -C2 -d -r1.5.4.16.2.20.2.1 -r1.5.4.16.2.20.2.2 *** s_audio.c 8 Dec 2006 08:28:18 -0000 1.5.4.16.2.20.2.1 --- s_audio.c 19 Dec 2006 17:52:38 -0000 1.5.4.16.2.20.2.2 *************** *** 679,688 **** }
- #ifdef MSW - #define DEVONSET 0 /* microsoft device list starts at 0 (the "mapper"). */ - #else /* (see also MSW ifdef in sys_parsedevlist(), s_main.c) */ - #define DEVONSET 1 /* To agree with command line flags, normally start at 1 */ - #endif - static void sys_listaudiodevs(void ) { --- 679,682 ---- *************** *** 693,703 **** MAXNDEV, DEVDESCSIZE);
if (!nindevs) post("no audio input devices found"); else { ! post("input devices:"); for (i = 0; i < nindevs; i++) ! post("%d. %s", i+1, indevlist + i * DEVDESCSIZE); } if (!noutdevs) --- 687,700 ---- MAXNDEV, DEVDESCSIZE);
+ /* To agree with command line flags, normally start at 1 */ + /* But microsoft "MMIO" device list starts at 0 (the "mapper"). */ + /* (see also sys_mmio variable in s_main.c) */ if (!nindevs) post("no audio input devices found"); else { ! post("audio input devices:"); for (i = 0; i < nindevs; i++) ! post("%d. %s", i + (sys_audioapi != API_MMIO), indevlist + i * DEVDESCSIZE); } if (!noutdevs) *************** *** 705,711 **** else { ! post("output devices:"); for (i = 0; i < noutdevs; i++) ! post("%d. %s", i + DEVONSET, outdevlist + i * DEVDESCSIZE); } post("API number %d\n", sys_audioapi); --- 702,708 ---- else { ! post("audio output devices:"); for (i = 0; i < noutdevs; i++) ! post("%d. %s", i + (sys_audioapi != API_MMIO), outdevlist + i * DEVDESCSIZE); } post("API number %d\n", sys_audioapi);