[PD-cvs] pd/src s_stuff.h, 1.5.4.10.2.3, 1.5.4.10.2.4 s_audio.c, 1.5.4.16.2.9, 1.5.4.16.2.10

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_39
	s_stuff.h s_audio.c 
Log Message:
small fix

Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.5.4.16.2.9
retrieving revision 1.5.4.16.2.10
diff -C2 -d -r1.5.4.16.2.9 -r1.5.4.16.2.10
*** s_audio.c	27 Mar 2006 12:08:57 -0000	1.5.4.16.2.9
--- s_audio.c	7 Apr 2006 21:02:42 -0000	1.5.4.16.2.10
***************
*** 71,74 ****
--- 71,75 ----
  static int audio_dacblocksize;
  static int audio_advance;
+ static int audio_scheduler;
  
  extern int sys_callbackscheduler;
***************
*** 102,106 ****
      *pdacblocksize = audio_dacblocksize;
      *padvance = audio_advance;
!     *pscheduler = sys_callbackscheduler;
  }
  
--- 103,107 ----
      *pdacblocksize = audio_dacblocksize;
      *padvance = audio_advance;
!     *pscheduler = audio_scheduler;
  }
  
***************
*** 108,112 ****
      int naudioindev, int *audioindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int *choutdev,
!     int rate, int dacblocksize, int advance)
  {
      int i;
--- 109,113 ----
      int naudioindev, int *audioindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int *choutdev,
!     int rate, int dacblocksize, int advance, int scheduler)
  {
      int i;
***************
*** 122,125 ****
--- 123,127 ----
      audio_dacblocksize = dacblocksize;
      audio_advance = advance;
+     audio_scheduler = scheduler;
  }
  
***************
*** 406,410 ****
      }
      sys_save_audio_params(naudioindev, audioindev, chindev,
! 			  naudiooutdev, audiooutdev, choutdev, sys_dacsr, sys_dacblocksize, advance);
      if (sys_inchannels == 0 && sys_outchannels == 0)
          enable = 0;
--- 408,412 ----
      }
      sys_save_audio_params(naudioindev, audioindev, chindev,
!         naudiooutdev, audiooutdev, choutdev, sys_dacsr, sys_dacblocksize, advance, schedmode);
      if (sys_inchannels == 0 && sys_outchannels == 0)
          enable = 0;
***************
*** 1146,1153 ****
  	
  	naudiooutdev = naudioindev = (int)atom_getfloatarg(0, argc, argv);
! 	for (i = 0; i != MAXAUDIOINDEV; i=i+2)
  	{
! 		audiooutdev[i] = audioindev[i] = atom_getfloatarg(i+1, argc, argv);
! 		audiochoutdev[i] = audiochindev[i] = atom_getfloatarg(i+2, argc, argv);
  	}
  
--- 1148,1155 ----
  	
  	naudiooutdev = naudioindev = (int)atom_getfloatarg(0, argc, argv);
! 	for (i = 0; i != MAXAUDIOINDEV; i++)
  	{
! 		audiooutdev[i] = audioindev[i] = atom_getfloatarg(i*2+1, argc, argv);
! 		audiochoutdev[i] = audiochindev[i] = atom_getfloatarg(i*2+2, argc, argv);
  	}
  

Index: s_stuff.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v
retrieving revision 1.5.4.10.2.3
retrieving revision 1.5.4.10.2.4
diff -C2 -d -r1.5.4.10.2.3 -r1.5.4.10.2.4
*** s_stuff.h	9 Mar 2006 14:22:51 -0000	1.5.4.10.2.3
--- s_stuff.h	7 Apr 2006 21:02:42 -0000	1.5.4.10.2.4
***************
*** 305,309 ****
      int naudioindev, int *audioindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int *choutdev,
!     int rate, int dacblocksize, int advance);
  
  /* s_file.c */
--- 305,309 ----
      int naudioindev, int *audioindev, int *chindev,
      int naudiooutdev, int *audiooutdev, int *choutdev,
!     int rate, int dacblocksize, int advance, int scheduler);
  
  /* s_file.c */