dusting

[vg.git] / vg_audio.h

diff --git a/vg_audio.h b/vg_audio.h
index 75a8c7ea97cb829a42a6aa839b77d1f90e52eb0e..cf6651ed6930e4777c3dff5d18aeef3affe955b6 100644 (file)
--- a/vg_audio.h
+++ b/vg_audio.h
@@ -51,13 +51,6 @@
 #define AUDIO_FLAG_NO_DOPPLER 0x2
 #define AUDIO_FLAG_SPACIAL_3D 0x4
 #define AUDIO_FLAG_AUTO_START 0x8
-
-/* Vorbis will ALWAYS use the maximum amount of channels it can */
-//#define AUDIO_FLAG_MONO       0x100 NOTE: This is the default, so its not used
-//#define AUDIO_FLAG_STEREO     0x200
-//#define AUDIO_FLAG_VORBIS     0x400
-//#define AUDIO_FLAG_BIRD_SYNTH 0x800
-
 #define AUDIO_FLAG_FORMAT     0x1E00
 
 enum audio_format
@@ -193,7 +186,7 @@ static struct vg_audio_system{
    }
    channels[ AUDIO_CHANNELS ];
 
-   int               debug_ui, debug_ui_3d;
+   int               debug_ui, debug_ui_3d, debug_dsp;
 
    v3f               internal_listener_pos,
                      internal_listener_ears,
@@ -266,24 +259,14 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int frame_count );
 VG_STATIC void vg_audio_init(void)
 {
    /* TODO: Move here? */
-   vg_var_push( (struct vg_var){
-      .name = "debug_audio",
-      .data = &vg_audio.debug_ui,
-      .data_type = k_var_dtype_i32,
-      .opt_i32 = { .min=0, .max=1, .clamp=1 },
-      .persistent = 1
-   });
-
-   vg_var_push( (struct vg_var){
-      .name = "volume",
-      .data = &vg_audio.external_global_volume,
-      .data_type = k_var_dtype_f32,
-      .opt_f32 = { .min=0.0f, .max=2.0f, .clamp=1 },
-      .persistent = 1
-   });
+   vg_console_reg_var( "debug_audio", &vg_audio.debug_ui, 
+                        k_var_dtype_i32, VG_VAR_CHEAT );
+   vg_console_reg_var( "debug_dsp", &vg_audio.debug_dsp,
+                        k_var_dtype_i32, VG_VAR_CHEAT );
+   vg_console_reg_var( "volume", &vg_audio.external_global_volume,
+                        k_var_dtype_f32, VG_VAR_PERSISTENT );
 
    /* allocate memory */
-
    /* 32mb fixed */
    vg_audio.audio_pool = 
       vg_create_linear_allocator( vg_mem.rtmemory, 1024*1024*32, 
@@ -1139,7 +1122,7 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count )
 
    vg_audio.samples_last = frame_count;
 
-   if( vg_audio.debug_ui ){
+   if( vg_audio.debug_dsp ){
       vg_dsp_update_texture();
    }
 
@@ -1297,8 +1280,10 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv )
    vg_uictx.cursor[2] = 150;
    vg_uictx.cursor[3] = 12;
 
-   ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 };
-   ui_push_image( view_thing, vg_dsp.view_texture );
+   if( vg_audio.debug_dsp ){
+      ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 };
+      ui_push_image( view_thing, vg_dsp.view_texture );
+   }
    
    float mb1      = 1024.0f*1024.0f,
          usage    = vg_linear_get_cur( vg_audio.audio_pool )      / mb1,