[PD-cvs] pd/src s_audio_alsa.c, 1.5.4.5.2.2.2.1, 1.5.4.5.2.2.2.2 s_audio_jack.c, 1.5.4.8.2.7.2.1, 1.5.4.8.2.7.2.2 s_audio_portaudio.c, 1.1.2.21, 1.1.2.21.2.1

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	s_audio_alsa.c s_audio_jack.c s_audio_portaudio.c 
Log Message:
remove unused vars


Index: s_audio_alsa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_alsa.c,v
retrieving revision 1.5.4.5.2.2.2.1
retrieving revision 1.5.4.5.2.2.2.2
diff -C2 -d -r1.5.4.5.2.2.2.1 -r1.5.4.5.2.2.2.2
*** s_audio_alsa.c	8 Dec 2006 06:37:39 -0000	1.5.4.5.2.2.2.1
--- s_audio_alsa.c	20 Dec 2006 07:58:01 -0000	1.5.4.5.2.2.2.2
***************
*** 232,241 ****
      int *choutdev, int rate)
  {
!     int err, inchans = 0, outchans = 0, subunitdir;
      char devname[512];
-     snd_output_t* out;
      int frag_size = (sys_blocksize ? sys_blocksize : ALSA_DEFFRAGSIZE);
      int nfrags, i, iodev, dev2;
-     int wantinchans, wantoutchans, device;
  
      nfrags = sys_schedadvance * (float)rate / (1e6 * frag_size);
--- 232,239 ----
      int *choutdev, int rate)
  {
!     int err, inchans = 0, outchans = 0;
      char devname[512];
      int frag_size = (sys_blocksize ? sys_blocksize : ALSA_DEFFRAGSIZE);
      int nfrags, i, iodev, dev2;
  
      nfrags = sys_schedadvance * (float)rate / (1e6 * frag_size);
***************
*** 392,396 ****
      double timelast;
      t_sample *fp, *fp1, *fp2;
!     int i, j, k, err, iodev, result, ch; 
      int chansintogo, chansouttogo;
      unsigned int transfersize;
--- 390,394 ----
      double timelast;
      t_sample *fp, *fp1, *fp2;
!     int i, j, k, iodev, result, ch; 
      int chansintogo, chansouttogo;
      unsigned int transfersize;
***************
*** 567,571 ****
  void alsa_printstate( void)
  {
!     int i, result, iodev = 0;
      snd_pcm_sframes_t indelay, outdelay;
      if (sys_audioapi != API_ALSA)
--- 565,569 ----
  void alsa_printstate( void)
  {
!     int result, iodev = 0;
      snd_pcm_sframes_t indelay, outdelay;
      if (sys_audioapi != API_ALSA)

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.1
retrieving revision 1.5.4.8.2.7.2.2
diff -C2 -d -r1.5.4.8.2.7.2.1 -r1.5.4.8.2.7.2.2
*** s_audio_jack.c	8 Dec 2006 06:37:39 -0000	1.5.4.8.2.7.2.1
--- s_audio_jack.c	20 Dec 2006 07:58:01 -0000	1.5.4.8.2.7.2.2
***************
*** 111,117 ****
  			/* we're late ... lets hope that jack doesn't kick us out */
  		{
- 			static int k = 0;
  			post("timeout %d", (timeout));
- 			
  			sys_log_error(ERR_SYSLOCK);
  			return 0;
--- 111,115 ----
***************
*** 174,178 ****
  static t_int jack_shutdown_handler(t_int* none)
  {
- 	int i;
  	post("jack kicked us out ... trying to reconnect");
  	jack_ignore_graph_callback = 1;
--- 172,175 ----

Index: s_audio_portaudio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_portaudio.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.21.2.1
diff -C2 -d -r1.1.2.21 -r1.1.2.21.2.1
*** s_audio_portaudio.c	23 Nov 2006 05:54:26 -0000	1.1.2.21
--- s_audio_portaudio.c	20 Dec 2006 07:58:01 -0000	1.1.2.21.2.1
***************
*** 88,92 ****
  {
      PaError err;
!     int j, devno;
      const PaDeviceInfo *pdi,*pdo;
  
--- 88,92 ----
  {
      PaError err;
!     int j;
      const PaDeviceInfo *pdi,*pdo;
  
***************
*** 272,276 ****
                            void*                           userData)
  {
!     int         frameIndex, channelIndex, i;
      float**     outputs = (float**)outputBuffer;
      static float phase;
--- 272,276 ----
                            void*                           userData)
  {
!     int         frameIndex, i;
      float**     outputs = (float**)outputBuffer;
      static float phase;
***************
*** 278,282 ****
      for( frameIndex=0; frameIndex<(int)framesPerBuffer; frameIndex++ )
      {
-         int c;
          /* Output sine wave on every channel. */
          outputs[0][frameIndex] = (float) sin(phase);
--- 278,281 ----
***************
*** 303,309 ****
      PaStreamCallbackFlags statusFlags, void *userData)
  {
-     static int started = 0;
- 
- 
      int i;
      int timeout = (float)frameCount / (float) sys_dacsr * 1e6;
--- 302,305 ----
***************
*** 395,401 ****
  void pa_listdevs(void)     /* lifted from pa_devs.c in portaudio */
  {
!     int      i,j;
      int      numDevices;
-     const    PaDeviceInfo *pdi;
      PaError  err;
      pa_initialize();
--- 391,396 ----
  void pa_listdevs(void)     /* lifted from pa_devs.c in portaudio */
  {
!     int      i;
      int      numDevices;
      PaError  err;
      pa_initialize();