From 9216785b33be9141c1d1e3a5297e48bc9c821193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 18 Jan 2004 04:42:22 +0000 Subject: [PATCH] Missed some changes; compiled well as long as nobody tried to use it :) git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6133 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/musepack/mpc/mpc_dec.cpp | 4 ++-- src/add-ons/media/plugins/musepack/mpc/mpc_dec.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/add-ons/media/plugins/musepack/mpc/mpc_dec.cpp b/src/add-ons/media/plugins/musepack/mpc/mpc_dec.cpp index fa860ca415..e8b266fd1f 100644 --- a/src/add-ons/media/plugins/musepack/mpc/mpc_dec.cpp +++ b/src/add-ons/media/plugins/musepack/mpc/mpc_dec.cpp @@ -899,9 +899,9 @@ MPC_decoder::~MPC_decoder () // ^^ breaks wa3 } -MPC_decoder::MPC_decoder ( Reader *r ) +MPC_decoder::MPC_decoder(BPositionIO *file) { - m_reader = r; + m_reader = file; HuffQ[0][0] = 0; HuffQ[1][0] = 0; diff --git a/src/add-ons/media/plugins/musepack/mpc/mpc_dec.h b/src/add-ons/media/plugins/musepack/mpc/mpc_dec.h index 78d06061d2..b99f0c1a4a 100644 --- a/src/add-ons/media/plugins/musepack/mpc/mpc_dec.h +++ b/src/add-ons/media/plugins/musepack/mpc/mpc_dec.h @@ -1,7 +1,7 @@ #ifndef _mpp_dec_h_ #define _mpp_dec_h_ -#include +#include #ifndef _in_mpc_h_ class StreamInfo; @@ -56,11 +56,11 @@ public: class MPC_decoder { private: - Reader *m_reader; + BPositionIO *m_reader; public: - MPC_decoder ( Reader *r ); - ~MPC_decoder (); + MPC_decoder(BPositionIO *r); + ~MPC_decoder(); void SetStreamInfo ( StreamInfo *si ); int FileInit (); @@ -231,8 +231,8 @@ private: // functions void Resort_HuffTables ( const unsigned int elements, HuffmanTyp* Table, const int offset ); private: - _inline int f_read ( void *ptr, size_t size) { return m_reader->read (ptr, size); }; - _inline int f_seek ( int offset, int origin) { return m_reader->seek (offset, origin); }; + _inline int f_read(void *ptr, size_t size) { return m_reader->Read(ptr, size); }; + _inline int f_seek(int offset, int origin) { return m_reader->Seek(offset, origin); }; }; #endif