[PD-cvs] externals/maxlib/src arbran.c, 1.8, 1.9 arraycopy.c, 1.5, 1.6 beat.c, 1.6, 1.7 chord.c, 1.7, 1.8

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals/maxlib/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30488

Modified Files:
	arbran.c arraycopy.c beat.c chord.c 
Log Message:
fixed a few warnings

Index: chord.c
===================================================================
RCS file: /cvsroot/pure-data/externals/maxlib/src/chord.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** chord.c	10 Nov 2005 22:15:07 -0000	1.7
--- chord.c	16 Jan 2006 02:01:21 -0000	1.8
***************
*** 413,417 ****
  	register int i, j, k, l;
  	register t_type_root *t;
! 	int members[5];
  	int interval1, interval2, interval3, interval4;
  	int *st;
--- 413,417 ----
  	register int i, j, k, l;
  	register t_type_root *t;
! 	t_int members[5];
  	int interval1, interval2, interval3, interval4;
  	int *st;
***************
*** 964,968 ****
  	register t_type_root *t;
  	register int* st;
! 	int members[6];
  	int interval1, interval2, interval3, interval4, interval5;
  
--- 964,968 ----
  	register t_type_root *t;
  	register int* st;
! 	t_int members[6];
  	int interval1, interval2, interval3, interval4, interval5;
  
***************
*** 1215,1223 ****
  		x->x_pc[third] = 0;					// erase from pcs array
  		chord[c++] = name_class[(rootName+2)%7];
! 		if (chord_accidental(third))			// if it has an chord_accidental
  			// make it a flat if the root also has an chord_accidental
! 			if (chord_accidental(x->x_chord_root)) chord[c++] = 'b';
  			// otherwise make it a sharp
! 			else					   chord[c++] = '#';
  		chord[c++] = ' ';
  		return c;						// return if major third found
--- 1215,1226 ----
  		x->x_pc[third] = 0;					// erase from pcs array
  		chord[c++] = name_class[(rootName+2)%7];
! 		if (chord_accidental(third)) {			// if it has an chord_accidental
  			// make it a flat if the root also has an chord_accidental
! 			if (chord_accidental(x->x_chord_root)) 
! 				chord[c++] = 'b';
  			// otherwise make it a sharp
! 			else					   
! 				chord[c++] = '#';
! 		}
  		chord[c++] = ' ';
  		return c;						// return if major third found
***************
*** 1394,1401 ****
  		x->x_pc[thirteenth] = 0;
  		chord[c++] = name_class[(rootName+5)%7];
! 		if (chord_accidental(thirteenth))
  			if (chord_accidental(x->x_chord_root))
! 				chord[c++] = 'b'; else
  				chord[c++] = '#';
  		chord[c++] = ' ';
  		return c;
--- 1397,1407 ----
  		x->x_pc[thirteenth] = 0;
  		chord[c++] = name_class[(rootName+5)%7];
! 		if (chord_accidental(thirteenth)) {
  			if (chord_accidental(x->x_chord_root))
! 				chord[c++] = 'b'; 
! 			else
  				chord[c++] = '#';
+ 		}
+ 		
  		chord[c++] = ' ';
  		return c;

Index: arbran.c
===================================================================
RCS file: /cvsroot/pure-data/externals/maxlib/src/arbran.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** arbran.c	10 Nov 2005 22:15:07 -0000	1.8
--- arbran.c	16 Jan 2006 02:01:20 -0000	1.9
***************
*** 58,62 ****
  	t_int k = 0;
  	t_float *tx, *tp;
! 	t_int ix, ip;
  	if (!garray_getfloatarray(bx, &ix, &tx))
  	{
--- 58,62 ----
  	t_int k = 0;
  	t_float *tx, *tp;
! 	int ix, ip;
  	if (!garray_getfloatarray(bx, &ix, &tx))
  	{
***************
*** 87,91 ****
  	t_int k = 0;
  	t_float *tx, *tp;
! 	t_int ix, ip;
  	if (!garray_getfloatarray(bx, &ix, &tx))
  	{
--- 87,91 ----
  	t_int k = 0;
  	t_float *tx, *tp;
! 	int ix, ip;
  	if (!garray_getfloatarray(bx, &ix, &tx))
  	{

Index: beat.c
===================================================================
RCS file: /cvsroot/pure-data/externals/maxlib/src/beat.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** beat.c	10 Nov 2005 22:15:07 -0000	1.6
--- beat.c	16 Jan 2006 02:01:21 -0000	1.7
***************
*** 132,136 ****
  		{
  			sortp = &(theories[BEAT_LONG - i]);
! 			sprintf(info, " %4d[%3d]", sortp->theory, sortp->points);
  			strcat(string, info);
  		}
--- 132,136 ----
  		{
  			sortp = &(theories[BEAT_LONG - i]);
! 			sprintf(info, " %4d[%3d]", (int) sortp->theory, (int) sortp->points);
  			strcat(string, info);
  		}

Index: arraycopy.c
===================================================================
RCS file: /cvsroot/pure-data/externals/maxlib/src/arraycopy.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** arraycopy.c	10 Nov 2005 22:15:07 -0000	1.5
--- arraycopy.c	16 Jan 2006 02:01:21 -0000	1.6
***************
*** 83,87 ****
  	t_garray *b;		/* make local copy of array */
  	t_float *tab;                 /* the content itselfe */
! 	t_int items, i;
  	t_garray *A;
  	int npoints;
--- 83,88 ----
  	t_garray *b;		/* make local copy of array */
  	t_float *tab;                 /* the content itselfe */
! 	int items;
! 	t_int i;
  	t_garray *A;
  	int npoints;