[PD-cvs] pd/src s_stuff.h,1.5.4.10.2.8.2.7,1.5.4.10.2.8.2.8

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	s_stuff.h 
Log Message:
cleanup


Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.5.4.10.2.8.2.7
retrieving revision 1.5.4.10.2.8.2.8
diff -C2 -d -r1.5.4.10.2.8.2.7 -r1.5.4.10.2.8.2.8
*** s_stuff.h	3 Jan 2007 07:31:58 -0000	1.5.4.10.2.8.2.7
--- s_stuff.h	28 Jun 2007 06:22:08 -0000	1.5.4.10.2.8.2.8
***************
*** 67,71 ****
  
  #define SENDDACS_NO 0           /* return values for sys_send_dacs() */
! #define SENDDACS_YES 1 
  #define SENDDACS_SLEPT 2
  
--- 67,71 ----
  
  #define SENDDACS_NO 0           /* return values for sys_send_dacs() */
! #define SENDDACS_YES 1
  #define SENDDACS_SLEPT 2
  
***************
*** 84,92 ****
  extern int sys_sleepgrain;
  extern int sys_callbackscheduler;       /* tb: scheduler to use (0: traditional, 1: callback) */
! void sys_open_audio(int naudioindev, int *audioindev,
!     int nchindev, int *chindev,
!     int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev,
!     int srate, int dacblocksize, int advance, int schedmode, int enable);
! void sys_reopen_audio( void);
  void sys_close_audio(void);
  
--- 84,92 ----
  extern int sys_sleepgrain;
  extern int sys_callbackscheduler;       /* tb: scheduler to use (0: traditional, 1: callback) */
! void sys_open_audio(
! int  naudioindev, int * audioindev, int  nchindev, int * chindev,
! int naudiooutdev, int *audiooutdev, int nchoutdev, int *choutdev,
! int srate, int dacblocksize, int advance, int schedmode, int enable);
! void sys_reopen_audio(void);
  void sys_close_audio(void);
  
***************
*** 112,122 ****
  extern int sys_midioutdevlist[];
  
! void sys_open_midi(int nmidiin, int *midiinvec,
!     int nmidiout, int *midioutvec, int enable);
! void sys_get_midi_params(int *pnmidiindev, int *pmidiindev,
!     int *pnmidioutdev, int *pmidioutdev);
! 
  void sys_get_midi_apis(char *buf);
- 
  void sys_reopen_midi( void);
  void sys_close_midi( void);
--- 112,118 ----
  extern int sys_midioutdevlist[];
  
! void sys_open_midi(int nmidiin, int *midiinvec, int nmidiout, int *midioutvec, int enable);
! void sys_get_midi_params(int *pnmidiindev, int *pmidiindev, int *pnmidioutdev, int *pmidioutdev);
  void sys_get_midi_apis(char *buf);
  void sys_reopen_midi( void);
  void sys_close_midi( void);
***************
*** 127,135 ****
  EXTERN void sys_midibytein(int portno, int byte);
  
!     /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */
! void midi_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int maxndev, int devdescsize);
! void sys_do_open_midi(int nmidiindev, int *midiindev,
!     int nmidioutdev, int *midioutdev);
  
  #ifdef USEAPI_ALSA
--- 123,129 ----
  EXTERN void sys_midibytein(int portno, int byte);
  
! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */
! void midi_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize);
! void sys_do_open_midi(int nmidiindev, int *midiindev, int nmidioutdev, int *midioutdev);
  
  #ifdef USEAPI_ALSA
***************
*** 141,150 ****
  EXTERN void sys_alsa_close_midi( void);
  
! 
!     /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */
! void midi_alsa_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int maxndev, int devdescsize);
! void sys_alsa_do_open_midi(int nmidiindev, int *midiindev,
!     int nmidioutdev, int *midioutdev);
  #endif
  
--- 135,141 ----
  EXTERN void sys_alsa_close_midi( void);
  
! /* implemented in the system dependent MIDI code (s_midi_pm.c, etc. ) */
! void midi_alsa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int maxndev, int devdescsize);
! void sys_alsa_do_open_midi(int nmidiindev, int *midiindev, int nmidioutdev, int *midioutdev);
  #endif
  
***************
*** 165,171 ****
  /* tb } */
  
- 
  /* s_inter.c */
- 
  EXTERN void sys_microsleep(int microsec);
  EXTERN void sys_bail(int exitcode);
--- 156,160 ----
***************
*** 254,258 ****
  #endif
  
! int pa_open_audio(int inchans, int outchans, int rate, int advance, 
  	int indeviceno, int outdeviceno, int schedmode);
  void pa_close_audio(void);
--- 243,247 ----
  #endif
  
! int pa_open_audio(int inchans, int outchans, int rate, int advance,
  	int indeviceno, int outdeviceno, int schedmode);
  void pa_close_audio(void);
***************
*** 276,282 ****
  int oss_send_dacs(void);
  void oss_reportidle(void);
! void oss_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!         int maxndev, int devdescsize);
  
  int alsa_open_audio(int naudioindev, int *audioindev, int nchindev,
--- 265,269 ----
  int oss_send_dacs(void);
  void oss_reportidle(void);
! void oss_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  
  int alsa_open_audio(int naudioindev, int *audioindev, int nchindev,
***************
*** 286,292 ****
  int alsa_send_dacs(void);
  void alsa_reportidle(void);
! void alsa_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!         int maxndev, int devdescsize);
  
  int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler);
--- 273,277 ----
  int alsa_send_dacs(void);
  void alsa_reportidle(void);
! void alsa_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  
  int jack_open_audio(int wantinchans, int wantoutchans, int srate, int scheduler);
***************
*** 294,300 ****
  int jack_send_dacs(void);
  void jack_reportidle(void);
! void jack_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!         int maxndev, int devdescsize);
  void jack_listdevs(void);
  
--- 279,283 ----
  int jack_send_dacs(void);
  void jack_reportidle(void);
! void jack_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  void jack_listdevs(void);
  
***************
*** 305,311 ****
  void mmio_reportidle(void);
  int mmio_send_dacs(void);
! void mmio_getdevs(char *indevlist, int *nindevs,
!     char *outdevlist, int *noutdevs, int *canmulti, 
!         int maxndev, int devdescsize);
  
  void asio_open_audio(int naudioindev, int *audioindev, int nchindev,
--- 288,292 ----
  void mmio_reportidle(void);
  int mmio_send_dacs(void);
! void mmio_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize);
  
  void asio_open_audio(int naudioindev, int *audioindev, int nchindev,
***************
*** 313,318 ****
  	 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);
  
--- 294,298 ----
  	 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);