diff options
author | Paul Gilbert | 2010-08-30 07:48:27 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 23:20:33 +0000 |
commit | cb95db7cc04a5a3d14f408835cd371e0a0abd4ed (patch) | |
tree | 0022ad1ca99c0fb5b623d612285e12fde2bc2434 /engines/sword25/fmv/oggtheora/oggstreamstate.h | |
parent | ffce890f66bc34b356c8df89591bc4f56e5a9e4e (diff) | |
download | scummvm-rg350-cb95db7cc04a5a3d14f408835cd371e0a0abd4ed.tar.gz scummvm-rg350-cb95db7cc04a5a3d14f408835cd371e0a0abd4ed.tar.bz2 scummvm-rg350-cb95db7cc04a5a3d14f408835cd371e0a0abd4ed.zip |
SWORD25: Commit of in-progress MoviePlayer code
Frames aren't being corrected decoded yet; still trying to locate the cause
svn-id: r53295
Diffstat (limited to 'engines/sword25/fmv/oggtheora/oggstreamstate.h')
-rw-r--r-- | engines/sword25/fmv/oggtheora/oggstreamstate.h | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/engines/sword25/fmv/oggtheora/oggstreamstate.h b/engines/sword25/fmv/oggtheora/oggstreamstate.h index 7e291bd107..3ed845c51d 100644 --- a/engines/sword25/fmv/oggtheora/oggstreamstate.h +++ b/engines/sword25/fmv/oggtheora/oggstreamstate.h @@ -40,50 +40,46 @@ // ----------------------------------------------------------------------------- #include "sword25/kernel/common.h" -#include "ogg/ogg.h" -#include <queue> -// XXX -#include <iostream> -// XXX +#include <ogg/ogg.h> +#include "common/queue.h" + +namespace Sword25 { // ----------------------------------------------------------------------------- -// Klassendefinition +// Class definitions // ----------------------------------------------------------------------------- -class BS_OggStreamState -{ +class OggStreamState { public: - BS_OggStreamState(int SerialNo); - virtual ~BS_OggStreamState(); + OggStreamState(int SerialNo); + virtual ~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() - { - 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; + 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); } // XXX private: ogg_stream_state m_State; - std::queue<ogg_page> m_PageBuffer; + Common::Queue<ogg_page> m_PageBuffer; }; +} // End of namespace Sword25 + #endif |