From caa6684752a310e916b179125a4125a8b3be36f0 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 23 Jan 2011 19:08:09 +0000
Subject: VIDEO: Move video classes to Video:: namespace

svn-id: r55479
---
 engines/gob/videoplayer.cpp | 12 ++++++------
 engines/gob/videoplayer.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index b9eb42a2fe..3cd363e8fb 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -798,7 +798,7 @@ Common::String VideoPlayer::findFile(const Common::String &file, Properties &pro
 	return fileName;
 }
 
-Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Properties &properties) {
+::Video::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Properties &properties) {
 	Common::String fileName = findFile(file, properties);
 	if (fileName.empty())
 		return 0;
@@ -807,15 +807,15 @@ Graphics::CoktelDecoder *VideoPlayer::openVideo(const Common::String &file, Prop
 	if (!stream)
 		return 0;
 
-	Graphics::CoktelDecoder *video = 0;
+	::Video::CoktelDecoder *video = 0;
 	if (properties.type == kVideoTypeIMD)
-		video = new Graphics::IMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
+		video = new ::Video::IMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
 	else if (properties.type == kVideoTypePreIMD)
-		video = new Graphics::PreIMDDecoder(properties.width, properties.height, _vm->_mixer, Audio::Mixer::kSFXSoundType);
+		video = new ::Video::PreIMDDecoder(properties.width, properties.height, _vm->_mixer, Audio::Mixer::kSFXSoundType);
 	else if (properties.type == kVideoTypeVMD)
-		video = new Graphics::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
+		video = new ::Video::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
 	else if (properties.type == kVideoTypeRMD)
-		video = new Graphics::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
+		video = new ::Video::VMDDecoder(_vm->_mixer, Audio::Mixer::kSFXSoundType);
 	else
 		warning("Couldn't open video \"%s\": Invalid video Type", fileName.c_str());
 
diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index fff2a951e4..2a1223b0b1 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -150,7 +150,7 @@ public:
 
 private:
 	struct Video {
-		Graphics::CoktelDecoder *decoder;
+		::Video::CoktelDecoder *decoder;
 		Common::String fileName;
 
 		SurfacePtr surface;
@@ -186,7 +186,7 @@ private:
 
 	Common::String findFile(const Common::String &file, Properties &properties);
 
-	Graphics::CoktelDecoder *openVideo(const Common::String &file, Properties &properties);
+	::Video::CoktelDecoder *openVideo(const Common::String &file, Properties &properties);
 
 	bool playFrame(int slot, Properties &properties);
 
-- 
cgit v1.2.3