Mercurial > molko
changeset 456:a6933cd252b7
core: music -> mlk_music
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 18 Feb 2023 21:03:19 +0100 |
parents | c4f31658104d |
children | 04797b35565c |
files | libmlk-core/mlk/core/music.c libmlk-core/mlk/core/music.h libmlk-rpg/mlk/rpg/battle-state-lost.c libmlk-rpg/mlk/rpg/battle-state-victory.c libmlk-rpg/mlk/rpg/battle.c libmlk-rpg/mlk/rpg/battle.h |
diffstat | 6 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/libmlk-core/mlk/core/music.c Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-core/mlk/core/music.c Sat Feb 18 21:03:19 2023 +0100 @@ -26,7 +26,7 @@ #define SOURCE(mus) ((const struct audiostream *)mus->handle)->source int -music_open(struct music *mus, const char *path) +mlk_music_open(struct mlk_music *mus, const char *path) { assert(mus); assert(path); @@ -35,7 +35,7 @@ } int -music_openmem(struct music *mus, const void *buffer, size_t buffersz) +mlk_music_openmem(struct mlk_music *mus, const void *buffer, size_t buffersz) { assert(mus); assert(buffer); @@ -44,13 +44,13 @@ } int -music_ok(const struct music *mus) +mlk_music_ok(const struct mlk_music *mus) { return mus && mus->handle; } int -music_play(struct music *mus, enum music_flags flags) +mlk_music_play(struct mlk_music *mus, enum mlk_music_flags flags) { assert(mus); @@ -66,36 +66,36 @@ } void -music_pause(struct music *mus) +mlk_music_pause(struct mlk_music *mus) { - assert(music_ok(mus)); + assert(mlk_music_ok(mus)); alSourcePause(SOURCE(mus)); } void -music_resume(struct music *mus) +mlk_music_resume(struct mlk_music *mus) { - assert(music_ok(mus)); + assert(mlk_music_ok(mus)); alSourcePlay(SOURCE(mus)); } void -music_stop(struct music *mus) +mlk_music_stop(struct mlk_music *mus) { - assert(music_ok(mus)); + assert(mlk_music_ok(mus)); alSourceStop(SOURCE(mus)); } void -music_finish(struct music *mus) +mlk_music_finish(struct mlk_music *mus) { assert(mus); if (mus->handle) { - music_stop(mus); + mlk_music_stop(mus); audiostream_finish(mus->handle); }
--- a/libmlk-core/mlk/core/music.h Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-core/mlk/core/music.h Sat Feb 18 21:03:19 2023 +0100 @@ -23,40 +23,40 @@ #include "core.h" -enum music_flags { +enum mlk_music_flags { MUSIC_NONE = 0, MUSIC_LOOP = (1 << 0) }; -struct music { +struct mlk_music { void *handle; }; CORE_BEGIN_DECLS int -music_open(struct music *, const char *); +mlk_music_open(struct mlk_music *, const char *); int -music_openmem(struct music *, const void *, size_t); +mlk_music_openmem(struct mlk_music *, const void *, size_t); int -music_ok(const struct music *); +mlk_music_ok(const struct mlk_music *); int -music_play(struct music *, enum music_flags); +mlk_music_play(struct mlk_music *, enum mlk_music_flags); void -music_pause(struct music *); +mlk_music_pause(struct mlk_music *); void -music_resume(struct music *); +mlk_music_resume(struct mlk_music *); void -music_stop(struct music *); +mlk_music_stop(struct mlk_music *); void -music_finish(struct music *); +mlk_music_finish(struct mlk_music *); CORE_END_DECLS
--- a/libmlk-rpg/mlk/rpg/battle-state-lost.c Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle-state-lost.c Sat Feb 18 21:03:19 2023 +0100 @@ -82,7 +82,7 @@ bt->status = BATTLE_STATUS_LOST; if (bt->music[2]) - music_play(bt->music[2], MUSIC_NONE); + mlk_music_play(bt->music[2], MUSIC_NONE); } void
--- a/libmlk-rpg/mlk/rpg/battle-state-victory.c Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle-state-victory.c Sat Feb 18 21:03:19 2023 +0100 @@ -83,7 +83,7 @@ bt->status = BATTLE_STATUS_WON; if (bt->music[1]) - music_play(bt->music[1], MUSIC_NONE); + mlk_music_play(bt->music[1], MUSIC_NONE); } void
--- a/libmlk-rpg/mlk/rpg/battle.c Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle.c Sat Feb 18 21:03:19 2023 +0100 @@ -244,7 +244,7 @@ /* Play music if present. */ if (bt->music[0]) - music_play(bt->music[0], MUSIC_LOOP); + mlk_music_play(bt->music[0], MUSIC_LOOP); battle_order(bt); }
--- a/libmlk-rpg/mlk/rpg/battle.h Sat Feb 18 20:59:48 2023 +0100 +++ b/libmlk-rpg/mlk/rpg/battle.h Sat Feb 18 21:03:19 2023 +0100 @@ -39,7 +39,7 @@ struct character; struct inventory; struct item; -struct music; +struct mlk_music; struct selection; struct spell; struct theme; @@ -78,7 +78,7 @@ struct battle_entity **ordercur; size_t ordersz; struct texture *background; - struct music *music[3]; + struct mlk_music *music[3]; struct theme *theme; struct mlk_drawable_stack *effects; struct mlk_action_stack *actions;