diff options
Diffstat (limited to 'engines/sword25/fmv/oggtheora/oggstreamstate.h')
-rw-r--r-- | engines/sword25/fmv/oggtheora/oggstreamstate.h | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.h b/engines/sword25/fmv/oggtheora/oggstreamstate.h index 3ed845c51d..7e291bd107 100644 --- a/engines/sword25/fmv/oggtheora/oggstreamstate.h +++ b/engines/sword25/fmv/oggtheora/oggstreamstate.h @@ -40,46 +40,50 @@ // ----------------------------------------------------------------------------- #include "sword25/kernel/common.h" -#include <ogg/ogg.h> -#include "common/queue.h" - -namespace Sword25 { +#include "ogg/ogg.h" +#include <queue> +// XXX +#include <iostream> +// XXX // ----------------------------------------------------------------------------- -// Class definitions +// Klassendefinition // ----------------------------------------------------------------------------- -class OggStreamState { +class BS_OggStreamState +{ public: - OggStreamState(int SerialNo); - virtual ~OggStreamState(); + BS_OggStreamState(int SerialNo); + virtual ~BS_OggStreamState(); - int PageIn(ogg_page *PagePtr); - int PacketOut(ogg_packet *PacketPtr); + int PageIn(ogg_page * PagePtr); + int PacketOut(ogg_packet * PacketPtr); - void BufferPage(ogg_page *PagePtr); + void BufferPage(ogg_page * PagePtr); int PageInBufferedPage(); unsigned int GetPageBufferSize() const; unsigned int GetUnprocessedBytes() const; - bool PageBelongsToStream(ogg_page *PagePtr) const; + bool PageBelongsToStream(ogg_page * PagePtr) const; // XXX - void DumpInternals() { - warning("body_storage: %d", m_State.body_storage); - warning("body_fill: %d", m_State.body_fill); - warning("body_returned: %d", m_State.body_returned); - warning("lacing_storage: %d", m_State.lacing_storage); - warning("lacing_fill: %d", m_State.lacing_fill); - warning("lacing_returned: %d", m_State.lacing_returned); + void DumpInternals() + { + using namespace std; + + cout << "body_storage: " << m_State.body_storage << endl; + cout << "body_fill: " << m_State.body_fill << endl; + cout << "body_returned: " << m_State.body_returned << endl; + cout << "lacing_storage: " << m_State.lacing_storage << endl; + cout << "lacing_fill: " << m_State.lacing_fill << endl; + cout << "lacing_returned: " << m_State.lacing_returned << endl; + cout << endl; } // XXX private: ogg_stream_state m_State; - Common::Queue<ogg_page> m_PageBuffer; + std::queue<ogg_page> m_PageBuffer; }; -} // End of namespace Sword25 - #endif |