From d4d2cb1494348efd4d502e756c951d63bad27d0d Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 6 Sep 2011 11:13:21 -0400
Subject: [PATCH] GRIM: Move SMUSH audio pausing into generic movie backend.

---
 engines/grim/movie/movie.cpp | 7 +++++++
 engines/grim/movie/movie.h   | 2 +-
 engines/grim/movie/smush.cpp | 5 -----
 engines/grim/movie/smush.h   | 1 -
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engines/grim/movie/movie.cpp b/engines/grim/movie/movie.cpp
index a8f656d8135..aef8108f6a6 100644
--- a/engines/grim/movie/movie.cpp
+++ b/engines/grim/movie/movie.cpp
@@ -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
 
diff --git a/engines/grim/movie/movie.h b/engines/grim/movie/movie.h
index 9b8a6216dec..9495f9a4c97 100644
--- a/engines/grim/movie/movie.h
+++ b/engines/grim/movie/movie.h
@@ -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; }
diff --git a/engines/grim/movie/smush.cpp b/engines/grim/movie/smush.cpp
index b38e82dbec9..1b07532a0b1 100644
--- a/engines/grim/movie/smush.cpp
+++ b/engines/grim/movie/smush.cpp
@@ -546,11 +546,6 @@ bool SmushPlayer::play(const char *filename, bool looping, int x, int y) {
 	return true;
 }
 
-void SmushPlayer::pause(bool p) {
-  MoviePlayer::pause(p);
-  g_system->getMixer()->pauseHandle(_soundHandle, p);
-}
-
 void SmushPlayer::saveState(SaveGame *state) {
 	state->beginSection('SMUS');
 
diff --git a/engines/grim/movie/smush.h b/engines/grim/movie/smush.h
index 48f915a289c..767e59b920b 100644
--- a/engines/grim/movie/smush.h
+++ b/engines/grim/movie/smush.h
@@ -71,7 +71,6 @@ private:
 	void parseNextFrame();
 	void init();
 	void deinit();
-	void pause(bool p);
 	void handleDeltaPalette(byte *src, int32 size);
 	void handleFramesHeader();
 	void handleFrameDemo();