Index: libmpc/branches/r2d/include/mpcdec/mpcdec.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/include/mpcdec/mpcdec.h	(revision 130)
+++ libmpc/branches/r2d/include/mpcdec/mpcdec.h	(revision 131)
@@ -58,4 +58,5 @@
 typedef struct mpc_frame_info_t {
 	mpc_uint32_t samples;	// number of samples in the frame
+	mpc_uint32_t bits;	// number of bits consumed by this frame
 	MPC_SAMPLE_FORMAT * buffer;	// frame samples buffer (size = samples * channels * sizeof(MPC_SAMPLE_FORMAT)
 } mpc_frame_info;
Index: libmpc/branches/r2d/include/mpcdec/streaminfo.h
===================================================================
--- libmpc/branches/r2d/libmpcdec/include/mpcdec/streaminfo.h	(revision 130)
+++ libmpc/branches/r2d/include/mpcdec/streaminfo.h	(revision 131)
@@ -58,10 +58,7 @@
     mpc_uint32_t         sample_freq;        ///< Sample frequency of stream
     mpc_uint32_t         channels;           ///< Number of channels in stream
-    mpc_streaminfo_off_t header_position;    ///< Byte offset of position of header in stream
     mpc_uint32_t         stream_version;     ///< Streamversion of stream
     mpc_uint32_t         bitrate;            ///< Bitrate of stream file (in bps)
     double               average_bitrate;    ///< Average bitrate of stream (in bits/sec)
-    mpc_uint32_t         frames;             ///< Number of frames in stream
-    mpc_int64_t          pcm_samples;        ///< Approximate number of pcm samples in stream
     mpc_uint32_t         max_band;           ///< Maximum band-index used in stream (0...31)
     mpc_uint32_t         ms;                 ///< Mid/side stereo (0: off, 1: on)
@@ -81,5 +78,5 @@
     //@{
     mpc_uint32_t         is_true_gapless;    ///< True gapless? (0: no, 1: yes)
-	mpc_uint32_t         last_frame_samples; ///< Number of valid samples within last frame
+	mpc_uint64_t         samples;            ///< Number of samples in the stream
     //@}
 
@@ -93,4 +90,6 @@
 	//@}
 
+
+	mpc_streaminfo_off_t header_position;    ///< Byte offset of position of header in stream
     mpc_streaminfo_off_t tag_offset;         ///< Offset to file tags
     mpc_streaminfo_off_t total_file_length;  ///< Total length of underlying file