Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9069/src

Modified Files: Tag: devel_0_39 s_audio.c s_main.c s_stuff.h Log Message: add some more freedom to choice of audio interfaces (e.g. MMIO need not be used for Windows necessarily)

Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.16.2.12 retrieving revision 1.5.4.16.2.13 diff -C2 -d -r1.5.4.16.2.12 -r1.5.4.16.2.13 *** s_audio.c 12 Apr 2006 17:36:10 -0000 1.5.4.16.2.12 --- s_audio.c 12 Apr 2006 21:05:10 -0000 1.5.4.16.2.13 *************** *** 945,965 **** sprintf(buf + strlen(buf), "{ALSA %d} ", API_ALSA); n++; #endif #ifdef USEAPI_PORTAUDIO ! #ifdef MSW ! sprintf(buf + strlen(buf), ! "{"ASIO (via portaudio)" %d} ", API_PORTAUDIO); ! #else ! #ifdef OSX sprintf(buf + strlen(buf), ! "{"standard (portaudio)" %d} ", API_PORTAUDIO); #else ! sprintf(buf + strlen(buf), "{portaudio %d} ", API_PORTAUDIO); #endif #ifdef USEAPI_SGI sprintf(buf + strlen(buf), "{SGI %d} ", API_SGI); n++; #endif - #endif - n++; - #endif #ifdef USEAPI_JACK sprintf(buf + strlen(buf), "{jack %d} ", API_JACK); n++; --- 945,961 ---- sprintf(buf + strlen(buf), "{ALSA %d} ", API_ALSA); n++; #endif + #ifdef USEAPI_PORTAUDIO ! #ifdef __APPLE__ sprintf(buf + strlen(buf), ! "{"standard (portaudio)" %d} ", API_PORTAUDIO); n++; #else ! sprintf(buf + strlen(buf), "{portaudio %d} ", API_PORTAUDIO); n++; ! #endif #endif + #ifdef USEAPI_SGI sprintf(buf + strlen(buf), "{SGI %d} ", API_SGI); n++; #endif #ifdef USEAPI_JACK sprintf(buf + strlen(buf), "{jack %d} ", API_JACK); n++;

Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.11 retrieving revision 1.7.4.17.2.12 diff -C2 -d -r1.7.4.17.2.11 -r1.7.4.17.2.12 *** s_main.c 9 Mar 2006 14:22:51 -0000 1.7.4.17.2.11 --- s_main.c 12 Apr 2006 21:05:10 -0000 1.7.4.17.2.12 *************** *** 400,413 ****

#ifdef USEAPI_PORTAUDIO - #ifdef MSW - "-asio -- use ASIO audio driver (via Portaudio)\n", - "-pa -- synonym for -asio\n", - #else "-pa -- use Portaudio API\n", #endif #endif

#ifdef USEAPI_MMIO ! "-mmio -- use MMIO audio API (default for Windows)\n", #endif " (default audio API for this platform: ", API_DEFSTRING, ")\n\n", --- 400,411 ----

#ifdef USEAPI_PORTAUDIO "-pa -- use Portaudio API\n", + #ifdef MSW + "-asio -- synonym for -pa - use ASIO via Portaudio\n", #endif #endif

#ifdef USEAPI_MMIO ! "-mmio -- use MMIO audio API\n", #endif " (default audio API for this platform: ", API_DEFSTRING, ")\n\n",

Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.10.2.4 retrieving revision 1.5.4.10.2.5 diff -C2 -d -r1.5.4.10.2.4 -r1.5.4.10.2.5 *** s_stuff.h 7 Apr 2006 21:02:42 -0000 1.5.4.10.2.4 --- s_stuff.h 12 Apr 2006 21:05:10 -0000 1.5.4.10.2.5 *************** *** 200,214 ****

#ifdef __linux__ #define API_DEFAULT API_OSS ! #define API_DEFSTRING "OSS" #endif #ifdef MSW #define API_DEFAULT API_MMIO ! #define API_DEFSTRING "MMIO" #endif #ifdef __APPLE__ #define API_DEFAULT API_PORTAUDIO #define API_DEFSTRING "portaudio" #endif #ifdef IRIX #define API_DEFAULT API_SGI --- 200,238 ----

#ifdef __linux__ + #if define(USEAPI_OSS) #define API_DEFAULT API_OSS ! #define API_DEFSTRING "oss" ! #elif defined(USEAPI_ALSA) ! #define API_DEFAULT API_ALSA ! #define API_DEFSTRING "alsa" ! #elif defined(USEAPI_JACK) ! #define API_DEFAULT API_JACK ! #define API_DEFSTRING "jack" ! #else ! #error You must define at least one of USEAPI_OSS, USEAPI_ALSA and USEAPI_JACK. #endif + #endif + #ifdef MSW + #if defined(USEAPI_MMIO) #define API_DEFAULT API_MMIO ! #define API_DEFSTRING "mmio" ! #elif defined(USEAPI_PORTAUDIO) ! #define API_DEFAULT API_PORTAUDIO ! #define API_DEFSTRING "portaudio" ! #else ! #error You must define at least one of USEAPI_MMIO and USEAPI_PORTAUDIO. #endif + #endif + #ifdef __APPLE__ + #if defined(USEAPI_PORTAUDIO) #define API_DEFAULT API_PORTAUDIO #define API_DEFSTRING "portaudio" + #else + #error You must define USEAPI_PORTAUDIO. + #endif #endif + #ifdef IRIX #define API_DEFAULT API_SGI