From: Darren S. <li...@yo...> - 2010-07-18 22:48:49
|
# HG changeset patch # User Darren Salt <li...@yo...> # Date 1279493293 -3600 # Node ID e0e9f5035fde49877cf4bdb5d9a9a5830c3e8874 # Parent d217ddbb1151c96ee3821be3435e777c301a510b Fix playback of the first file handled by the modplug demuxer. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Recognise and handle the WebM container format. (VP8 video is not yet supported.) * Recognise ScreamTracker 2 & 3 files. (ST3 untested.) + * Fix playback of the first file handled by the modplug demuxer. xine-lib (1.1.18.1) 2010-03-06 * Oops. compat.c (for DXR3 support) was omitted. diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -166,13 +166,6 @@ return 0; } - this->mpfile = ModPlug_Load(this->buffer, this->filesize); - if (this->mpfile==NULL) { - xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - load error\n"); - free(this->buffer); - return 0; - } - /* Set up modplug engine */ ModPlug_GetSettings(&this->settings); this->settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */ @@ -180,6 +173,13 @@ this->settings.mBits = MOD_BITS; this->settings.mFrequency = MOD_SAMPLERATE; ModPlug_SetSettings(&this->settings); + + this->mpfile = ModPlug_Load(this->buffer, this->filesize); + if (this->mpfile==NULL) { + xine_log(this->stream->xine, XINE_LOG_PLUGIN, "modplug - load error\n"); + free(this->buffer); + return 0; + } this->title = strdup(ModPlug_GetName(this->mpfile)); this->artist = strdup(""); |