aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/video
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-08-13 03:42:30 +0200
committerEinar Johan Trøan Sømåen2012-08-13 03:42:30 +0200
commitfed19cb66ae5b56dd7dc81b90edd5a0d15986678 (patch)
treed1c3a237aa6b421aedea2cb3bab88b8689dea4a1 /engines/wintermute/video
parentddfa227b939d922f738f932997b70110453068cf (diff)
downloadscummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.gz
scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.tar.bz2
scummvm-rg350-fed19cb66ae5b56dd7dc81b90edd5a0d15986678.zip
WINTERMUTE: WinterMute -> Wintermute
Diffstat (limited to 'engines/wintermute/video')
-rw-r--r--engines/wintermute/video/decoders/theora_decoder.cpp2
-rw-r--r--engines/wintermute/video/decoders/theora_decoder.h2
-rw-r--r--engines/wintermute/video/video_player.cpp4
-rw-r--r--engines/wintermute/video/video_player.h4
-rw-r--r--engines/wintermute/video/video_theora_player.cpp6
-rw-r--r--engines/wintermute/video/video_theora_player.h4
6 files changed, 11 insertions, 11 deletions
diff --git a/engines/wintermute/video/decoders/theora_decoder.cpp b/engines/wintermute/video/decoders/theora_decoder.cpp
index a8e403c97c..6267e300f9 100644
--- a/engines/wintermute/video/decoders/theora_decoder.cpp
+++ b/engines/wintermute/video/decoders/theora_decoder.cpp
@@ -45,7 +45,7 @@
#include "common/stream.h"
#include "common/debug.h"
-namespace WinterMute {
+namespace Wintermute {
#define AUDIOFD_FRAGSIZE 10240
diff --git a/engines/wintermute/video/decoders/theora_decoder.h b/engines/wintermute/video/decoders/theora_decoder.h
index 3844434036..fd94f52142 100644
--- a/engines/wintermute/video/decoders/theora_decoder.h
+++ b/engines/wintermute/video/decoders/theora_decoder.h
@@ -41,7 +41,7 @@ namespace Common {
class SeekableReadStream;
}
-namespace WinterMute {
+namespace Wintermute {
/**
*
diff --git a/engines/wintermute/video/video_player.cpp b/engines/wintermute/video/video_player.cpp
index a3eedaa293..2577b8aedc 100644
--- a/engines/wintermute/video/video_player.cpp
+++ b/engines/wintermute/video/video_player.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/video/video_player.h"
-namespace WinterMute {
+namespace Wintermute {
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
@@ -106,4 +106,4 @@ bool VideoPlayer::loadSubtitles(const char *filename, const char *subtitleFile)
return STATUS_OK;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/video/video_player.h b/engines/wintermute/video/video_player.h
index 190223c6d1..d5466da679 100644
--- a/engines/wintermute/video/video_player.h
+++ b/engines/wintermute/video/video_player.h
@@ -36,7 +36,7 @@
#define MAX_VIDEO_STREAMS 5
-namespace WinterMute {
+namespace Wintermute {
// AVI-Video-player, currently fully stubbed
class VideoPlayer : public BaseClass {
@@ -85,6 +85,6 @@ public:
BaseArray<CVidSubtitle *, CVidSubtitle *> _subtitles;*/
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index fea81bdf9d..f75c7ba5b6 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -39,7 +39,7 @@
#include "engines/wintermute/wintermute.h"
#include "common/system.h"
-namespace WinterMute {
+namespace Wintermute {
IMPLEMENT_PERSISTENT(VideoTheoraPlayer, false)
@@ -272,7 +272,7 @@ bool VideoTheoraPlayer::update() {
warning("Should loop movie %s", _filename.c_str());
_theoraDecoder->rewind();
} else if (_theoraDecoder->endOfVideo() && !_looping) {
- debugC(kWinterMuteDebugLog, "Finished movie %s", _filename.c_str());
+ debugC(kWintermuteDebugLog, "Finished movie %s", _filename.c_str());
_state = THEORA_STATE_FINISHED;
_playbackStarted = false;
if (_freezeGame) {
@@ -497,4 +497,4 @@ BaseSurface *VideoTheoraPlayer::getTexture() {
return _texture;
}
-} // end of namespace WinterMute
+} // end of namespace Wintermute
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
index fe71ae0f35..cd358381f1 100644
--- a/engines/wintermute/video/video_theora_player.h
+++ b/engines/wintermute/video/video_theora_player.h
@@ -35,7 +35,7 @@
#include "common/stream.h"
#include "graphics/surface.h"
-namespace WinterMute {
+namespace Wintermute {
class BaseSurface;
class BaseImage;
class VideoTheoraPlayer : public BaseClass {
@@ -144,6 +144,6 @@ private:
};
-} // end of namespace WinterMute
+} // end of namespace Wintermute
#endif