aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/fmv/oggtheora/moviefile.h
diff options
context:
space:
mode:
authorPaul Gilbert2010-08-30 07:48:27 +0000
committerEugene Sandulenko2010-10-12 23:20:33 +0000
commitcb95db7cc04a5a3d14f408835cd371e0a0abd4ed (patch)
tree0022ad1ca99c0fb5b623d612285e12fde2bc2434 /engines/sword25/fmv/oggtheora/moviefile.h
parentffce890f66bc34b356c8df89591bc4f56e5a9e4e (diff)
downloadscummvm-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/moviefile.h')
-rw-r--r--engines/sword25/fmv/oggtheora/moviefile.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/sword25/fmv/oggtheora/moviefile.h b/engines/sword25/fmv/oggtheora/moviefile.h
index 5aa0ef5617..bdae585d73 100644
--- a/engines/sword25/fmv/oggtheora/moviefile.h
+++ b/engines/sword25/fmv/oggtheora/moviefile.h
@@ -41,25 +41,22 @@
#include "sword25/kernel/common.h"
-#include "sword25/kernel/memlog_off.h"
-#include <string>
-#include "sword25/kernel/memlog_on.h"
+namespace Sword25 {
// -----------------------------------------------------------------------------
-class BS_OggState;
+class OggState;
// -----------------------------------------------------------------------------
// Klassendefinition
// -----------------------------------------------------------------------------
-class BS_MovieFile
-{
+class MovieFile {
public:
- BS_MovieFile(const std::string & Filename, unsigned int ReadBlockSize, bool & Success);
- virtual ~BS_MovieFile();
+ MovieFile(const Common::String &Filename, unsigned int ReadBlockSize, bool &Success);
+ virtual ~MovieFile();
- int BufferData(BS_OggState & OggState);
+ int BufferData(OggState &OggState);
bool IsEOF() const;
private:
@@ -69,4 +66,6 @@ private:
unsigned int m_ReadBlockSize;
};
+} // End of namespace Sword25
+
#endif