switch to async system

[vg.git] / vg_audio.h

diff --git a/vg_audio.h b/vg_audio.h
index cf6651ed6930e4777c3dff5d18aeef3affe955b6..34bc9ee4bac5fdbb558a8012fc5385b6f1042620 100644 (file)
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -296,7 +296,7 @@ VG_STATIC void vg_audio_init(void)
       SDL_PauseAudioDevice( vg_audio.sdl_output_device, 0 );
    }
    else{
-      vg_fatal_exit_loop( 
+      vg_fatal_error( 
          "SDL_OpenAudioDevice failed. Your default audio device must support:\n"
          "  Frequency: 44100 hz\n"
          "  Buffer size: 512\n"
@@ -840,10 +840,10 @@ static void audio_channel_mix( audio_channel *ch, float *buffer )
          }
       }
 
-      if( !vg_validf( framevol_l ) ) vg_fatal_exit_loop( "NaN left channel" );
-      if( !vg_validf( framevol_r ) ) vg_fatal_exit_loop( "NaN right channel" );
+      if( !vg_validf( framevol_l ) ) vg_fatal_error( "NaN left channel" );
+      if( !vg_validf( framevol_r ) ) vg_fatal_error( "NaN right channel" );
       if( !vg_validf( frame_samplerate ) ) 
-         vg_fatal_exit_loop( "NaN sample rate" );
+         vg_fatal_error( "NaN sample rate" );
    }
 
    u32 buffer_length = AUDIO_MIX_FRAME_SIZE;
@@ -1146,7 +1146,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
 
    if( format == k_audio_format_vorbis ){
       if( !clip->path ){
-         vg_fatal_exit_loop( "No path specified, embeded vorbis unsupported" );
+         vg_fatal_error( "No path specified, embeded vorbis unsupported" );
       }
 
       audio_lock();
@@ -1154,17 +1154,17 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
       audio_unlock();
 
       if( !clip->data )
-         vg_fatal_exit_loop( "Audio failed to load" );
+         vg_fatal_error( "Audio failed to load" );
 
       float mb = (float)(clip->size) / (1024.0f*1024.0f);
       vg_info( "Loaded audio clip '%s' (%.1fmb)\n", clip->path, mb );
    }
    else if( format == k_audio_format_stereo ){
-      vg_fatal_exit_loop( "Unsupported format (Stereo uncompressed)" );
+      vg_fatal_error( "Unsupported format (Stereo uncompressed)" );
    }
    else if( format == k_audio_format_bird ){
       if( !clip->data ){
-         vg_fatal_exit_loop( "No data, external birdsynth unsupported" );
+         vg_fatal_error( "No data, external birdsynth unsupported" );
       }
 
       u32 total_size  = clip->size + sizeof(struct synth_bird);
@@ -1172,7 +1172,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
           total_size  = vg_align8( total_size );
 
       if( total_size > AUDIO_DECODE_SIZE )
-         vg_fatal_exit_loop( "Bird coding too long\n" );
+         vg_fatal_error( "Bird coding too long\n" );
 
       struct synth_bird *bird = vg_linear_alloc( lin_alloc, total_size );
       memcpy( &bird->settings, clip->data, clip->size );
@@ -1184,7 +1184,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
    }
    else{
       if( !clip->path ){
-         vg_fatal_exit_loop( "No path specified, embeded mono unsupported" );
+         vg_fatal_error( "No path specified, embeded mono unsupported" );
       }
 
       vg_linear_clear( vg_mem.scratch );
@@ -1204,7 +1204,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
       if( !decoder ){
          vg_error( "stb_vorbis_open_memory failed on '%s' (%d)\n", 
                      clip->path, err );
-         vg_fatal_exit_loop( "Vorbis decode error" );
+         vg_fatal_error( "Vorbis decode error" );
       }
 
       /* only mono is supported in uncompressed */
@@ -1220,7 +1220,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
                               decoder, clip->data, length_samples );
 
       if( read_samples != length_samples )
-         vg_fatal_exit_loop( "Decode error" );
+         vg_fatal_error( "Decode error" );
 
       float mb = (float)(data_size) / (1024.0f*1024.0f);
       vg_info( "Loaded audio clip '%s' (%.1fmb) %u samples\n", clip->path, mb,
@@ -1240,7 +1240,7 @@ VG_STATIC void audio_require_clip_loaded( audio_clip *clip )
       return;
 
    audio_unlock();
-   vg_fatal_exit_loop( "Must load audio clip before playing! \n" );
+   vg_fatal_error( "Must load audio clip before playing! \n" );
 }
 
 /*