winemp3.acm: mpg123_getformat must be called on MPG123_NEW_FORMAT errors for libmpg123 < 1.8.0.

The documentation for libmpg123 clearly state that mpg123_getformat MUST
be called if an error MPG123_NEW_FORMAT is returned, for libmpg123 < 1.8.0.
On versions above that, the call is optional. The patch make sure to call
that function all the time (instead of just when trace is activated) so
that mp3 works in Morrowind and others.
This commit is contained in:
Loïc Hoguin 2009-12-28 18:17:24 +01:00 committed by Alexandre Julliard
parent 2d0b2433c2
commit 05a258b2c9
1 changed files with 4 additions and 7 deletions

View File

@ -174,13 +174,10 @@ static void mp3_horse(PACMDRVSTREAMINSTANCE adsi,
if (ret == MPG123_NEW_FORMAT)
{
if TRACE_ON(mpeg3)
{
long rate;
int channels, enc;
mpg123_getformat(amd->mh, &rate, &channels, &enc);
TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc);
}
long rate;
int channels, enc;
mpg123_getformat(amd->mh, &rate, &channels, &enc);
TRACE("New format: %li Hz, %i channels, encoding value %i\n", rate, channels, enc);
}
dpos += size;
} while (ret == MPG123_OK);