Mercurial > molko

changeset 471:3761e33d429e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: sys -> mlk_sys
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 11:18:52 +0100
parents 5690bbf12528
children bc5483849614
files examples/example-battle/example-battle.c libmlk-core/mlk/core/core.c libmlk-core/mlk/core/music.c libmlk-core/mlk/core/sound.c libmlk-core/mlk/core/sys.c libmlk-core/mlk/core/sys.h libmlk-core/mlk/core/sys_p.h
diffstat 7 files changed, 44 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-battle/example-battle.c	Mon Feb 27 11:18:39 2023 +0100
+++ b/examples/example-battle/example-battle.c	Mon Feb 27 11:18:52 2023 +0100
@@ -329,7 +329,7 @@
 	registry_finish();
 	theme_finish();
 	window_finish();
-	sys_finish();
+	mlk_sys_finish();
 }
 
 int
--- a/libmlk-core/mlk/core/core.c	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/core.c	Mon Feb 27 11:18:52 2023 +0100
@@ -32,7 +32,7 @@
 
 	srand(time(NULL));
 
-	if (sys_init(organization, name) < 0)
+	if (mlk_sys_init(organization, name) < 0)
 		return -1;
 
 	return 0;
@@ -41,5 +41,5 @@
 void
 mlk_core_finish(void)
 {
-	sys_finish();
+	mlk_sys_finish();
 }
--- a/libmlk-core/mlk/core/music.c	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/music.c	Mon Feb 27 11:18:52 2023 +0100
@@ -23,7 +23,7 @@
 #include "music.h"
 #include "sys_p.h"
 
-#define SOURCE(mus) ((const struct audiostream *)mus->handle)->source
+#define SOURCE(mus) ((const struct mlk__audiostream *)mus->handle)->source
 
 int
 mlk_music_open(struct mlk_music *mus, const char *path)
@@ -31,7 +31,7 @@
 	assert(mus);
 	assert(path);
 
-	return audiostream_open((struct audiostream **)&mus->handle, path);
+	return mlk__audiostream_open((struct mlk__audiostream **)&mus->handle, path);
 }
 
 int
@@ -40,7 +40,7 @@
 	assert(mus);
 	assert(buffer);
 
-	return audiostream_openmem((struct audiostream **)&mus->handle, buffer, buffersz);
+	return mlk__audiostream_openmem((struct mlk__audiostream **)&mus->handle, buffer, buffersz);
 }
 
 int
@@ -96,7 +96,7 @@
 
 	if (mus->handle) {
 		mlk_music_stop(mus);
-		audiostream_finish(mus->handle);
+		mlk__audiostream_finish(mus->handle);
 	}
 
 	memset(mus, 0, sizeof (*mus));
--- a/libmlk-core/mlk/core/sound.c	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/sound.c	Mon Feb 27 11:18:52 2023 +0100
@@ -24,7 +24,7 @@
 #include "sound.h"
 #include "sys_p.h"
 
-#define SOURCE(snd) ((const struct audiostream *)snd->handle)->source
+#define SOURCE(snd) ((const struct mlk__audiostream *)snd->handle)->source
 
 int
 mlk_sound_open(struct mlk_sound *snd, const char *path)
@@ -32,7 +32,7 @@
 	assert(snd);
 	assert(path);
 
-	return audiostream_open((struct audiostream **)&snd->handle, path);
+	return mlk__audiostream_open((struct mlk__audiostream **)&snd->handle, path);
 }
 
 int
@@ -41,7 +41,7 @@
 	assert(snd);
 	assert(buffer);
 
-	return audiostream_openmem((struct audiostream **)&snd->handle, buffer, buffersz);
+	return mlk__audiostream_openmem((struct mlk__audiostream **)&snd->handle, buffer, buffersz);
 }
 
 int
@@ -91,7 +91,7 @@
 
 	if (snd->handle) {
 		mlk_sound_stop(snd);
-		audiostream_finish(snd->handle);
+		mlk__audiostream_finish(snd->handle);
 	}
 
 	memset(snd, 0, sizeof (*snd));
--- a/libmlk-core/mlk/core/sys.c	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/sys.c	Mon Feb 27 11:18:52 2023 +0100
@@ -48,8 +48,8 @@
 #include "sys.h"
 #include "sys_p.h"
 
-ALCdevice *audio_dev = NULL;
-ALCcontext *audio_ctx = NULL;
+ALCdevice *mlk__audio_dev = NULL;
+ALCcontext *mlk__audio_ctx = NULL;
 
 static struct {
 	char organization[128];
@@ -76,7 +76,7 @@
 }
 
 static const char *
-user_directory(enum sys_dir kind)
+user_directory(enum mlk_sys_dir kind)
 {
 	/* Kept for future use. */
 	(void)kind;
@@ -171,7 +171,7 @@
 }
 
 int
-sys_init(const char *organization, const char *name)
+mlk_sys_init(const char *organization, const char *name)
 {
 #if defined(__MINGW64__)
 	/* On MinGW buffering leads to painful debugging. */
@@ -198,24 +198,24 @@
 	putenv("ALSOFT_LOGLEVEL=0");
 #endif
 
-	if (!(audio_dev = alcOpenDevice(NULL)))
+	if (!(mlk__audio_dev = alcOpenDevice(NULL)))
 		return errorf("unable to create audio device");
-	if (!(audio_ctx = alcCreateContext(audio_dev, NULL)))
+	if (!(mlk__audio_ctx = alcCreateContext(mlk__audio_dev, NULL)))
 		return errorf("unable to create audio context");
 
-	alcMakeContextCurrent(audio_ctx);
+	alcMakeContextCurrent(mlk__audio_ctx);
 
 	return 0;
 }
 
 const char *
-sys_dir(enum sys_dir kind)
+mlk_sys_dir(enum mlk_sys_dir kind)
 {
 	return user_directory(kind);
 }
 
 int
-sys_mkdir(const char *directory)
+mlk_sys_mkdir(const char *directory)
 {
 	char path[PATH_MAX], *p;
 
@@ -248,7 +248,7 @@
 }
 
 void
-sys_finish(void)
+mlk_sys_finish(void)
 {
 	TTF_Quit();
 	IMG_Quit();
@@ -256,20 +256,20 @@
 
 	alcMakeContextCurrent(NULL);
 
-	if (audio_ctx) {
-		alcDestroyContext(audio_ctx);
-		audio_ctx = NULL;
+	if (mlk__audio_ctx) {
+		alcDestroyContext(mlk__audio_ctx);
+		mlk__audio_ctx = NULL;
 	}
-	if (audio_dev) {
-		alcCloseDevice(audio_dev);
-		audio_dev = NULL;
+	if (mlk__audio_dev) {
+		alcCloseDevice(mlk__audio_dev);
+		mlk__audio_dev = NULL;
 	}
 }
 
 static int
-create_audiostream(struct audiostream **ptr, SNDFILE *file, const SF_INFO *info)
+create_audiostream(struct mlk__audiostream **ptr, SNDFILE *file, const SF_INFO *info)
 {
-	struct audiostream *stream;
+	struct mlk__audiostream *stream;
 	int ret = 0;
 
 	stream = mlk_alloc_new(1, sizeof (*stream));
@@ -301,7 +301,7 @@
 }
 
 int
-audiostream_open(struct audiostream **stream, const char *path)
+mlk__audiostream_open(struct mlk__audiostream **stream, const char *path)
 {
 	assert(path);
 
@@ -315,7 +315,7 @@
 }
 
 int
-audiostream_openmem(struct audiostream **stream, const void *data, size_t datasz)
+mlk__audiostream_openmem(struct mlk__audiostream **stream, const void *data, size_t datasz)
 {
 	assert(data);
 
@@ -339,7 +339,7 @@
 }
 
 void
-audiostream_finish(struct audiostream *s)
+mlk__audiostream_finish(struct mlk__audiostream *s)
 {
 	assert(s);
 
--- a/libmlk-core/mlk/core/sys.h	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/sys.h	Mon Feb 27 11:18:52 2023 +0100
@@ -23,23 +23,23 @@
 
 #include "core.h"
 
-enum sys_dir {
-	SYS_DIR_SAVE
+enum mlk_sys_dir {
+	MLK_SYS_DIR_SAVE
 };
 
 MLK_CORE_BEGIN_DECLS
 
 int
-sys_init(const char *, const char *);
+mlk_sys_init(const char *, const char *);
 
 const char *
-sys_dir(enum sys_dir);
+mlk_sys_dir(enum mlk_sys_dir);
 
 int
-sys_mkdir(const char *);
+mlk_sys_mkdir(const char *);
 
 void
-sys_finish(void);
+mlk_sys_finish(void);
 
 MLK_CORE_END_DECLS
 
--- a/libmlk-core/mlk/core/sys_p.h	Mon Feb 27 11:18:39 2023 +0100
+++ b/libmlk-core/mlk/core/sys_p.h	Mon Feb 27 11:18:52 2023 +0100
@@ -31,10 +31,10 @@
 #       include <alc.h>
 #endif
 
-extern ALCdevice *audio_dev;
-extern ALCcontext *audio_ctx;
+extern ALCdevice *mlk__audio_dev;
+extern ALCcontext *mlk__audio_ctx;
 
-struct audiostream {
+struct mlk__audiostream {
 	short *samples;
 	ALsizei samplesz;
 	ALsizei samplerate;
@@ -44,12 +44,12 @@
 };
 
 int
-audiostream_open(struct audiostream **, const char *);
+mlk__audiostream_open(struct mlk__audiostream **, const char *);
 
 int
-audiostream_openmem(struct audiostream **, const void *, size_t);
+mlk__audiostream_openmem(struct mlk__audiostream **, const void *, size_t);
 
 void
-audiostream_finish(struct audiostream *);
+mlk__audiostream_finish(struct mlk__audiostream *);
 
 #endif /* !MLK_CORE_SYS_P_H */