aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2012-08-16 14:00:14 -0400
committerMatthew Hoops2012-08-16 14:00:14 -0400
commit18823198ad4e7dedd0ca33760eb453e9fe673551 (patch)
tree6a4ef578a74c5ffd616101f686a2f3b7248406d4 /engines
parent7569ec7dc00e95e0643cde7f413a7cf46a4770f0 (diff)
downloadscummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.gz
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.tar.bz2
scummvm-rg350-18823198ad4e7dedd0ca33760eb453e9fe673551.zip
VIDEO: Merge AdvancedVideoDecoder into VideoDecoder
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/animation.cpp2
-rw-r--r--engines/mohawk/video.h4
-rw-r--r--engines/sci/console.cpp2
-rw-r--r--engines/sci/engine/kvideo.cpp2
-rw-r--r--engines/sci/video/robot_decoder.cpp2
-rw-r--r--engines/sci/video/robot_decoder.h2
-rw-r--r--engines/sci/video/seq_decoder.h2
-rw-r--r--engines/scumm/he/animation_he.cpp4
-rw-r--r--engines/sword1/animation.cpp6
-rw-r--r--engines/sword2/animation.cpp6
10 files changed, 15 insertions, 17 deletions
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index 8fc93e4153..10f274b37f 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.cpp
@@ -342,7 +342,7 @@ bool MoviePlayerDXA::processFrame() {
_vm->_system->unlockScreen();
uint32 soundTime = _mixer->getSoundElapsedTime(_bgSound);
- uint32 nextFrameStartTime = ((Video::AdvancedVideoDecoder::VideoTrack *)getTrack(0))->getNextFrameStartTime();
+ uint32 nextFrameStartTime = ((Video::VideoDecoder::VideoTrack *)getTrack(0))->getNextFrameStartTime();
if ((_bgSoundStream == NULL) || soundTime < nextFrameStartTime) {
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 4e34604bfd..9dddcde09b 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -45,7 +45,7 @@ struct MLSTRecord {
struct VideoEntry {
// Playback variables
- Video::AdvancedVideoDecoder *video;
+ Video::VideoDecoder *video;
uint16 x;
uint16 y;
bool loop;
@@ -57,7 +57,7 @@ struct VideoEntry {
int id; // Internal Mohawk files
// Helper functions
- Video::AdvancedVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually
+ Video::VideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually
void clear();
bool endOfVideo();
};
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index de852ca9c0..1889d53480 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -267,8 +267,6 @@ void Console::postEnter() {
}
if (videoDecoder && videoDecoder->loadFile(_videoFile)) {
- ((Video::AdvancedVideoDecoder *)videoDecoder)->start();
-
_engine->_gfxCursor->kernelHide();
#ifdef ENABLE_SCI32
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index 3e0f35c037..6bf9aff2fe 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -50,7 +50,7 @@ void playVideo(Video::VideoDecoder *videoDecoder, VideoState videoState) {
if (!videoDecoder)
return;
- ((Video::AdvancedVideoDecoder *)videoDecoder)->start();
+ videoDecoder->start();
byte *scaleBuffer = 0;
byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel;
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index 6fe4c645f4..608c77136f 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -132,7 +132,7 @@ bool RobotDecoder::load(GuiResourceId id) {
}
void RobotDecoder::close() {
- AdvancedVideoDecoder::close();
+ VideoDecoder::close();
delete _fileStream;
_fileStream = 0;
diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h
index de5b669ab8..ebc3262939 100644
--- a/engines/sci/video/robot_decoder.h
+++ b/engines/sci/video/robot_decoder.h
@@ -37,7 +37,7 @@ class SeekableSubReadStreamEndian;
namespace Sci {
-class RobotDecoder : public Video::AdvancedVideoDecoder {
+class RobotDecoder : public Video::VideoDecoder {
public:
RobotDecoder(bool isBigEndian);
virtual ~RobotDecoder();
diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h
index 82254990d6..890f349feb 100644
--- a/engines/sci/video/seq_decoder.h
+++ b/engines/sci/video/seq_decoder.h
@@ -40,7 +40,7 @@ namespace Sci {
/**
* Implementation of the Sierra SEQ decoder, used in KQ6 DOS floppy/CD and GK1 DOS
*/
-class SEQDecoder : public Video::AdvancedVideoDecoder {
+class SEQDecoder : public Video::VideoDecoder {
public:
SEQDecoder(uint frameDelay);
virtual ~SEQDecoder();
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 8329511c14..be17a3b305 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -62,14 +62,14 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
_video->close();
// Ensure that Bink will use our PixelFormat
- ((Video::AdvancedVideoDecoder *)_video)->setDefaultHighColorFormat(g_system->getScreenFormat());
+ _video->setDefaultHighColorFormat(g_system->getScreenFormat());
if (!_video->loadFile(filename)) {
warning("Failed to load video file %s", filename);
return -1;
}
- ((Video::AdvancedVideoDecoder *)_video)->start();
+ _video->start();
debug(1, "Playing video %s", filename);
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 98725a302a..f7add4eed2 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -183,7 +183,7 @@ bool MoviePlayer::load(uint32 id) {
// Need to load here in case it fails in which case we'd need
// to go back to paletted mode
if (_decoder->loadFile(filename)) {
- ((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
+ _decoder->start();
return true;
} else {
initGraphics(g_system->getWidth(), g_system->getHeight(), true);
@@ -197,9 +197,9 @@ bool MoviePlayer::load(uint32 id) {
// For DXA, also add the external sound file
if (_decoderType == kVideoDecoderDXA)
- ((Video::AdvancedVideoDecoder *)_decoder)->addStreamFileTrack(sequenceList[id]);
+ _decoder->addStreamFileTrack(sequenceList[id]);
- ((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
+ _decoder->start();
return true;
}
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index 24b52cd85a..00260f789a 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -95,7 +95,7 @@ bool MoviePlayer::load(const char *name) {
// Need to load here in case it fails in which case we'd need
// to go back to paletted mode
if (_decoder->loadFile(filename)) {
- ((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
+ _decoder->start();
return true;
} else {
initGraphics(640, 480, true);
@@ -108,9 +108,9 @@ bool MoviePlayer::load(const char *name) {
// For DXA, also add the external sound file
if (_decoderType == kVideoDecoderDXA)
- ((Video::AdvancedVideoDecoder *)_decoder)->addStreamFileTrack(name);
+ _decoder->addStreamFileTrack(name);
- ((Video::AdvancedVideoDecoder *)_decoder)->start(); // TODO: Remove after new API is complete
+ _decoder->start();
return true;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-30 20:28:56 +0000