[foo-cvs] foo/elkfoo/include elkfoo.h,1.6,1.7

[Martin R. <ru...@us...>]

Update of /cvsroot/foo/foo/elkfoo/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26207

Modified Files:
	elkfoo.h 
Log Message:
some minor changes in order to avoid warnings

Index: elkfoo.h
===================================================================
RCS file: /cvsroot/foo/foo/elkfoo/include/elkfoo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** elkfoo.h	15 Aug 2004 20:30:48 -0000	1.6
--- elkfoo.h	30 Aug 2004 15:58:01 -0000	1.7
***************
*** 125,129 ****
  typedef enum
    {
-     C_base			=	0,
      C_char			=	1,
      C_short			=	2,
--- 125,128 ----
***************
*** 159,201 ****
    } elkfoo_type_t;
  
  #define C_pointers	C_VOID
  #define C_last		C_UNDEF
  
- /* type names */
- static char *elkfoo_type_names[] =
-   { /* corresponds to enum above */
-     "DUMMY",		/* 0 */
-     "char",		/* 1 */
-     "short",		/* 2 */
-     "int",		/* 3 */
-     "long",		/* 4 */
-     "uchar",		/* 5 */
-     "ushort",		/* 6 */
-     "uint",		/* 7 */
-     "ulong",		/* 8 */
-     "float",		/* 9 */
-     "double",		/* 10 */
-     "void*",		/* 11 */
-     "char*",		/* 12 */
-     "short*",		/* 13 */
-     "int*",		/* 14 */
-     "long*",		/* 15 */
-     "uchar*",		/* 16 */
-     "ushort*",		/* 17 */
-     "uint*",		/* 18 */
-     "ulong*",		/* 19 */
-     "float*",		/* 20 */
-     "double*",		/* 21 */
-     "id",		/* 22 */
-     "class",		/* 23 */
-     "sel",		/* 24 */
-     "struct*",		/* 25 */
-     "union*",		/* 26 */
-     "array*",		/* 27 */
-     "undefined",	/* 28 */
-     "char**",		/* 29 */
-     "undefined*",	/* 30 */
-   };
- 
  extern elkfoo_type_t A_Map_ObjC_Type (const char *);
  extern int A_Get_Buffer_From_Object (void *, SchemeObject, elkfoo_type_t);
--- 158,165 ----
    } elkfoo_type_t;
  
+ #define C_base		0
  #define C_pointers	C_VOID
  #define C_last		C_UNDEF
  
  extern elkfoo_type_t A_Map_ObjC_Type (const char *);
  extern int A_Get_Buffer_From_Object (void *, SchemeObject, elkfoo_type_t);
***************
*** 231,236 ****
    SchemeObject type;
    SchemeObject name;
-   SchemeObject format;
    SchemeObject filetype;
    int channels;
    int channel;
--- 195,201 ----
    SchemeObject type;
    SchemeObject name;
    SchemeObject filetype;
+   SchemeObject format;
+   SchemeObject comment;
    int channels;
    int channel;
***************
*** 255,265 ****
  };
  
! enum { SND_CHAR, SND_SHORT, SND_LONG, SND_FLOAT, SND_DOUBLE, SND_INCREMENTAL };
  
! enum { SND_FILETYPE_WAV, SND_FILETYPE_AIFF, SND_FILETYPE_SND,
!        SND_FILETYPE_PAF, SND_FILETYPE_SVX, SND_FILETYPE_NIST,
!        SND_FILETYPE_VOC, SND_FILETYPE_IRCAM, SND_FILETYPE_WAV64,
!        SND_FILETYPE_MAT4, SND_FILETYPE_MAT5, SND_FILETYPE_PVF,
!        SND_FILETYPE_XI };
  
  extern struct symbol sndTypes[];
--- 220,232 ----
  };
  
! int Scheme_To_C_Symbol (SchemeObject sym, struct symbol *p);
  
! enum { SND_AUTO, SND_CHAR, SND_SHORT, SND_LONG, SND_FLOAT, SND_DOUBLE };
! 
! enum { SND_FILETYPE_INCREMENTAL, SND_FILETYPE_WAV, SND_FILETYPE_AIFF,
!        SND_FILETYPE_SND, SND_FILETYPE_PAF, SND_FILETYPE_SVX,
!        SND_FILETYPE_NIST, SND_FILETYPE_VOC, SND_FILETYPE_IRCAM,
!        SND_FILETYPE_WAV64, SND_FILETYPE_MAT4, SND_FILETYPE_MAT5,
!        SND_FILETYPE_PVF, SND_FILETYPE_XI };
  
  extern struct symbol sndTypes[];