Revert "SWORD25: Commit of in-progress MoviePlayer code"

This reverts commit cb95db7cc04a5a3d14f408835cd371e0a0abd4ed.

svn-id: r53296

1 files changed, 19 insertions, 17 deletions

diff --git a/engines/sword25/fmv/oggtheora/oggstate.h b/engines/sword25/fmv/oggtheora/oggstate.h
index 7df178b681..1c25ca5e3a 100644
--- a/engines/sword25/fmv/oggtheora/oggstate.h
+++ b/engines/sword25/fmv/oggtheora/oggstate.h
@@ -40,37 +40,39 @@
 // -----------------------------------------------------------------------------
 
 #include "sword25/kernel/common.h"
-#include <ogg/ogg.h>
-
-namespace Sword25 {
+#include "ogg/ogg.h"
+// XXX
+#include <iostream>
+// XXX
 
 // -----------------------------------------------------------------------------
-// Class definitions
+// Klassendefinition
 // -----------------------------------------------------------------------------
 
-class OggState {
+class BS_OggState
+{
 public:
-	OggState();
-	virtual ~OggState();
+	BS_OggState();
+	virtual ~BS_OggState();
 
-	int		SyncPageout(ogg_page *OggPage);
+	int		SyncPageout(ogg_page * OggPage);
 	char *	SyncBuffer(long Size);
 	int		SyncWrote(long Bytes);
 
 	// XXX
-	void DumpInternals() {
-		warning("bodybytes: %d", m_SyncState.bodybytes);
-		warning("fill: %d", m_SyncState.fill);
-		warning("headerbytes: %d", m_SyncState.headerbytes );
-		warning("returned: %d", m_SyncState.returned );
-		warning("storage: %d", m_SyncState.storage );
-		warning("unsynched: %d", m_SyncState.unsynced );
+	void DumpInternals()
+	{
+		std::cout << "bodybytes: " << m_SyncState.bodybytes << std::endl;
+		std::cout << "fill: " << m_SyncState.fill << std::endl;
+		std::cout << "headerbytes: " << m_SyncState.headerbytes << std::endl;
+		std::cout << "returned: " << m_SyncState.returned << std::endl;
+		std::cout << "storage: " << m_SyncState.storage << std::endl;
+		std::cout << "unsynched: " << m_SyncState.unsynced << std::endl;
+		std::cout << std::endl;
 	}
 	// XXX
 private:
 	ogg_sync_state				m_SyncState;
 };
 
-} // End of namespace Sword25
-
 #endif