[PD-cvs] pd/src d_soundfile.c,1.1.1.2.2.14,1.1.1.2.2.15

[Tim Blechmann]

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

Modified Files:
      Tag: devel_0_37
	d_soundfile.c 
Log Message:


Index: d_soundfile.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v
retrieving revision 1.1.1.2.2.14
retrieving revision 1.1.1.2.2.15
diff -C2 -d -r1.1.1.2.2.14 -r1.1.1.2.2.15
*** d_soundfile.c	26 Jun 2004 19:51:44 -0000	1.1.1.2.2.14
--- d_soundfile.c	26 Jun 2004 23:11:19 -0000	1.1.1.2.2.15
***************
*** 1375,1380 ****
      bufframes = SAMPBUFSIZE / (channels * bytespersamp);
  
-     post("allocating (argc: %d)",argc);
- 
      /* allocate memory for new array */
      if (resize)
--- 1375,1378 ----
***************
*** 1398,1402 ****
  		goto done;
  	    }
- 	    post("nvec[%d]=%x, size %d",i,nvecs[i],vecsize[i]);
  	}
      else
--- 1396,1399 ----
***************
*** 1417,1428 ****
  		for (j=0; j!=i;++j)
  		    /* if the resizing fails, we'll have to free all arrays again */
! 		    freebytes (nvecs[i],finalsize * sizeof(t_float)); 
  		goto done;
  	    }
! 	    post("nvec[%d]=%x, size %d",i,nvecs[i],vecsize[i]);
  	}
  
-     post("allocated");
- 
      for (itemsread = 0; itemsread < finalsize; )
      {
--- 1414,1424 ----
  		for (j=0; j!=i;++j)
  		    /* if the resizing fails, we'll have to free all arrays again */
! 		    freebytes (nvecs[i],vecsize[i] * sizeof(t_float)); 
  		goto done;
  	    }
! 	    if(i >= channels)
! 		memset(nvecs[i],0,vecsize[i] * sizeof(t_float));
  	}
  
      for (itemsread = 0; itemsread < finalsize; )
      {
***************
*** 1443,1455 ****
      }
  
-     /* zero out vectors in excess of number of channels */
- 
-     for (i = channels; i < argc; i++)
-     {
- 	for (j = 0; j < vecsize[i]; j++)
- 	    nvecs[i][j] = 0;
-     }
- 
- 
      /* lock the system and reset the garrays */
      sys_lock();
--- 1439,1442 ----