[PD-cvs] pd/src s_main.c,1.7.4.4,1.7.4.5

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_38
	s_main.c 
Log Message:
make callback scheduler selectable by user & miller's changes to 0.38-test13


Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -C2 -d -r1.7.4.4 -r1.7.4.5
*** s_main.c	12 Nov 2004 08:21:20 -0000	1.7.4.4
--- s_main.c	14 Dec 2004 09:51:13 -0000	1.7.4.5
***************
*** 8,12 ****
   */
  
! char pd_version[] = "Pd version 0.38 TEST10 devel\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;
--- 8,12 ----
   */
  
! char pd_version[] = "Pd version 0.38 TEST13 devel\n";
  char pd_compiletime[] = __TIME__;
  char pd_compiledate[] = __DATE__;
***************
*** 282,286 ****
      sys_rcfile();                               /* parse the startup file */
  #endif
!     if (sys_argparse(argc, argv))           /* parse cmd line */
          return (1);
      sys_afterargparse();                    /* post-argparse settings */
--- 282,286 ----
      sys_rcfile();                               /* parse the startup file */
  #endif
!     if (sys_argparse(argc-1, argv+1))           /* parse cmd line */
          return (1);
      sys_afterargparse();                    /* post-argparse settings */
***************
*** 557,561 ****
      char sbuf[MAXPDSTRING];
      int i;
-     argc--; argv++;
      while ((argc > 0) && **argv == '-')
      {
--- 557,560 ----
***************
*** 925,929 ****
      int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV];
      int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
!     int nchindev, nchoutdev, rate, dacblksize, advance;
      int nmidiindev = 0, midiindev[MAXMIDIINDEV];
      int nmidioutdev = 0, midioutdev[MAXMIDIOUTDEV];
--- 924,928 ----
      int naudioindev, audioindev[MAXAUDIOINDEV], chindev[MAXAUDIOINDEV];
      int naudiooutdev, audiooutdev[MAXAUDIOOUTDEV], choutdev[MAXAUDIOOUTDEV];
!     int nchindev, nchoutdev, rate, dacblksize, advance, scheduler;
      int nmidiindev = 0, midiindev[MAXMIDIINDEV];
      int nmidioutdev = 0, midioutdev[MAXMIDIOUTDEV];
***************
*** 959,963 ****
              of argument parsing, and store them again. */
      sys_get_audio_params(&naudioindev, audioindev, chindev,
! 			 &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance);
      if (sys_nchin >= 0)
      {
--- 958,962 ----
              of argument parsing, and store them again. */
      sys_get_audio_params(&naudioindev, audioindev, chindev,
! 			 &naudiooutdev, audiooutdev, choutdev, &rate, &dacblksize, &advance, &scheduler);
      if (sys_nchin >= 0)
      {
***************
*** 1006,1010 ****
        dacblksize = sys_main_dacblocksize;
      sys_open_audio(naudioindev, audioindev, naudioindev, chindev,
! 		   naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblksize, advance, 0);
      sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
  }
--- 1005,1009 ----
        dacblksize = sys_main_dacblocksize;
      sys_open_audio(naudioindev, audioindev, naudioindev, chindev,
! 		   naudiooutdev, audiooutdev, naudiooutdev, choutdev, rate, dacblksize, advance, scheduler, 0);
      sys_open_midi(nmidiindev, midiindev, nmidioutdev, midioutdev, 0);
  }