[PD-cvs] pd/src makefile.in, 1.4.4.2.2.21.2.8, 1.4.4.2.2.21.2.9 s_audio.c, 1.5.4.16.2.20, 1.5.4.16.2.20.2.1 s_main.c, 1.7.4.17.2.22.2.13, 1.7.4.17.2.22.2.14

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	makefile.in s_audio.c s_main.c 
Log Message:
0.40


Index: makefile.in
===================================================================
RCS file: /cvsroot/pure-data/pd/src/makefile.in,v
retrieving revision 1.4.4.2.2.21.2.8
retrieving revision 1.4.4.2.2.21.2.9
diff -C2 -d -r1.4.4.2.2.21.2.8 -r1.4.4.2.2.21.2.9
*** makefile.in	5 Dec 2006 17:01:11 -0000	1.4.4.2.2.21.2.8
--- makefile.in	8 Dec 2006 08:28:18 -0000	1.4.4.2.2.21.2.9
***************
*** 54,58 ****
  
  pd-watchdog: s_watchdog.c
! 	$(CC) -O2 $(STRIPFLAG) -o pd-watchdog s_watchdog.c
  
  pdsend: u_pdsend.c
--- 54,58 ----
  
  pd-watchdog: s_watchdog.c
! 	$(CC) $(CFLAGS) $(STRIPFLAG) -o pd-watchdog s_watchdog.c
  
  pdsend: u_pdsend.c

Index: s_audio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v
retrieving revision 1.5.4.16.2.20
retrieving revision 1.5.4.16.2.20.2.1
diff -C2 -d -r1.5.4.16.2.20 -r1.5.4.16.2.20.2.1
*** s_audio.c	23 Nov 2006 06:08:39 -0000	1.5.4.16.2.20
--- s_audio.c	8 Dec 2006 08:28:18 -0000	1.5.4.16.2.20.2.1
***************
*** 151,156 ****
  {
      int nblk;
!     int inbytes;
!     int outbytes;
  
      if (dacblocksize != (1 << ilog2(dacblocksize)))
--- 151,156 ----
  {
      int nblk;
!     int inbytes = (chin ? chin : 2) * (sys_dacblocksize*sizeof(float));
!     int outbytes = (chout ? chout : 2) * (sys_dacblocksize*sizeof(float));
  
      if (dacblocksize != (1 << ilog2(dacblocksize)))
***************
*** 161,167 ****
      sys_schedblocksize = dacblocksize;
  
-     inbytes = (chin ? chin : 2) * (sys_dacblocksize*sizeof(float));
-     outbytes = (chout ? chout : 2) * (sys_dacblocksize*sizeof(float));
- 
      sys_inchannels = chin;
      sys_outchannels = chout;
--- 161,164 ----

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.22.2.13
retrieving revision 1.7.4.17.2.22.2.14
diff -C2 -d -r1.7.4.17.2.22.2.13 -r1.7.4.17.2.22.2.14
*** s_main.c	8 Dec 2006 04:47:37 -0000	1.7.4.17.2.22.2.13
--- s_main.c	8 Dec 2006 08:28:18 -0000	1.7.4.17.2.22.2.14
***************
*** 79,82 ****
--- 79,83 ----
  static int sys_main_dacblocksize = DEFDACBLKSIZE;
  static int sys_main_advance;
+ static int sys_listplease;
  
  /* jsarlo { */
***************
*** 123,127 ****
  int sys_main(int argc, char **argv)
  {
!     int defeat_presets = 0, i;
      class_table = hash_new(127);
  
--- 124,128 ----
  int sys_main(int argc, char **argv)
  {
!     int noprefs = 0, i;
      class_table = hash_new(127);
  
***************
*** 141,149 ****
  	for (i = 0; i != argc; ++i)
  	{
! 	  if (!strcmp(argv[i],"-no-prefs") || !strcmp(argv[i], "-rcfile"))
! 			defeat_presets = 1;
  	}
  	
! 	if (!defeat_presets) sys_rcfile(); /* parse the startup file */
  	/* initalize idle callbacks before starting the gui */
  	sys_init_idle_callbacks();
--- 142,150 ----
  	for (i = 0; i != argc; ++i)
  	{
! 	  if (!strcmp(argv[i],"-noprefs") || !strcmp(argv[i], "-rcfile"))
! 			noprefs = 1;
  	}
  	
! 	if (!noprefs) sys_rcfile(); /* parse the startup file */
  	/* initalize idle callbacks before starting the gui */
  	sys_init_idle_callbacks();
***************
*** 290,294 ****
  
  "\nother flags:\n",
! "-rcfile <file>   -- read this rcfile instead of default pd-settings\n",
  "-path <path>     -- add to file search path\n",
  "-nostdpath       -- don't search standard (\"extra\") directory\n",
--- 291,296 ----
  
  "\nother flags:\n",
! "-rcfile <file>   -- read this rcfile instead of default\n",
! "-noprefs         -- suppress loading preferences on startup\n",
  "-path <path>     -- add to file search path\n",
  "-nostdpath       -- don't search standard (\"extra\") directory\n",
***************
*** 587,591 ****
  	    NEXT(2);
  	}
!     	if (ARG("-no-prefs",1)) {NEXT(1);} /* tim: skip flag, we already parsed it */
  	/* jmz: read an alternative rcfile { */
      	if (ARG("-rcfile",2)) {sys_parsercfile(argv[1]); NEXT(2);} /* recursively */
--- 589,593 ----
  	    NEXT(2);
  	}
!     	if (ARG("-noprefs",1)) {NEXT(1);} /* tim: skip flag, we already parsed it */
  	/* jmz: read an alternative rcfile { */
      	if (ARG("-rcfile",2)) {sys_parsercfile(argv[1]); NEXT(2);} /* recursively */
***************
*** 612,616 ****
              NEXT(2);
          }
!         if (ARG("-listdev",1)) {sys_listdevs(); NEXT(1);}
          /* jsarlo { */
          if (ARG("-schedlib",2)) {
--- 614,618 ----
              NEXT(2);
          }
!         if (ARG("-listdev",1)) {sys_listplease=1; NEXT(1);}
          /* jsarlo { */
          if (ARG("-schedlib",2)) {
***************
*** 653,656 ****
--- 655,660 ----
      for (; argc > 0; argc--, argv++)
          sys_openlist = namelist_append_files(sys_openlist, *argv);
+ 
+ 
      return 0;
  }
***************
*** 698,701 ****
--- 702,707 ----
      for (i = 0; i < sys_nmidiout; i++)
          sys_midioutdevlist[i]--;
+     if (sys_listplease)
+         sys_listdevs();
          
              /* get the current audio parameters.  These are set