refactor model things

[carveJwlIkooP6JGAAIwe30JlM.git] / audio.h

diff --git a/audio.h b/audio.h
index 34ebb3a4ad3a7866468654fcc932a898d4337d76..26c1a35ca3b69152c2a0b2f99c556e63567c7247 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -9,10 +9,10 @@
 
 #include "world.h"
 
-static float audio_occlusion_current = 0.0f,
+VG_STATIC float audio_occlusion_current = 0.0f,
              k_audio_occlusion_rate  = 1.0f;
 
-static int   k_audio_debug_soundscape = 0;
+VG_STATIC int   k_audio_debug_soundscape = 0;
 
 audio_clip audio_board[] =
 {
@@ -141,7 +141,7 @@ audio_player audio_player_gate =
    .name = "Gate"
 };
 
-static void audio_init(void)
+VG_STATIC void audio_init(void)
 {
    audio_player_init( &audio_player0 );
    audio_player_init( &audio_player1 );
@@ -156,19 +156,19 @@ static void audio_init(void)
    audio_player_init( &audio_player_extra );
    audio_player_init( &audio_rewind_player );
 
-   audio_clip_loadn( audio_board, vg_list_size(audio_board) );
-   audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience) );
-   audio_clip_loadn( &audio_splash, 1 );
-   audio_clip_loadn( &audio_gate_pass, 1 );
-   audio_clip_loadn( &audio_gate_lap, 1 );
-   audio_clip_loadn( &audio_gate_ambient, 1 );
-   audio_clip_loadn( audio_jumps, vg_list_size(audio_jumps) );
-   audio_clip_loadn( audio_lands, vg_list_size(audio_lands) );
-   audio_clip_loadn( audio_water, vg_list_size(audio_water) );
-   audio_clip_loadn( audio_grass, vg_list_size(audio_grass) );
-   audio_clip_loadn( audio_footsteps, vg_list_size(audio_footsteps) );
-   audio_clip_loadn( audio_rewind, vg_list_size(audio_rewind) );
-   audio_clip_loadn( audio_ui, vg_list_size(audio_ui) );
+   audio_clip_loadn( audio_board, vg_list_size(audio_board), NULL );
+   audio_clip_loadn( audio_ambience, vg_list_size(audio_ambience), NULL );
+   audio_clip_loadn( &audio_splash, 1, NULL );
+   audio_clip_loadn( &audio_gate_pass, 1, NULL );
+   audio_clip_loadn( &audio_gate_lap, 1, NULL );
+   audio_clip_loadn( &audio_gate_ambient, 1, NULL );
+   audio_clip_loadn( audio_jumps, vg_list_size(audio_jumps), NULL );
+   audio_clip_loadn( audio_lands, vg_list_size(audio_lands), NULL );
+   audio_clip_loadn( audio_water, vg_list_size(audio_water), NULL );
+   audio_clip_loadn( audio_grass, vg_list_size(audio_grass), NULL );
+   audio_clip_loadn( audio_footsteps, vg_list_size(audio_footsteps), NULL );
+   audio_clip_loadn( audio_rewind, vg_list_size(audio_rewind), NULL );
+   audio_clip_loadn( audio_ui, vg_list_size(audio_ui), NULL );
 
    audio_lock();
    u32 flags = AUDIO_FLAG_LOOP|AUDIO_FLAG_SPACIAL_3D;
@@ -215,13 +215,13 @@ static void audio_init(void)
    });
 }
 
-static void audio_free(void*_)
+VG_STATIC void audio_free(void*_)
 {
    /* TODO! */
    vg_warn( "UNIMPLEMENTED: audio_free()\n" );
 }
 
-static void audio_sample_occlusion( v3f origin )
+VG_STATIC void audio_sample_occlusion( v3f origin )
 {
    float d = 0.0f,
          sample_dist = 880.0f;
@@ -280,7 +280,7 @@ enum audio_sprite_type
 /*
  * Trace out a random point, near the player to try and determine water areas
  */
-static enum audio_sprite_type audio_sample_sprite_random( v3f origin, 
+VG_STATIC enum audio_sprite_type audio_sample_sprite_random( v3f origin, 
                                                           v3f output )
 {
    v3f chance = { (vg_randf()-0.5f) * 30.0f, 
@@ -314,7 +314,7 @@ static enum audio_sprite_type audio_sample_sprite_random( v3f origin,
    return k_audio_sprite_type_water;
 }
 
-static void audio_debug_soundscapes(void)
+VG_STATIC void audio_debug_soundscapes(void)
 {
    if( !k_audio_debug_soundscape ) return;