X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=audio.h;h=34ebb3a4ad3a7866468654fcc932a898d4337d76;hb=47941822dae18a018c985847b052e70214a3ccc6;hp=fd212868153367ca2c19c7aad147ffb1adc684e5;hpb=4f96bd0040e35ecb21d353ee2b895129682d22c1;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/audio.h b/audio.h
index fd21286..34ebb3a 100644
--- a/audio.h
+++ b/audio.h
@@ -16,69 +16,68 @@ static int   k_audio_debug_soundscape = 0;
 
 audio_clip audio_board[] =
 {
-   {.path="sound/skate.ogg", .source_mode=k_audio_source_compressed },
-   {.path="sound/wheel.ogg", .source_mode=k_audio_source_compressed },
-   {.path="sound/slide.ogg", .source_mode=k_audio_source_compressed },
-   {.path="sound/reverb.ogg",.source_mode=k_audio_source_compressed }
+   { .path="sound/skate.ogg" },
+   { .path="sound/wheel.ogg" },
+   { .path="sound/slide.ogg" },
+   { .path="sound/reverb.ogg" }
 };
 
 audio_clip audio_splash =
-{ .path = "sound/splash.ogg", .source_mode=k_audio_source_compressed };
+{ .path = "sound/splash.ogg" };
 
 audio_clip audio_jumps[] = {
-   { .path = "sound/jump0.ogg", .source_mode=k_audio_source_compressed, },
-   { .path = "sound/jump1.ogg", .source_mode=k_audio_source_compressed, },
+   { .path = "sound/jump0.ogg" },
+   { .path = "sound/jump1.ogg" },
 };
 
 audio_clip audio_footsteps[] = {
- {.path = "sound/step_concrete0.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete1.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete2.ogg", .source_mode=k_audio_source_compressed,},
- {.path = "sound/step_concrete3.ogg", .source_mode=k_audio_source_compressed,}
+ {.path = "sound/step_concrete0.ogg" },
+ {.path = "sound/step_concrete1.ogg" },
+ {.path = "sound/step_concrete2.ogg" },
+ {.path = "sound/step_concrete3.ogg" }
 };
 
 audio_clip audio_lands[] = {
-   { .path = "sound/land0.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/land1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/land2.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/landsk0.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/landsk1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/onto.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/outo.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/land0.ogg" },
+   { .path = "sound/land1.ogg" },
+   { .path = "sound/land2.ogg" },
+   { .path = "sound/landsk0.ogg" },
+   { .path = "sound/landsk1.ogg" },
+   { .path = "sound/onto.ogg" },
+   { .path = "sound/outo.ogg" },
 };
 
 audio_clip audio_water[] = {
-   { .path = "sound/wave0.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave2.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave3.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave4.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/wave5.ogg", .source_mode=k_audio_source_compressed }
+   { .path = "sound/wave0.ogg" },
+   { .path = "sound/wave1.ogg" },
+   { .path = "sound/wave2.ogg" },
+   { .path = "sound/wave3.ogg" },
+   { .path = "sound/wave4.ogg" },
+   { .path = "sound/wave5.ogg" }
 };
 
 audio_clip audio_grass[] = {
-   { .path = "sound/grass0.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass1.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass2.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/grass3.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/grass0.ogg" },
+   { .path = "sound/grass1.ogg" },
+   { .path = "sound/grass2.ogg" },
+   { .path = "sound/grass3.ogg" },
 };
 
 audio_clip audio_ambience[] =
 {
-   {.path="sound/town_generic.ogg", 
-      .source_mode=k_audio_source_compressed }
+   { .path="sound/town_generic.ogg" }
 };
 
 audio_clip audio_gate_pass = {
-   .path = "sound/gate_pass.ogg", .source_mode=k_audio_source_compressed
+   .path = "sound/gate_pass.ogg"
 };
 
 audio_clip audio_gate_lap = {
-   .path = "sound/gate_lap.ogg", .source_mode=k_audio_source_compressed
+   .path = "sound/gate_lap.ogg"
 };
 
 audio_clip audio_gate_ambient = {
-.path = "sound/gate_ambient.ogg", .source_mode=k_audio_source_compressed
+.path = "sound/gate_ambient.ogg"
 };
 
 audio_player ambient_player =
@@ -92,16 +91,16 @@ audio_player audio_rewind_player =
 };
 
 audio_clip audio_rewind[] = {
-{ .path = "sound/rewind_start.ogg", .source_mode=k_audio_source_compressed },
-{ .path = "sound/rewind_end_1.5.ogg", .source_mode=k_audio_source_compressed},
-{ .path = "sound/rewind_end_2.5.ogg", .source_mode=k_audio_source_compressed },
-{ .path = "sound/rewind_end_6.5.ogg", .source_mode=k_audio_source_compressed },
-{ .path = "sound/rewind_clack.ogg", .source_mode=k_audio_source_compressed },
+{ .path = "sound/rewind_start.ogg" },
+{ .path = "sound/rewind_end_1.5.ogg" },
+{ .path = "sound/rewind_end_2.5.ogg" },
+{ .path = "sound/rewind_end_6.5.ogg" },
+{ .path = "sound/rewind_clack.ogg" },
 };
 
 audio_clip audio_ui[] = {
-   { .path = "sound/ui_click.ogg", .source_mode=k_audio_source_compressed },
-   { .path = "sound/ui_ding.ogg", .source_mode=k_audio_source_compressed },
+   { .path = "sound/ui_click.ogg" },
+   { .path = "sound/ui_ding.ogg" },
 };
 
 audio_player ambient_sprites[4] =
@@ -322,13 +321,13 @@ static void audio_debug_soundscapes(void)
    char buf[64];
    snprintf( buf, 31, "occlusion: %.5f", audio_occlusion_current );
 
-   ui_global_ctx.cursor[0] = 450;
-   ui_global_ctx.cursor[1] = 10;
-   ui_global_ctx.cursor[2] = audio_occlusion_current * 200.0f;
-   ui_global_ctx.cursor[3] = 20;
+   vg_uictx.cursor[0] = 450;
+   vg_uictx.cursor[1] = 10;
+   vg_uictx.cursor[2] = audio_occlusion_current * 200.0f;
+   vg_uictx.cursor[3] = 20;
 
-   gui_fill_rect( ui_global_ctx.cursor, 0x55cccccc );
-   gui_text( ui_global_ctx.cursor, buf, 1, 0 );
+   ui_fill_rect( vg_uictx.cursor, 0x55cccccc );
+   ui_text( vg_uictx.cursor, buf, 1, 0 );
 }
 
 #endif /* AUDIO_H */