Mercurial > molko

changeset 467:7420c78018dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: sound -> mlk_sound
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 11:06:45 +0100
parents 39dd7c66ebfd
children 91ce23a36143
files examples/example-audio/example-audio.c libmlk-core/mlk/core/sound.c libmlk-core/mlk/core/sound.h libmlk-example/mlk/example/registry.c libmlk-example/mlk/example/registry.h libmlk-example/mlk/example/spell-fire.c
diffstat 6 files changed, 33 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-audio/example-audio.c	Mon Feb 27 11:03:13 2023 +0100
+++ b/examples/example-audio/example-audio.c	Mon Feb 27 11:06:45 2023 +0100
@@ -40,7 +40,7 @@
 
 static struct state *states[1];
 static struct mlk_music music;
-static struct sound sound;
+static struct mlk_sound sound;
 
 static struct label label_music = {
 	.text = "Music: <Space> play, <p> pause, <r> resume, <q> stop, <l> loop.",
@@ -64,7 +64,7 @@
 	if (window_open("Example - Audio", W, H) < 0)
 		mlk_panic();
 	if (mlk_music_openmem(&music, assets_music_vabsounds_romance, sizeof (assets_music_vabsounds_romance)) < 0 ||
-	    sound_openmem(&sound, assets_sounds_fire, sizeof (assets_sounds_fire)) < 0)
+	    mlk_sound_openmem(&sound, assets_sounds_fire, sizeof (assets_sounds_fire)) < 0)
 		mlk_panic();
 }
 
@@ -83,7 +83,7 @@
 
 	switch (ev->type) {
 	case MLK_EVENT_CLICKDOWN:
-		if (sound_play(&sound) < 0)
+		if (mlk_sound_play(&sound) < 0)
 			mlk_panic();
 		break;
 	case MLK_EVENT_KEYDOWN:
@@ -140,7 +140,7 @@
 	mlk_game_loop();
 
 	mlk_music_finish(&music);
-	sound_finish(&sound);
+	mlk_sound_finish(&sound);
 }
 
 int
--- a/libmlk-core/mlk/core/sound.c	Mon Feb 27 11:03:13 2023 +0100
+++ b/libmlk-core/mlk/core/sound.c	Mon Feb 27 11:06:45 2023 +0100
@@ -27,7 +27,7 @@
 #define SOURCE(snd) ((const struct audiostream *)snd->handle)->source
 
 int
-sound_open(struct sound *snd, const char *path)
+mlk_sound_open(struct mlk_sound *snd, const char *path)
 {
 	assert(snd);
 	assert(path);
@@ -36,7 +36,7 @@
 }
 
 int
-sound_openmem(struct sound *snd, const void *buffer, size_t buffersz)
+mlk_sound_openmem(struct mlk_sound *snd, const void *buffer, size_t buffersz)
 {
 	assert(snd);
 	assert(buffer);
@@ -45,15 +45,15 @@
 }
 
 int
-sound_ok(const struct sound *snd)
+mlk_sound_ok(const struct mlk_sound *snd)
 {
 	return snd && snd->handle;
 }
 
 int
-sound_play(struct sound *snd)
+mlk_sound_play(struct mlk_sound *snd)
 {
-	assert(sound_ok(snd));
+	assert(mlk_sound_ok(snd));
 
 	alSourcePlay(SOURCE(snd));
 
@@ -61,36 +61,36 @@
 }
 
 void
-sound_pause(struct sound *snd)
+mlk_sound_pause(struct mlk_sound *snd)
 {
-	assert(sound_ok(snd));
+	assert(mlk_sound_ok(snd));
 
 	alSourcePause(SOURCE(snd));
 }
 
 void
-sound_resume(struct sound *snd)
+mlk_sound_resume(struct mlk_sound *snd)
 {
-	assert(sound_ok(snd));
+	assert(mlk_sound_ok(snd));
 
 	alSourcePlay(SOURCE(snd));
 }
 
 void
-sound_stop(struct sound *snd)
+mlk_sound_stop(struct mlk_sound *snd)
 {
-	assert(sound_ok(snd));
+	assert(mlk_sound_ok(snd));
 
 	alSourceStop(SOURCE(snd));
 }
 
 void
-sound_finish(struct sound *snd)
+mlk_sound_finish(struct mlk_sound *snd)
 {
 	assert(snd);
 
 	if (snd->handle) {
-		sound_stop(snd);
+		mlk_sound_stop(snd);
 		audiostream_finish(snd->handle);
 	}
 
--- a/libmlk-core/mlk/core/sound.h	Mon Feb 27 11:03:13 2023 +0100
+++ b/libmlk-core/mlk/core/sound.h	Mon Feb 27 11:06:45 2023 +0100
@@ -23,11 +23,9 @@
 
 #include "core.h"
 
-#define SOUND_CHANNELS_MAX (256)
+#define MLK_SOUND_CHANNELS_MAX (256)
 
-struct vfs_file;
-
-struct sound {
+struct mlk_sound {
 	void *handle;
 	int channel;
 };
@@ -35,31 +33,28 @@
 MLK_CORE_BEGIN_DECLS
 
 int
-sound_open(struct sound *, const char *);
+mlk_sound_open(struct mlk_sound *, const char *);
 
 int
-sound_openmem(struct sound *, const void *, size_t);
+mlk_sound_openmem(struct mlk_sound *, const void *, size_t);
 
 int
-sound_openvfs(struct sound *, struct vfs_file *);
-
-int
-sound_ok(const struct sound *);
+mlk_sound_ok(const struct mlk_sound *);
 
 int
-sound_play(struct sound *);
+mlk_sound_play(struct mlk_sound *);
 
 void
-sound_pause(struct sound *);
+mlk_sound_pause(struct mlk_sound *);
 
 void
-sound_resume(struct sound *);
+mlk_sound_resume(struct mlk_sound *);
 
 void
-sound_stop(struct sound *);
+mlk_sound_stop(struct mlk_sound *);
 
 void
-sound_finish(struct sound *);
+mlk_sound_finish(struct mlk_sound *);
 
 MLK_CORE_END_DECLS
 
--- a/libmlk-example/mlk/example/registry.c	Mon Feb 27 11:03:13 2023 +0100
+++ b/libmlk-example/mlk/example/registry.c	Mon Feb 27 11:06:45 2023 +0100
@@ -39,7 +39,7 @@
 struct texture registry_images[REGISTRY_IMAGE_NUM];
 struct texture registry_textures[REGISTRY_TEXTURE_NUM];
 struct sprite registry_sprites[REGISTRY_TEXTURE_NUM];
-struct sound registry_sounds[REGISTRY_SOUND_NUM];
+struct mlk_sound registry_sounds[REGISTRY_SOUND_NUM];
 
 #define REGISTRY_IMAGE(i, data) \
 	{ (i), (data), sizeof (data) }
@@ -113,9 +113,9 @@
 load_sounds(void)
 {
 	for (size_t i = 0; i < UTIL_SIZE(sounds); ++i) {
-		struct sound *sound = &registry_sounds[sounds[i].index];
+		struct mlk_sound *sound = &registry_sounds[sounds[i].index];
 
-		if (sound_openmem(sound, sounds[i].data, sounds[i].datasz) < 0)
+		if (mlk_sound_openmem(sound, sounds[i].data, sounds[i].datasz) < 0)
 			mlk_panic();
 	}
 }
@@ -136,5 +136,5 @@
 	for (size_t i = 0; i < UTIL_SIZE(registry_textures); ++i)
 		texture_finish(&registry_textures[i]);
 	for (size_t i = 0; i < UTIL_SIZE(registry_sounds); ++i)
-		sound_finish(&registry_sounds[i]);
+		mlk_sound_finish(&registry_sounds[i]);
 }
--- a/libmlk-example/mlk/example/registry.h	Mon Feb 27 11:03:13 2023 +0100
+++ b/libmlk-example/mlk/example/registry.h	Mon Feb 27 11:06:45 2023 +0100
@@ -55,7 +55,7 @@
 extern struct texture registry_images[REGISTRY_IMAGE_NUM];
 extern struct texture registry_textures[REGISTRY_TEXTURE_NUM];
 extern struct sprite registry_sprites[REGISTRY_TEXTURE_NUM];
-extern struct sound registry_sounds[REGISTRY_SOUND_NUM];
+extern struct mlk_sound registry_sounds[REGISTRY_SOUND_NUM];
 
 void
 registry_init(void);
--- a/libmlk-example/mlk/example/spell-fire.c	Mon Feb 27 11:03:13 2023 +0100
+++ b/libmlk-example/mlk/example/spell-fire.c	Mon Feb 27 11:06:45 2023 +0100
@@ -116,7 +116,7 @@
 	mlk_animation_init(&self->animation, &registry_sprites[REGISTRY_TEXTURE_EXPLOSION], 12);
 	mlk_animation_start(&self->animation);
 
-	sound_play(&registry_sounds[REGISTRY_SOUND_FIRE]);
+	mlk_sound_play(&registry_sounds[REGISTRY_SOUND_FIRE]);
 	battle_state_rendering(bt, &self->drawable);
 }