[PD-cvs] pd/src s_stuff.h,1.5.4.10.2.8.2.4,1.5.4.10.2.8.2.5

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	s_stuff.h 
Log Message:
removed #ifdef DESIRE


Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.5.4.10.2.8.2.4
retrieving revision 1.5.4.10.2.8.2.5
diff -C2 -d -r1.5.4.10.2.8.2.4 -r1.5.4.10.2.8.2.5
*** s_stuff.h	8 Dec 2006 04:32:04 -0000	1.5.4.10.2.8.2.4
--- s_stuff.h	8 Dec 2006 04:37:26 -0000	1.5.4.10.2.8.2.5
***************
*** 213,219 ****
  #endif
  
- #ifdef DESIRE
  #define API_NONE 0
- #endif
  #define API_ALSA 1
  #define API_OSS 2
--- 213,217 ----
***************
*** 224,229 ****
  #define API_ASIO 7
  
- #ifdef DESIRE
- 
  #if defined(USEAPI_OSS)
  #define API_DEFAULT API_OSS
--- 222,225 ----
***************
*** 246,303 ****
  #endif
  
- #else /* regular devel_0_39 */
- 
- #ifdef __linux__
- #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"
- #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
- #define API_DEFAULT 0
- #define API_DEFSTRING "none"
- #error You must define USEAPI_PORTAUDIO.
- #endif
- #endif
- 
- #ifdef IRIX
- #define API_DEFAULT API_SGI
- #define API_DEFSTRING "SGI Digital Media"
- #endif
- 
- #endif /* DESIRE */
- 
  #define DEFAULTAUDIODEV 0
- 
  #define MAXAUDIOINDEV 4
  #define MAXAUDIOOUTDEV 4
- 
  #define DEFMIDIDEV 0
- 
  #define DEFAULTSRATE 44100
  #ifdef MSW
--- 242,249 ----
***************
*** 308,319 ****
  
  int pa_open_audio(int inchans, int outchans, int rate, int advance, 
! 				  int indeviceno, int outdeviceno, int schedmode);
  void pa_close_audio(void);
  int pa_send_dacs(void);
  void sys_reportidle(void);
  void pa_listdevs(void);
! void pa_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!         int maxndev, int devdescsize);
  
  /* tb { */
--- 254,264 ----
  
  int pa_open_audio(int inchans, int outchans, int rate, int advance, 
! 	int indeviceno, int outdeviceno, int schedmode);
  void pa_close_audio(void);
  int pa_send_dacs(void);
  void sys_reportidle(void);
  void pa_listdevs(void);
! void pa_getdevs(char *indevlist, int *nindevs, char *outdevlist,
! 	int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  
  /* tb { */
***************
*** 324,331 ****
  /* } tb */
  
- 
- 
- 
- 
  int oss_open_audio(int naudioindev, int *audioindev, int nchindev,
      int *chindev, int naudiooutdev, int *audiooutdev, int nchoutdev,
--- 269,272 ----
***************
*** 367,377 ****
          int maxndev, int devdescsize);
  
! void asio_open_audio(int naudioindev, int *audioindev, int nchindev, 
! 					 int *chindev, int naudiooutdev, int *audiooutdev,
! 					 int nchoutdev, int *choutdev, int srate, int scheduler);
  void asio_close_audio(void);
! void asio_getdevs(char *indevlist, int *nindevs,
! 				  char *outdevlist, int *noutdevs, int *canmulti, 
! 				  int maxndev, int devdescsize);
  int asio_send_dacs(void);
  
--- 308,317 ----
          int maxndev, int devdescsize);
  
! void asio_open_audio(int naudioindev, int *audioindev, int nchindev,
! 	 int *chindev, int naudiooutdev, int *audiooutdev,
! 	 int nchoutdev, int *choutdev, int srate, int scheduler);
  void asio_close_audio(void);
! void asio_getdevs(char *indevlist, int *nindevs, char *outdevlist,
! 	int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  int asio_send_dacs(void);
  
***************
*** 411,445 ****
  EXTERN int sys_externalschedlib;
  
! EXTERN t_sample* get_sys_soundout(void ) ;
! EXTERN t_sample* get_sys_soundin(void ) ;
! EXTERN int* get_sys_main_advance(void ) ;
! EXTERN double* get_sys_time_per_dsp_tick(void ) ;
! EXTERN int* get_sys_schedblocksize(void ) ;
! EXTERN double* get_sys_time(void ) ;
! EXTERN float* get_sys_dacsr(void ) ;
! EXTERN int* get_sys_sleepgrain(void ) ;
! EXTERN int* get_sys_schedadvance(void ) ;
  
! EXTERN void sys_clearhist(void );
! EXTERN void sys_initmidiqueue(void );
  EXTERN int sys_addhist(int phase);
  EXTERN void sys_setmiditimediff(double inbuftime, double outbuftime);
  EXTERN void sched_tick(double next_sys_time);
! EXTERN void sys_pollmidiqueue(void );
! EXTERN int sys_pollgui(void );
  EXTERN void sys_setchsr(int chin, int chout, int sr, int dacblocksize);
  
  EXTERN void inmidi_noteon(int portno, int channel, int pitch, int velo);
! EXTERN void inmidi_controlchange(int portno,
!                                  int channel,
!                                  int ctlnumber,
!                                  int value);
  EXTERN void inmidi_programchange(int portno, int channel, int value);
  EXTERN void inmidi_pitchbend(int portno, int channel, int value);
  EXTERN void inmidi_aftertouch(int portno, int channel, int value);
! EXTERN void inmidi_polyaftertouch(int portno,
!                                   int channel,
!                                   int pitch,
!                                   int value);
  /* } jsarlo */
  
--- 351,379 ----
  EXTERN int sys_externalschedlib;
  
! EXTERN t_sample* get_sys_soundout(void);
! EXTERN t_sample* get_sys_soundin(void);
! EXTERN int* get_sys_main_advance(void);
! EXTERN double* get_sys_time_per_dsp_tick(void);
! EXTERN int* get_sys_schedblocksize(void);
! EXTERN double* get_sys_time(void);
! EXTERN float* get_sys_dacsr(void);
! EXTERN int* get_sys_sleepgrain(void);
! EXTERN int* get_sys_schedadvance(void);
  
! EXTERN void sys_clearhist(void);
! EXTERN void sys_initmidiqueue(void);
  EXTERN int sys_addhist(int phase);
  EXTERN void sys_setmiditimediff(double inbuftime, double outbuftime);
  EXTERN void sched_tick(double next_sys_time);
! EXTERN void sys_pollmidiqueue(void);
! EXTERN int sys_pollgui(void);
  EXTERN void sys_setchsr(int chin, int chout, int sr, int dacblocksize);
  
  EXTERN void inmidi_noteon(int portno, int channel, int pitch, int velo);
! EXTERN void inmidi_controlchange(int portno, int channel, int ctlnumber, int value);
  EXTERN void inmidi_programchange(int portno, int channel, int value);
  EXTERN void inmidi_pitchbend(int portno, int channel, int value);
  EXTERN void inmidi_aftertouch(int portno, int channel, int value);
! EXTERN void inmidi_polyaftertouch(int portno, int channel, int pitch, int value);
  /* } jsarlo */