Skip to content

M
mpd
Commit 4e080a9b authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/gme: replace macro GME_BUF_SIZE

Added macros with better names: GME_BUFFER_FRAMES, GME_BUFFER_SAMPLES (the former only used to calculate the latter).
parent d5574080
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
src/decoder/gme_decoder_plugin.c
View file @ 4e080a9b
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "gme" #define G_LOG_DOMAIN "gme"
#define GME_BUF_SIZE 4096
enum { enum {
GME_SAMPLE_RATE = 44100, GME_SAMPLE_RATE = 44100,
GME_CHANNELS = 2, GME_CHANNELS = 2,
GME_BUFFER_FRAMES = 2048,
GME_BUFFER_SAMPLES = GME_BUFFER_FRAMES * GME_CHANNELS,
}; };
static void static void
...@@ -24,7 +24,7 @@ gme_file_decode(struct decoder *decoder, const char *path_fs) ...@@ -24,7 +24,7 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
gme_info_t *ti; gme_info_t *ti;
struct audio_format audio_format; struct audio_format audio_format;
enum decoder_command cmd; enum decoder_command cmd;
short buf[GME_BUF_SIZE]; short buf[GME_BUFFER_SAMPLES];
const char* gme_err; const char* gme_err;
gme_err = gme_open_file(path_fs, &emu, GME_SAMPLE_RATE); gme_err = gme_open_file(path_fs, &emu, GME_SAMPLE_RATE);
...@@ -62,7 +62,8 @@ gme_file_decode(struct decoder *decoder, const char *path_fs) ...@@ -62,7 +62,8 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
/* play */ /* play */
do { do {
if((gme_err = gme_play(emu, GME_BUF_SIZE, buf)) != NULL){ gme_err = gme_play(emu, GME_BUFFER_SAMPLES, buf);
if (gme_err != NULL) {
g_warning("%s", gme_err); g_warning("%s", gme_err);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment