sync clean up

[vg.git] / vg_audio.h

diff --git a/vg_audio.h b/vg_audio.h
index 46c9e7331a90f2c4ec5534eec9754699a3c5e404..d5ad5d26ec422ea940dd48ab020f84988f17447e 100644 (file)
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -3,6 +3,8 @@
 #ifndef VG_AUDIO_H
 #define VG_AUDIO_H
 
+#define VG_GAME
+
 #include "vg/vg.h"
 #include "vg/vg_stdint.h"
 #include "vg/vg_platform.h"
@@ -11,6 +13,7 @@
 #include "vg/vg_ui.h"
 #include "vg/vg_console.h"
 #include "vg/vg_store.h"
+#include "vg/vg_profiler.h"
 
 #include <sys/time.h>
 
@@ -267,7 +270,7 @@ VG_STATIC void vg_audio_init(void)
    vg_success( "Ready\n" );
 }
 
-VG_STATIC void vg_audio_free(void * nothing)
+VG_STATIC void vg_audio_free(void)
 {
    SDL_CloseAudioDevice( vg_audio.sdl_output_device );
 }
@@ -837,6 +840,7 @@ VG_STATIC void audio_require_init( audio_player *player )
    if( player->init )
       return;
 
+   audio_unlock();
    vg_fatal_exit_loop( "Must init audio player before playing! \n" );
 }
 
@@ -845,6 +849,7 @@ VG_STATIC void audio_require_clip_loaded( audio_clip *clip )
    if( clip->data && clip->size )
       return;
 
+   audio_unlock();
    vg_fatal_exit_loop( "Must load audio clip before playing! \n" );
 }