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

decoder/mikmod: removed the struct mod_Data

Browse Source
This commit is contained in:
Max Kellermann 2009-11-14 01:58:13 +01:00
parent 0c5329aedc
commit 7efb548921
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/decoder/mikmod_plugin.c
View File

@ -126,33 +126,29 @@ static void mod_finishMikMod(void)
MikMod_Exit(); MikMod_Exit();
} }
typedef struct _mod_Data {
MODULE *moduleHandle;
SBYTE audio_buffer[MIKMOD_FRAME_SIZE];
} mod_Data;
static void static void
mod_decode(struct decoder *decoder, const char *path) mod_decode(struct decoder *decoder, const char *path)
{ {
char *path2; char *path2;
mod_Data data; MODULE *handle;
struct audio_format audio_format; struct audio_format audio_format;
float total_time = 0.0; float total_time = 0.0;
int ret; int ret;
float secPerByte; float secPerByte;
SBYTE buffer[MIKMOD_FRAME_SIZE];
enum decoder_command cmd = DECODE_COMMAND_NONE; enum decoder_command cmd = DECODE_COMMAND_NONE;
path2 = g_strdup(path); path2 = g_strdup(path);
data.moduleHandle = Player_Load(path2, 128, 0); handle = Player_Load(path2, 128, 0);
g_free(path2); g_free(path2);
if (data.moduleHandle == NULL) { if (handle == NULL) {
g_warning("failed to open mod: %s\n", path); g_warning("failed to open mod: %s\n", path);
return; return;
} }
/* Prevent module from looping forever */ /* Prevent module from looping forever */
data.moduleHandle->loop = 0; handle->loop = 0;
audio_format_init(&audio_format, 44100, 16, 2); audio_format_init(&audio_format, 44100, 16, 2);
assert(audio_format_valid(&audio_format)); assert(audio_format_valid(&audio_format));
@ -163,17 +159,16 @@ mod_decode(struct decoder *decoder, const char *path)
decoder_initialized(decoder, &audio_format, false, 0); decoder_initialized(decoder, &audio_format, false, 0);
Player_Start(data.moduleHandle); Player_Start(handle);
while (cmd == DECODE_COMMAND_NONE && Player_Active()) { while (cmd == DECODE_COMMAND_NONE && Player_Active()) {
ret = VC_WriteBytes(data.audio_buffer, MIKMOD_FRAME_SIZE); ret = VC_WriteBytes(buffer, sizeof(buffer));
total_time += ret * secPerByte; total_time += ret * secPerByte;
cmd = decoder_data(decoder, NULL, cmd = decoder_data(decoder, NULL, buffer, ret,
data.audio_buffer, ret,
total_time, 0, NULL); total_time, 0, NULL);
} }
Player_Stop(); Player_Stop();
Player_Free(data.moduleHandle); Player_Free(handle);
} }
static struct tag *modTagDup(const char *file) static struct tag *modTagDup(const char *file)