diff options
| author | Strangerke | 2012-10-10 08:26:41 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:26:41 +0200 |
| commit | b164cbb571fc4e0f2a6f002760a851d8ac592540 (patch) | |
| tree | 4d25f2e1f8241f6f3352fd9fb1135f5faa36dfd4 /engines/toltecs/movie.h | |
| parent | b2f2f8d7b08b40e43702e8db325f8136066f10be (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.gz scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.bz2 scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into mortevielle
Conflicts:
base/plugins.cpp
configure
Diffstat (limited to 'engines/toltecs/movie.h')
| -rw-r--r-- | engines/toltecs/movie.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h index aecfac240f..8fa48975d7 100644 --- a/engines/toltecs/movie.h +++ b/engines/toltecs/movie.h @@ -36,7 +36,7 @@ public: ~MoviePlayer(); void playMovie(uint resIndex); - + protected: ToltecsEngine *_vm; Audio::QueuingAudioStream *_audioStream; @@ -47,11 +47,11 @@ protected: void unpackPalette(byte *source, byte *dest, int elemCount, int elemSize); void unpackRle(byte *source, byte *dest); - + void fetchAudioChunks(); - + bool handleInput(); - + }; } // End of namespace Toltecs |