Changeset 423

Timestamp:

07/02/07 01:53:18 (1 year ago)

Author:

krobillard

Message:

gl/audio - Music is now streamed rather than using AL_EXT_vorbis.

Files:

• branches/thune/thread_safe/gl/audio.c (modified) (9 diffs)
• branches/thune/thread_safe/gl/audio.h (modified) (1 diff)
• branches/thune/thread_safe/gl/gx.c (modified) (1 diff)
• branches/thune/thread_safe/gl/project.r (modified) (1 diff)
• branches/thune/thread_safe/gl/scripts/view.t (modified) (2 diffs)
• branches/thune/thread_safe/gl/test_fw.t (modified) (1 diff)

branches/thune/thread_safe/gl/audio.c

@@ -2 +2 @@
-//
-// Thune OpenAL Module
-6
+7
-//
-//  This library is free software; you can redistribute it and/or
@@ -35 +35 @@
-#include <AL/alc.h>
-#include <AL/alut.h>
-
-
+
+
+
-#include "os.h"
-#include "urlan.h"
@@ -61 +62 @@
-
-
-
-
+
-static ALuint  _musicSource = 0;
-static ALfloat _musicGain = 1.0f;
-static ALuint  _musicBuffers[ MUSIC_BUFFERS ];
+
+static FILE* _bgStream = 0;
+static OggVorbis_File _vf;
+static vorbis_info* _vinfo;
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+#define OGG_BIG_ENDIAN  0
+#else
+#define OGG_BIG_ENDIAN  1
+#endif
+#define OGG_BUFFER_SIZE  (4096 * 4)
+static char _oggPCM[ OGG_BUFFER_SIZE ];
+
+/*
+  Returns false if all data has been read or an error occurs.
+*/
+static int _readOgg( ALuint buffer, OggVorbis_File* vf, vorbis_info* vinfo )
+{
+    int stream;
+    unsigned int count = 0;
+
+    while( count < OGG_BUFFER_SIZE )
+    {
+        int amt = ov_read( vf, _oggPCM + count, OGG_BUFFER_SIZE - count,
+                           OGG_BIG_ENDIAN, 2, 1, &stream );
+        if( amt <= 0 )
+        {
+            if( amt < 0 )
+                fprintf( stderr, "ov_read" );
+            break;
+        }
+        count += amt;
+    }
+
+    if( ! count )
+        return 0;
+
+    ALint format = (vinfo->channels == 1) ? AL_FORMAT_MONO16 :
+                                            AL_FORMAT_STEREO16;
+
+    //printf( "KR ogg count %d\n", count );
+    alBufferData( buffer, format, _oggPCM, count, vinfo->rate );
+
+    return 1;
+}
+
+
+static void _startMusic()
+{
+    int i;
+    for( i = 0; i < MUSIC_BUFFERS; ++i )
+    {
+        if( ! _readOgg( _musicBuffers[i], &_vf, _vinfo ) )
+        {
+            ov_clear( &_vf );   // Closes _bgStream for us.
+            _bgStream = 0;
+            break;
+        }
+    }
+
+    if( i > 0 )
+    {
+        alSourceQueueBuffers( _musicSource, i, _musicBuffers );
+        alSourcePlay( _musicSource );
+        //printf( "KR _startMusic %d\n", i );
+    }
+}
-
-
@@ -91 +158 @@
-    _audioUp = 1;
-
-    if( alIsExtensionPresent( "AL_EXT_vorbis" ) )
-        _hasVorbis = 1;
-    else
-        dprint( "OpenAL AL_EXT_vorbis not present - music disabled\n" );
-
-    return 1;
-}
@@ -124 +186 @@
-
-
-#if 0
-/**
-  Called periodically (once per frame) to drive sound engine.
@@ -130 +191 @@
-void aud_update()
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-static int wav_sig( uint8_t* sig, int sigLen )
-{
@@ -284 +414 @@
-void aud_playMusic( const char* file )
-{
-
-
-
-
-
-
-
-
+
+
+
-
-        aud_stopMusic();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            alGenSources( 1, &_musicSource );
-
@@ -323 +446 @@
-            alSourcef ( _musicSource, AL_GAIN, _musicGain );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -350 +461 @@
-            alDeleteSources( 1, &_musicSource );
-            _musicSource = 0;
+        }
+
+        if( _bgStream )
+        {
+            ov_clear( &_vf );   // Closes _bgStream for us.
+            _bgStream = 0;
-        }
-    }

branches/thune/thread_safe/gl/audio.h

@@ -27 +27 @@
-extern int  aud_startup();
-extern void aud_shutdown();
+extern void aud_update();
-extern int  aud_playSound( UCell* );
-extern void aud_playMusic( const char* file );

branches/thune/thread_safe/gl/gx.c

@@ -653 +653 @@
-    //glClear( GL_DEPTH_BUFFER_BIT );
-    //glClear( gEnv.state.clear );
+
+    aud_update();
-
-    UR_S_DROP;

branches/thune/thread_safe/gl/project.r

@@ -54 +54 @@
-
-        libs [%freetype %bz2 %png]
-
+ %vorbisfile
-    ]
-    win32 [

branches/thune/thread_safe/gl/scripts/view.t

@@ -167 +167 @@
-
-
+; Make Models
-d7  do  light-fb/texture :d7-shader/smap
-ent do  light-fb/texture :ent-shader/smap
@@ -216 +217 @@
-
-0 0 move-light
+
+;"music/Carl_Leth_211.ogg" play
-
-[

branches/thune/thread_safe/gl/test_fw.t

@@ -71 +71 @@
-    [
-        wid wait-events
-
+   ; Use this when audio enabled
-
-        sim-update