latest

[vg.git] / vg_audio.h

diff --git a/vg_audio.h b/vg_audio.h
index fc09d103aa5338167100acdd0738679d656e3aba..edbe8a2681b4a169f741a183aca611b5208cac46 100644 (file)
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -217,18 +217,18 @@ VG_STATIC void vg_audio_init(void)
    vg_audio.mux_sync = SDL_CreateMutex();
 
    /* TODO: Move here? */
-   vg_convar_push( (struct vg_convar){
+   vg_var_push( (struct vg_var){
       .name = "debug_audio",
       .data = &vg_audio.debug_ui,
-      .data_type = k_convar_dtype_i32,
+      .data_type = k_var_dtype_i32,
       .opt_i32 = { .min=0, .max=1, .clamp=1 },
       .persistent = 1
    });
 
-   vg_convar_push( (struct vg_convar){
+   vg_var_push( (struct vg_var){
       .name = "volume",
       .data = &vg_audio.volume_console,
-      .data_type = k_convar_dtype_f32,
+      .data_type = k_var_dtype_f32,
       .opt_f32 = { .min=0.0f, .max=2.0f, .clamp=1 },
       .persistent = 1
    });
@@ -639,7 +639,7 @@ VG_STATIC void audio_entity_get_samples( aatree_ptr id, u32 count, float *buf )
       if( source_mode == k_audio_source_mono )
       {
          i16 *src_buffer = ent->info.source->data,
-             *src = &src_buffer[cursor];
+             *src        = &src_buffer[cursor];
 
          audio_decode_uncompressed_mono( src, samples_this_run, dst );
       }
@@ -816,7 +816,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc )
           data_size      = length_samples * sizeof(i16);
 
       audio_lock();
-      clip->data = vg_linear_alloc( lin_alloc, data_size );
+      clip->data = vg_linear_alloc( lin_alloc, vg_align8(data_size) );
       clip->size = length_samples;
       audio_unlock();