Changeset 477 for libmpc/trunk/libmpcdec

Timestamp:

01/01/12 18:05:19 (14 years ago)

Author:

r2d

Message:

removed some gcc warnings and compilation issues

Location:

libmpc/trunk/libmpcdec

Files:

• mpc_demux.c (modified) (2 diffs)
• streaminfo.c (modified) (2 diffs)

libmpc/trunk/libmpcdec/mpc_demux.c

@@ -79 +79 @@
 }
 
-// Returns the amount of unread bytes in the demux buffer.
-static mpc_uint32_t mpc_unread_bytes(mpc_demux * d) {
-        mpc_int32_t unread_bytes = mpc_unread_bytes_unchecked(d);
-
-        if (unread_bytes < 0) return 0;
-        
-        return (mpc_uint32_t) unread_bytes;
-}
-
-
 
 // Returns the number of bytes available in the buffer.
@@ -97 +87 @@
         int offset = 0;
 
-        if ((mpc_int32_t)
-                unread_bytes < 0) return 0; // Error - we've been reading past the end of the buffer - abort
+        if ((mpc_int32_t) unread_bytes < 0)
+                return 0; // Error - we've been reading past the end of the buffer - abort
 
         if (min_bytes == 0 || min_bytes > DEMUX_BUFFER_SIZE ||

libmpc/trunk/libmpcdec/streaminfo.c

@@ -109 +109 @@
 streaminfo_read_header_sv7(mpc_streaminfo* si, mpc_bits_reader * r)
 {
-    mpc_uint16_t Estimatedpeak_title = 0;
         mpc_uint32_t frames, last_frame_samples;
 
@@ -121 +120 @@
         mpc_bits_read(r, 2); // Link ?
         si->sample_freq        = samplefreqs[mpc_bits_read(r, 2)];
-        Estimatedpeak_title    = (mpc_uint16_t) mpc_bits_read(r, 16);   // read the ReplayGain data
+        mpc_bits_read(r, 16);   // skip MaxLevel (maximum level of input PCM)
         si->gain_title         = (mpc_uint16_t) mpc_bits_read(r, 16);
         si->peak_title         = (mpc_uint16_t) mpc_bits_read(r, 16);