X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_audio.h;h=39f494ffa0b843e501c28aaab94db4cfa7dd443e;hb=76d234b7dc5e6500e8a54009b367e7620f11ef97;hp=b0c4823d21c7ed79295fec80dfc78c4b359a4cec;hpb=a4784e4980beaf0dda620572fa1b2b6e4706cb11;p=vg.git

diff --git a/vg_audio.h b/vg_audio.h
index b0c4823..39f494f 100644
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -223,7 +223,7 @@ static struct vg_profile
  * These functions are called from the main thread and used to prevent bad 
  * access. TODO: They should be no-ops in release builds.
  */
-VG_STATIC int audio_lock_checker_load(void)
+static int audio_lock_checker_load(void)
 {
    int value;
    SDL_AtomicLock( &vg_audio.sl_checker );
@@ -232,14 +232,14 @@ VG_STATIC int audio_lock_checker_load(void)
    return value;
 }
 
-VG_STATIC void audio_lock_checker_store( int value )
+static void audio_lock_checker_store( int value )
 {
    SDL_AtomicLock( &vg_audio.sl_checker );
    vg_audio.sync_locked = value;
    SDL_AtomicUnlock( &vg_audio.sl_checker );
 }
 
-VG_STATIC void audio_require_lock(void)
+static void audio_require_lock(void)
 {
    if( audio_lock_checker_load() )
       return;
@@ -248,20 +248,20 @@ VG_STATIC void audio_require_lock(void)
    abort();
 }
 
-VG_STATIC void audio_lock(void)
+static void audio_lock(void)
 {
    SDL_AtomicLock( &vg_audio.sl_sync );
    audio_lock_checker_store(1);
 }
 
-VG_STATIC void audio_unlock(void)
+static void audio_unlock(void)
 {
    audio_lock_checker_store(0);
    SDL_AtomicUnlock( &vg_audio.sl_sync );
 }
 
-VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int frame_count );
-VG_STATIC void vg_audio_init(void)
+static void audio_mixer_callback( void *user, u8 *stream, int frame_count );
+static void vg_audio_init(void)
 {
    /* TODO: Move here? */
    vg_console_reg_var( "debug_audio", &vg_audio.debug_ui, 
@@ -310,7 +310,7 @@ VG_STATIC void vg_audio_init(void)
    }
 }
 
-VG_STATIC void vg_audio_free(void)
+static void vg_audio_free(void)
 {
    vg_dsp_free();
    SDL_CloseAudioDevice( vg_audio.sdl_output_device );
@@ -623,7 +623,7 @@ static int audio_channel_load_source( audio_channel *ch )
    return 1;
 }
 
-VG_STATIC void audio_decode_uncompressed_mono( i16 *src, u32 count, float *dst )
+static void audio_decode_uncompressed_mono( i16 *src, u32 count, float *dst )
 {
    for( u32 i=0; i<count; i++ ){
       dst[ i*2 + 0 ] = ((float)src[i]) * (1.0f/32767.0f);
@@ -634,7 +634,7 @@ VG_STATIC void audio_decode_uncompressed_mono( i16 *src, u32 count, float *dst )
 /* 
  * adapted from stb_vorbis.h, since the original does not handle mono->stereo
  */
-VG_STATIC int 
+static int 
 stb_vorbis_get_samples_float_interleaved_stereo( stb_vorbis *f, float *buffer, 
                                                  int len )
 {
@@ -668,7 +668,7 @@ stb_vorbis_get_samples_float_interleaved_stereo( stb_vorbis *f, float *buffer,
 /* 
  * ........ more wrecked code sorry!
  */
-VG_STATIC int 
+static int 
 stb_vorbis_get_samples_i16_downmixed( stb_vorbis *f, i16 *buffer, int len )
 {
    int n = 0,
@@ -935,7 +935,7 @@ static void audio_channel_mix( audio_channel *ch, float *buffer )
    vg_profile_end( &_vg_prof_audio_mix );
 }
 
-VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count )
+static void audio_mixer_callback( void *user, u8 *stream, int byte_count )
 {
    /*
     * Copy data and move edit flags to commit flags
@@ -1153,7 +1153,7 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count )
    audio_unlock();
 }
 
-VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
+static void audio_clip_load( audio_clip *clip, void *lin_alloc )
 {
    if( lin_alloc == NULL )
       lin_alloc = vg_audio.audio_pool;
@@ -1254,13 +1254,13 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
    }
 }
 
-VG_STATIC void audio_clip_loadn( audio_clip *arr, int count, void *lin_alloc )
+static void audio_clip_loadn( audio_clip *arr, int count, void *lin_alloc )
 {
    for( int i=0; i<count; i++ )
       audio_clip_load( &arr[i], lin_alloc );
 }
 
-VG_STATIC void audio_require_clip_loaded( audio_clip *clip )
+static void audio_require_clip_loaded( audio_clip *clip )
 {
    if( clip->data && clip->size )
       return;
@@ -1273,7 +1273,7 @@ VG_STATIC void audio_require_clip_loaded( audio_clip *clip )
  * Debugging
  */
 
-VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
+static void audio_debug_ui( m4x4f mtx_pv )
 {
    if( !vg_audio.debug_ui )
       return;