oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/gme: added constants for sample rate and channels 

Move into enums.
This commit is contained in:
Max Kellermann 2010-05-31 09:45:52 +02:00
parent 6566038df9
commit d55740808d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/decoder/gme_decoder_plugin.c
View File

@ -10,10 +10,14 @@
#define GME_BUF_SIZE 4096 #define GME_BUF_SIZE 4096
enum {
GME_SAMPLE_RATE = 44100,
GME_CHANNELS = 2,
};
static void static void
gme_file_decode(struct decoder *decoder, const char *path_fs) gme_file_decode(struct decoder *decoder, const char *path_fs)
{ {
int sample_rate = 44100;
int track = 0; /* index of track to play */ int track = 0; /* index of track to play */
float song_len; float song_len;
Music_Emu *emu; Music_Emu *emu;
@ -23,7 +27,8 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
short buf[GME_BUF_SIZE]; short buf[GME_BUF_SIZE];
const char* gme_err; const char* gme_err;
if((gme_err = gme_open_file(path_fs, &emu, sample_rate)) != NULL){ gme_err = gme_open_file(path_fs, &emu, GME_SAMPLE_RATE);
if (gme_err != NULL) {
g_warning("%s", gme_err); g_warning("%s", gme_err);
return; return;
} }
@ -40,8 +45,9 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
/* initialize the MPD decoder */ /* initialize the MPD decoder */
GError *error = NULL; GError *error = NULL;
if(!audio_format_init_checked(&audio_format, sample_rate, SAMPLE_FORMAT_S16, if (!audio_format_init_checked(&audio_format, GME_SAMPLE_RATE,
2, &error)){ SAMPLE_FORMAT_S16, GME_CHANNELS,
&error)) {
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);
gme_free_info(ti); gme_free_info(ti);
@ -80,12 +86,12 @@ gme_file_decode(struct decoder *decoder, const char *path_fs)
static struct tag * static struct tag *
gme_tag_dup(const char *path_fs) gme_tag_dup(const char *path_fs)
{ {
int sample_rate = 44100;
Music_Emu *emu; Music_Emu *emu;
gme_info_t *ti; gme_info_t *ti;
const char* gme_err; const char* gme_err;
if((gme_err = gme_open_file(path_fs, &emu, sample_rate)) != NULL){ gme_err = gme_open_file(path_fs, &emu, GME_SAMPLE_RATE);
if (gme_err != NULL) {
g_warning("%s", gme_err); g_warning("%s", gme_err);
return NULL; return NULL;
} }