Changeset 60 for mppenc/branches/r2d/src/wave_in.c

Timestamp:

09/28/06 18:15:21 (18 years ago)

Author:

r2d

Message:

added a PsyModel struct, too much members in it. some will be removed later

File:

• mppenc/branches/r2d/src/wave_in.c (modified) (3 diffs)

mppenc/branches/r2d/src/wave_in.c

@@ -272 +272 @@
     float*  s = data -> S + offset;
 
-    ENTER(120);
-
     // Read PCM data
 #ifdef _WIN32
@@ -376 +374 @@
         }
     }
-
-    LEAVE(120);
     return ReadSamples;
 }
@@ -453 +449 @@
 
                                                                                                                 // finally calculate number of samples
-    if (type->PCMBytes >= 0xFFFFFF00  ||  
-                        type->PCMBytes == 0  ||  
+    if (type->PCMBytes >= 0xFFFFFF00  ||
+                        type->PCMBytes == 0  ||
                         (Uint32_t)type->PCMBytes % (type -> Channels * type->BytesPerSample) != 0) {
                 type->PCMSamples = 36000000 * type->SampleFreq;