projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grind sound
[carveJwlIkooP6JGAAIwe30JlM.git]
/
audio.h
diff --git
a/audio.h
b/audio.h
index 43adf052e289077ef860e1ef8ba82f1452b3d1b8..f13280be013e1a7c614c2778320c07ade983389b 100644
(file)
--- a/
audio.h
+++ b/
audio.h
@@
-19,7
+19,10
@@
audio_clip audio_board[] =
{ .path="sound/skate.ogg" },
{ .path="sound/wheel.ogg" },
{ .path="sound/slide.ogg" },
{ .path="sound/skate.ogg" },
{ .path="sound/wheel.ogg" },
{ .path="sound/slide.ogg" },
- { .path="sound/reverb.ogg" }
+ { .path="sound/reverb.ogg" },
+ { .path="sound/grind_loop.ogg" },
+ { .path="sound/grind_enter.ogg" },
+ { .path="sound/grind_exit.ogg" }
};
audio_clip audio_splash =
};
audio_clip audio_splash =
@@
-149,6
+152,11
@@
audio_player audio_player3 =
.name = "Player3",
};
.name = "Player3",
};
+audio_player audio_player4 =
+{
+ .name = "Player4",
+};
+
audio_player audio_player_extra =
{
.name = "PlayerInst"
audio_player audio_player_extra =
{
.name = "PlayerInst"
@@
-165,6
+173,7
@@
VG_STATIC void audio_init(void)
audio_player_init( &audio_player1 );
audio_player_init( &audio_player2 );
audio_player_init( &audio_player3 );
audio_player_init( &audio_player1 );
audio_player_init( &audio_player2 );
audio_player_init( &audio_player3 );
+ audio_player_init( &audio_player4 );
audio_player_init( &audio_player_gate );
audio_player_init( &ambient_player );
audio_player_init( &ambient_sprites[0] );
audio_player_init( &audio_player_gate );
audio_player_init( &ambient_player );
audio_player_init( &ambient_sprites[0] );
@@
-198,6
+207,7
@@
VG_STATIC void audio_init(void)
audio_player_set_flags( &audio_player0, flags );
audio_player_set_flags( &audio_player1, flags );
audio_player_set_flags( &audio_player2, flags );
audio_player_set_flags( &audio_player0, flags );
audio_player_set_flags( &audio_player1, flags );
audio_player_set_flags( &audio_player2, flags );
+ audio_player_set_flags( &audio_player4, flags );
audio_player_set_flags( &audio_player_gate, flags );
audio_player_set_flags( &audio_player3, AUDIO_FLAG_LOOP );
audio_player_set_flags( &ambient_player, AUDIO_FLAG_LOOP );
audio_player_set_flags( &audio_player_gate, flags );
audio_player_set_flags( &audio_player3, AUDIO_FLAG_LOOP );
audio_player_set_flags( &ambient_player, AUDIO_FLAG_LOOP );
@@
-215,6
+225,7
@@
VG_STATIC void audio_init(void)
audio_player_playclip( &audio_player1, &audio_board[1] );
audio_player_playclip( &audio_player2, &audio_board[2] );
audio_player_playclip( &audio_player3, &audio_board[3] );
audio_player_playclip( &audio_player1, &audio_board[1] );
audio_player_playclip( &audio_player2, &audio_board[2] );
audio_player_playclip( &audio_player3, &audio_board[3] );
+ audio_player_playclip( &audio_player4, &audio_board[4] );
audio_player_playclip( &ambient_player, &audio_ambience[0] );
audio_player_playclip( &audio_player_gate, &audio_gate_ambient );
audio_player_playclip( &ambient_player, &audio_ambience[0] );
audio_player_playclip( &audio_player_gate, &audio_gate_ambient );
@@
-237,7
+248,7
@@
VG_STATIC void audio_init(void)
});
}
});
}
-VG_STATIC void audio_free(void
*_
)
+VG_STATIC void audio_free(void)
{
/* TODO! */
vg_warn( "UNIMPLEMENTED: audio_free()\n" );
{
/* TODO! */
vg_warn( "UNIMPLEMENTED: audio_free()\n" );