Changeset 499 for trunk/thune/gl/audio.c

Timestamp:

12/05/07 03:12:00 (12 months ago)

Author:

krobillard

Message:

Added ur_threadDestroy(). Removed ur_threadFree() from public API.
c_string.t should now handle all quotes properly.
Minor fix in GL boot
Documented stack.level.
Increased OpenAL music buffer size and now handle alutInit() failure.

Files:

• trunk/thune/gl/audio.c (modified) (6 diffs)

trunk/thune/gl/audio.c

@@ -55 +55 @@
 
 static int _audioUp = 0;
-#if 0
+//#define OPEN_DEVICE     1
+#ifdef OPEN_DEVICE
 static ALCdevice*  _adevice  = 0;
 static ALCcontext* _acontext = 0;
@@ -62 +63 @@
 
 
-#define MUSIC_BUFFERS       2
+#define MUSIC_BUFFERS       3
 static ALuint  _musicSource = 0;
 static ALfloat _musicGain = 1.0f;
@@ -76 +77 @@
 #define OGG_BIG_ENDIAN  1
 #endif
-#define OGG_BUFFER_SIZE  (4096 * 4)
+
+/* 
+   OGG_BUFFER_SIZE is set to hold one second of data in each music buffer.
+   If aud_update() is not called before all buffers are played then OpenAL
+   will stop the sound source.
+*/
+#define OGG_BUFFER_SIZE  (44100 * 2)
 static char _oggPCM[ OGG_BUFFER_SIZE ];
 
@@ -141 +148 @@
 int aud_startup()
 {
-#if 0
+#ifdef OPEN_DEVICE
     _adevice = alcOpenDevice( 0 );
     if( ! _adevice )
@@ -150 +157 @@
     alutInitWithoutContext( 0, 0 );
 #else
-    alutInit( 0, 0 );
+    if( alutInit( 0, 0 ) == AL_FALSE )
+        return 0;
 #endif
 
@@ -175 +183 @@
         alDeleteBuffers( MUSIC_BUFFERS, _musicBuffers );
 
-#if 0
+#ifdef OPEN_DEVICE
         // Could not use alutExit() on my box (FC3/Shuttle XPC) since
         // alcMakeContextCurrent(0) -> _alLockMixerPause() will hangup.
         alcDestroyContext( _acontext );
         alcCloseDevice( _adevice );
-#endif
+#else
         alutExit();
+#endif
     }
 }