[PD-cvs] pd/src s_audio_jack.c, 1.5.4.8.2.7.2.4, 1.5.4.8.2.7.2.5 s_audio_mmio.c, 1.4.4.1, 1.4.4.1.4.1 s_audio_pa.c, 1.4.4.7.2.5.2.1, 1.4.4.7.2.5.2.2 s_audio_portaudio.c, 1.1.2.21.2.1, 1.1.2.21.2.2

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	s_audio_jack.c s_audio_mmio.c s_audio_pa.c s_audio_portaudio.c 
Log Message:
new audio api


Index: s_audio_mmio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_mmio.c,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.1.4.1
diff -C2 -d -r1.4.4.1 -r1.4.4.1.4.1
*** s_audio_mmio.c	10 Nov 2004 13:47:09 -0000	1.4.4.1
--- s_audio_mmio.c	30 Jun 2007 20:28:14 -0000	1.4.4.1.4.1
***************
*** 729,736 ****
  
  
- void mmio_reportidle(void)
- {
- }
- 
  #if 0
  /* list the audio and MIDI device names */
--- 729,732 ----
***************
*** 793,794 ****
--- 789,797 ----
      }
  }
+ 
+ struct t_audioapi api_mmio = {
+ 	mmio_open_audio,
+ 	mmio_close_audio,
+ 	mmio_send_dacs,
+ 	mmio_getdevs,
+ };

Index: s_audio_jack.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v
retrieving revision 1.5.4.8.2.7.2.4
retrieving revision 1.5.4.8.2.7.2.5
diff -C2 -d -r1.5.4.8.2.7.2.4 -r1.5.4.8.2.7.2.5
*** s_audio_jack.c	28 Jun 2007 09:08:36 -0000	1.5.4.8.2.7.2.4
--- s_audio_jack.c	30 Jun 2007 20:28:14 -0000	1.5.4.8.2.7.2.5
***************
*** 1,3 ****
- #ifdef USEAPI_JACK
  #include <stdio.h>
  #include <stdlib.h>
--- 1,2 ----
***************
*** 443,445 ****
  }
  
! #endif /* JACK */
--- 442,449 ----
  }
  
! struct t_audioapi jack_api = {
! 	0 /*jack_open_audio*/,
! 	jack_close_audio,
! 	jack_send_dacs,
! 	jack_getdevs,
! };

Index: s_audio_portaudio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v
retrieving revision 1.1.2.21.2.1
retrieving revision 1.1.2.21.2.2
diff -C2 -d -r1.1.2.21.2.1 -r1.1.2.21.2.2
*** s_audio_portaudio.c	20 Dec 2006 07:58:01 -0000	1.1.2.21.2.1
--- s_audio_portaudio.c	30 Jun 2007 20:28:14 -0000	1.1.2.21.2.2
***************
*** 75,78 ****
--- 75,79 ----
      PaStreamCallbackFlags statusFlags, void *userData);
  
+ #if 0
  static int patestCallback(const void*                     inputBuffer,
                            void*                           outputBuffer,
***************
*** 81,84 ****
--- 82,86 ----
                            PaStreamCallbackFlags           statusFlags,
                            void*                           userData);
+ #endif
  
  static int pa_indev = -1, pa_outdev = -1;
***************
*** 264,268 ****
  extern int sys_meters;          /* true if we're metering */
  
! 
  static int patestCallback(const void*                     inputBuffer,
                            void*                           outputBuffer,
--- 266,270 ----
  extern int sys_meters;          /* true if we're metering */
  
! #if 0
  static int patestCallback(const void*                     inputBuffer,
                            void*                           outputBuffer,
***************
*** 292,295 ****
--- 294,298 ----
      return 0;
  }
+ #endif
  
  void run_all_idle_callbacks(void);
***************
*** 636,637 ****
--- 639,647 ----
  
  }
+ 
+ t_audioapi pa_api = {
+     0 /* pa_open_audio */,
+     pa_close_audio,
+     pa_send_dacs,
+     pa_getdevs,
+ };

Index: s_audio_pa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v
retrieving revision 1.4.4.7.2.5.2.1
retrieving revision 1.4.4.7.2.5.2.2
diff -C2 -d -r1.4.4.7.2.5.2.1 -r1.4.4.7.2.5.2.2
*** s_audio_pa.c	8 Dec 2006 08:29:42 -0000	1.4.4.7.2.5.2.1
--- s_audio_pa.c	30 Jun 2007 20:28:14 -0000	1.4.4.7.2.5.2.2
***************
*** 482,483 ****
--- 482,490 ----
      *noutdevs = nout;
  }
+ 
+ t_audioapi pa_api = {
+     pa_open_audio,
+     pa_close_audio,
+     pa_send_dacs,
+     pa_getdevs,
+ };