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.

winemp3.acm: mpg123_getformat must be called on MPG123_NEW_FORMAT errors for libmpg123 < 1.8.0.
05a258b2 · Loïc Hoguin · Alexandre Julliard · 2d0b2433 · 05a258b2
Commit 05a258b2 authored Dec 28, 2009 by Loïc Hoguin Committed by Alexandre Julliard Dec 30, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

mpegl3.c dlls/winemp3.acm/mpegl3.c +4 -7

No files found.
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -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);