Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29652
Modified Files: Tag: devel_0_39 s_stuff.h Log Message: able to compile without audio support (DesireData)
Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.10.2.7 retrieving revision 1.5.4.10.2.8 diff -C2 -d -r1.5.4.10.2.7 -r1.5.4.10.2.8 *** s_stuff.h 21 Apr 2006 14:03:20 -0000 1.5.4.10.2.7 --- s_stuff.h 25 Nov 2006 08:06:19 -0000 1.5.4.10.2.8 *************** *** 191,194 **** --- 191,197 ---- #endif
+ #ifdef DESIRE + #define API_NONE 0 + #endif #define API_ALSA 1 #define API_OSS 2 *************** *** 199,202 **** --- 202,229 ---- #define API_ASIO 7
+ #ifdef DESIRE + + #if defined(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" + #elif 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 + #define API_DEFAULT 0 + #define API_DEFSTRING "none" + #endif + + #else /* regular devel_0_39 */ + #ifdef __linux__ #if defined(USEAPI_OSS) *************** *** 231,234 **** --- 258,263 ---- #define API_DEFSTRING "portaudio" #else + #define API_DEFAULT 0 + #define API_DEFSTRING "none" #error You must define USEAPI_PORTAUDIO. #endif *************** *** 239,242 **** --- 268,274 ---- #define API_DEFSTRING "SGI Digital Media" #endif + + #endif /* DESIRE */ + #define DEFAULTAUDIODEV 0