diff options
| author | Sven Hesse | 2010-08-08 00:33:59 +0000 |
|---|---|---|
| committer | Sven Hesse | 2010-08-08 00:33:59 +0000 |
| commit | a802e1e64f56b5c6b0534a481e84418078b2699f (patch) | |
| tree | 6d4becdefb786c0f277859be491f0624554645c7 /engines/gob/demos | |
| parent | b5b47d50c8984361965c49eead999eb7bc672171 (diff) | |
| download | scummvm-rg350-a802e1e64f56b5c6b0534a481e84418078b2699f.tar.gz scummvm-rg350-a802e1e64f56b5c6b0534a481e84418078b2699f.tar.bz2 scummvm-rg350-a802e1e64f56b5c6b0534a481e84418078b2699f.zip | |
VIDEO: Stub a VideoDecoder-like CoktelDecoder
This creates a new CoktelDecoder class using the VideoDecoder
interface, which will eventually become the new way to decode
PreIMD, IMD and VMD videos.
Since the VideoPlayer in gob is not yet ready for this, we're
disabling all video playback in the gob engine for now.
svn-id: r51850
Diffstat (limited to 'engines/gob/demos')
| -rw-r--r-- | engines/gob/demos/demoplayer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/gob/demos/demoplayer.cpp b/engines/gob/demos/demoplayer.cpp index 38e20a46ee..d6c3ac73a5 100644 --- a/engines/gob/demos/demoplayer.cpp +++ b/engines/gob/demos/demoplayer.cpp @@ -155,8 +155,8 @@ void DemoPlayer::playVideo(const char *fileName) { int16 x = _rebase0 ? 0 : -1; int16 y = _rebase0 ? 0 : -1; if (_vm->_vidPlayer->primaryOpen(file, x, y)) { - bool videoSupportsDouble = - ((_vm->_vidPlayer->getFeatures() & Graphics::CoktelVideo::kFeaturesSupportsDouble) != 0); + bool videoSupportsDouble = false; + //((_vm->_vidPlayer->getFeatures() & Graphics::CoktelDecoder::kFeaturesSupportsDouble) != 0); if (_autoDouble) { int16 defX = _rebase0 ? 0 : _vm->_vidPlayer->getDefaultX(); @@ -215,7 +215,7 @@ void DemoPlayer::playVideoNormal() { } void DemoPlayer::playVideoDoubled() { - Common::String fileNameOpened = _vm->_vidPlayer->getFileName(); + Common::String fileNameOpened = _vm->_vidPlayer->getPrimaryFileName(); _vm->_vidPlayer->primaryClose(); int16 x = _rebase0 ? 0 : -1; @@ -223,10 +223,10 @@ void DemoPlayer::playVideoDoubled() { if (_vm->_vidPlayer->primaryOpen(fileNameOpened.c_str(), x, y, VideoPlayer::kFlagScreenSurface)) { - for (int i = 0; i < _vm->_vidPlayer->getFramesCount(); i++) { + for (int i = 0; i < _vm->_vidPlayer->getFrameCount(); i++) { _vm->_vidPlayer->playFrame(i); - Graphics::CoktelVideo::State state = _vm->_vidPlayer->getState(); + Graphics::CoktelDecoder::State state;// = _vm->_vidPlayer->getState(); int16 w = state.right - state.left + 1; int16 h = state.bottom - state.top + 1; |