Changeset 325

Timestamp:

05/13/07 15:47:14 (18 years ago)

Author:

r2d

Message:

corrected end of file

File:

• libmpc/trunk/mpcenc/mpcenc.c (modified) (2 diffs)

libmpc/trunk/mpcenc/mpcenc.c

@@ -1733 +1733 @@
         memmove ( Main.S, Main.S + BLOCK, CENTER * sizeof(float) );
 
+        // 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);
-                        break;
+                        SamplesInWAVE = AllSamplesRead;
                 }
-
-        // read samples
-        CurrentRead     = Read_WAV_Samples ( &Wave, (int)minf(BLOCK, SamplesInWAVE - AllSamplesRead), &Main, CENTER, ScalingFactorl, ScalingFactorr, &Silence );
-        AllSamplesRead += CurrentRead;
     }
 
@@ -1760 +1760 @@
         writeBlock(&e, "SE", MPC_FALSE, 0); // write end of stream block
 
-        if (SamplesInWAVE != AllSamplesRead) {
-                SamplesInWAVE = AllSamplesRead;
+        if (Wave.PCMSamples != AllSamplesRead) {
                 fseek(e.outputFile, e.seek_ref + 4, SEEK_SET);
                 writeStreamInfo ( &e, m.Max_Band, m.MS_Channelmode > 0, SamplesInWAVE, 0,