rodeo bump

2 files changed, 5 insertions, 11 deletions

diff --git a/external/RodeoKit b/external/RodeoKit
-Subproject dedc1d9ec3b3e4cdc5c477d4f00625926fa23f1
+Subproject e81eb2369cbf21ca66fc49d2d09aab270131ea8
diff --git a/src/main.c b/src/main.c
index 00ece59..e8e6b19 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,6 +7,7 @@ cstr renderer;
 float time_var;
 
 rodeo_audio_sound_t *scratch = NULL;
+rodeo_audio_music_t *music = NULL;
 
 typedef
 struct
@@ -121,22 +122,17 @@ main_loop(void)
 
 		if(*(bool*)play_sound_input(NULL, NULL))
 		{
-			rodeo_audio_sound_play(scratch, 0);
+			rodeo_audio_sound_play(scratch);
 		}
 		if(*(bool*)play_sound_input2(NULL, NULL))
 		{
-			rodeo_audio_sound_play(scratch, 1);
+			rodeo_audio_music_play_fadeIn(music, 1000);
 		}
 		if(*(bool*)play_sound_input3(NULL, NULL))
 		{
-			rodeo_audio_sound_play(scratch, 2);
+			rodeo_audio_music_stop_fadeOut(1000);
 		}
 
-		rodeo_audio_channelPool_volume_set(1, 0.75);
-		rodeo_audio_channelPool_volume_set(2, 0.25);
-		
-		//play_sound_input(NULL, NULL);
-
 		if(*(bool*)summon_units_input(NULL, NULL)) 
 		{
 			summon_units();
@@ -289,9 +285,7 @@ main(void)
 
 		texture = rodeo_texture_2d_create_from_path(cstr_lit("assets/orc.png"));
 		scratch = rodeo_audio_sound_create_from_path(cstr_lit("assets/sample.wav"));
-
-		rodeo_audio_channelPool_volume_set(1, 0.75);
-		rodeo_audio_channelPool_volume_set(2, 0.25);
+		music = rodeo_audio_music_create_from_path(cstr_lit("assets/music.ogg"));
 
 		rodeo_mainLoop_run(
 			main_loop