Changeset 323 for libmpc/trunk/mpcenc/mpcenc.c

Timestamp:

05/12/07 12:43:05 (17 years ago)

Author:

r2d

Message:

• Corrected end of loop condition when encoded file doesn't report correct length
• Changed replay gain ref in mpcdec info

File:

• libmpc/trunk/mpcenc/mpcenc.c (modified) (1 diff)

libmpc/trunk/mpcenc/mpcenc.c

@@ -1733 +1733 @@
         memmove ( Main.S, Main.S + BLOCK, CENTER * sizeof(float) );
 
+        // adapt SamplesInWAV to the real number of contained samples
+                if ( myfeof (Wave.fp) ) {
+                        stderr_printf ( "WAVE file has incorrect header: header: %.3f s, contents: %.3f s    \n",
+                                                        (long double)(SamplesInWAVE) / m.SampleFreq, (long double)(AllSamplesRead) / m.SampleFreq);
+                        break;
+                }
+
         // read samples
         CurrentRead     = Read_WAV_Samples ( &Wave, (int)minf(BLOCK, SamplesInWAVE - AllSamplesRead), &Main, CENTER, ScalingFactorl, ScalingFactorr, &Silence );
         AllSamplesRead += CurrentRead;
-
-        // adapt SamplesInWAV to the real number of contained samples
-        if ( myfeof (Wave.fp) ) {
-                        stderr_printf ( "WAVE file has incorrect header: header: %.3f s, contents: %.3f s    \n",
-                                                        (long double)(SamplesInWAVE) / m.SampleFreq, (long double)(AllSamplesRead) / m.SampleFreq);
-        }
     }