bring audio code inline with current standards

[fishladder.git] / fishladder_resources.h

diff --git a/fishladder_resources.h b/fishladder_resources.h
index a029421bebe4625a12979c768313da9b83f9dfdd..841cf93ffb366d43a16aaa09f9e4d25290edb3f1 100644 (file)
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -1,3 +1,6 @@
+// TEXTURES
+// ===========================================================================================================
+
 vg_tex2d tex_tile_data =       { .path = "textures/tileset.png" };
 vg_tex2d tex_tile_detail = { .path = "textures/tile_overlays.png" };
 vg_tex2d tex_wood =                    { .path = "textures/wood.png" };
@@ -5,19 +8,22 @@ vg_tex2d tex_ball =                   { .path = "textures/ball.png", .flags = VG_TEXTURE_CLAMP
 
 vg_tex2d *texture_list[] = { &tex_tile_detail, &tex_tile_data, &tex_wood, &tex_ball };
 
-sfx_system_t audio_system_sfx = 
+// AUDIO
+// ===========================================================================================================
+
+sfx_vol_control audio_volume_sfx =             { .val = 1.0f, .name = "Sound effects" };
+sfx_vol_control audio_volume_music =   { .val = 1.0f, .name = "Music" };
+
+sfx_system audio_system_sfx = 
 {
  .vol = 1.f,
- .spd = 1.f,
  .ch = 1,
- .cur = 0,
- .vol_src = &g_vol_sfx,
- .flags = 0x00,
- .fadeout = FADEOUT_LENGTH,
+ .vol_src = &audio_volume_sfx,
+ .fadeout_length = FADEOUT_LENGTH,
  .name = "sfx"
 };
 
-sfx_set_t audio_tile_mod = 
+sfx_set audio_tile_mod = 
 {
  .sources = "\
 sound/mod_01.ogg\0\