mirror of
https://github.com/libretro/scummvm.git
synced 2025-02-10 04:43:26 +00:00
Merge pull request #340 from jdm/menu-audio
GRIM: Pause current wave frame along with SMUSH movie.
This commit is contained in:
commit
7f95bb7561
@ -20,6 +20,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "common/system.h"
|
||||
|
||||
#include "engines/grim/movie/movie.h"
|
||||
|
||||
#if !defined(USE_MPEG2) || !defined(USE_SMUSH) || !defined(USE_BINK)
|
||||
@ -30,6 +32,11 @@ namespace Grim {
|
||||
|
||||
MoviePlayer *g_movie;
|
||||
|
||||
void MoviePlayer::pause(bool p) {
|
||||
_videoPause = p;
|
||||
g_system->getMixer()->pauseHandle(_soundHandle, p);
|
||||
}
|
||||
|
||||
// Fallback for when USE_MPEG2 isnt defined, might want to do something similar
|
||||
// for USE_BINK if that comes over from ScummVM
|
||||
|
||||
|
@ -85,7 +85,7 @@ public:
|
||||
|
||||
virtual bool play(const char *filename, bool looping, int x, int y) = 0;
|
||||
virtual void stop() = 0;
|
||||
virtual void pause(bool p) { _videoPause = p; }
|
||||
virtual void pause(bool p);
|
||||
virtual bool isPlaying() { return !_videoFinished; }
|
||||
virtual bool isUpdateNeeded() { return _updateNeeded; }
|
||||
virtual byte *getDstPtr() { return _externalBuffer; }
|
||||
|
Loading…
x
Reference in New Issue
Block a user