[q-lang-cvs] q-openal/src Makefile,1.1.1.1,1.2 openal.i,1.9,1.10

[Albert G. <ag...@us...>]

Update of /cvsroot/q-lang/q-openal/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13125

Modified Files:
	Makefile openal.i 
Log Message:
OpenAL 1.1 compatibility fixes

Index: openal.i
===================================================================
RCS file: /cvsroot/q-lang/q-openal/src/openal.i,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** openal.i	24 Feb 2006 23:24:41 -0000	1.9
--- openal.i	15 Dec 2007 00:35:06 -0000	1.10
***************
*** 74,89 ****
  %}
  
! %include <AL/altypes.h>
! #ifndef __WIN32__
! %include <AL/aluttypes.h>
! %include <AL/alexttypes.h>
! #endif
! %include <AL/alctypes.h>
  
  /* map a string list to the (argc,argv) parameters of alutInit() */
  
! %typemap(arginit) (int *argc, char **argv) "$2 = NULL;";
  
! %typemap(in) (int *argc, char *argv[]) (int temp) {
    int n = 0;
    expr x = $input, hd, tl;
--- 74,169 ----
  %}
  
! /* typedefs */
! 
! /* al.h */
! 
! /** 8-bit boolean */
! typedef char ALboolean;
! 
! /** character */
! typedef char ALchar;
! 
! /** signed 8-bit 2's complement integer */
! typedef char ALbyte;
! 
! /** unsigned 8-bit integer */
! typedef unsigned char ALubyte;
! 
! /** signed 16-bit 2's complement integer */
! typedef short ALshort;
! 
! /** unsigned 16-bit integer */
! typedef unsigned short ALushort;
! 
! /** signed 32-bit 2's complement integer */
! typedef int ALint;
! 
! /** unsigned 32-bit integer */
! typedef unsigned int ALuint;
! 
! /** non-negative 32-bit binary integer size */
! typedef int ALsizei;
! 
! /** enumerated 32-bit value */
! typedef int ALenum;
! 
! /** 32-bit IEEE754 floating-point */
! typedef float ALfloat;
! 
! /** 64-bit IEEE754 floating-point */
! typedef double ALdouble;
! 
! /** void type (for opaque pointers only) */
! typedef void ALvoid;
! 
! /* alc.h */
! 
! typedef struct ALCdevice_struct ALCdevice;
! typedef struct ALCcontext_struct ALCcontext;
! 
! /** 8-bit boolean */
! typedef char ALCboolean;
! 
! /** character */
! typedef char ALCchar;
! 
! /** signed 8-bit 2's complement integer */
! typedef char ALCbyte;
! 
! /** unsigned 8-bit integer */
! typedef unsigned char ALCubyte;
! 
! /** signed 16-bit 2's complement integer */
! typedef short ALCshort;
! 
! /** unsigned 16-bit integer */
! typedef unsigned short ALCushort;
! 
! /** signed 32-bit 2's complement integer */
! typedef int ALCint;
! 
! /** unsigned 32-bit integer */
! typedef unsigned int ALCuint;
! 
! /** non-negative 32-bit binary integer size */
! typedef int ALCsizei;
! 
! /** enumerated 32-bit value */
! typedef int ALCenum;
! 
! /** 32-bit IEEE754 floating-point */
! typedef float ALCfloat;
! 
! /** 64-bit IEEE754 floating-point */
! typedef double ALCdouble;
! 
! /** void type (for opaque pointers only) */
! typedef void ALCvoid;
  
  /* map a string list to the (argc,argv) parameters of alutInit() */
  
! %typemap(arginit) (int *argcp, char **argv) "$2 = NULL;";
  
! %typemap(in) (int *argcp, char **argv) (int temp) {
    int n = 0;
    expr x = $input, hd, tl;
***************
*** 109,113 ****
  }
  
! %typemap(freearg) (int *argc, char *argv[]) {
    if ($2) {
      int i;
--- 189,193 ----
  }
  
! %typemap(freearg) (int *argcp, char **argv) {
    if ($2) {
      int i;
***************
*** 326,342 ****
  %rename(alutInit) alutMyInit;
  
! /* ignore these -- they're Linux-specific */
  
  %ignore alutLoadWAV;
  %ignore alutUnloadWAV;
  
  /* Just include the OpenAL headers here. */
  
  %include <AL/al.h>
  %include <AL/alut.h>
  #ifndef __WIN32__
  %include <AL/alext.h>
  #endif
- %include <AL/alc.h>
  
  /* typemaps for the vector functions (see alIntVector etc., below) */
--- 406,433 ----
  %rename(alutInit) alutMyInit;
  
! /* Ignore these -- they are either not supported any more (as of OpenAL 1.1)
!    or they are deprecated and/or non-portable. */
  
  %ignore alutLoadWAV;
+ %ignore alutLoadWAVFile;
+ %ignore alutLoadWAVMemory;
  %ignore alutUnloadWAV;
  
+ /* These aren't supported in the Q API right now. Use the alutCreateBufferXXX
+    routines to load wave data directly into ALUT buffers instead. */
+ 
+ %ignore alutLoadMemoryFromFile;
+ %ignore alutLoadMemoryFromFileImage;
+ %ignore alutLoadMemoryHelloWorld;
+ %ignore alutLoadMemoryWaveform;
+ 
  /* Just include the OpenAL headers here. */
  
  %include <AL/al.h>
+ %include <AL/alc.h>
  %include <AL/alut.h>
  #ifndef __WIN32__
  %include <AL/alext.h>
  #endif
  
  /* typemaps for the vector functions (see alIntVector etc., below) */
***************
*** 574,582 ****
  /* reworked alutInit function */
  
! void alutMyInit(int *argc, char *argv[])
  {
    ALCdevice *device;
    char *name = NULL;
    int i;
    for (i = 1; i < *argc; i++)
      if (strcmp(argv[i], "-d") == 0 && i+1 < *argc)
--- 665,674 ----
  /* reworked alutInit function */
  
! ALboolean alutMyInit(int *argc, char **argv)
  {
    ALCdevice *device;
    char *name = NULL;
    int i;
+   if (!alutInitWithoutContext(argc, argv)) return AL_FALSE;
    for (i = 1; i < *argc; i++)
      if (strcmp(argv[i], "-d") == 0 && i+1 < *argc)
***************
*** 589,592 ****
--- 681,685 ----
      }
    }
+   return AL_TRUE;
  }
  %}
***************
*** 598,602 ****
  %}
  
! void alutMyInit(int *argc, char *argv[]);
  
  %stubs %{
--- 691,695 ----
  %}
  
! ALboolean alutMyInit(int *argcp, char **argv);
  
  %stubs %{

Index: Makefile
===================================================================
RCS file: /cvsroot/q-lang/q-openal/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	17 Jul 2005 11:01:13 -0000	1.1.1.1
--- Makefile	15 Dec 2007 00:35:06 -0000	1.2
***************
*** 2,6 ****
  
  openal.la: openal_wrap.c
! 	qcc -o openal.la openal_wrap.c -- --link -lopenal 
  
  openal_wrap.c openal.q: openal.i
--- 2,6 ----
  
  openal.la: openal_wrap.c
! 	qcc -o openal.la openal_wrap.c -- --link -lalut -lopenal 
  
  openal_wrap.c openal.q: openal.i