From 9d5eea2d2c3f79147b15fb7920cd6d5de8e15d44 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 7 May 2008 03:49:53 +0000
Subject: Sound in object videos works now, too

svn-id: r31916
---
 engines/gob/videoplayer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/gob/videoplayer.h')

diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index fd3c68aa1a..a04a0dbc9d 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -68,6 +68,7 @@ public:
 			uint16 left, uint16 top, uint16 width, uint16 height,
 			uint16 x, uint16 y, uint16 pitch, int16 transp = -1);
 	void slotCopyPalette(int slot, int16 palStart = -1, int16 palEnd = -1);
+	void slotWaitEndFrame(int slot, bool onlySound = false);
 
 	bool slotIsOpen(int slot) const;
 
-- 
cgit v1.2.3


From 18db41db506b1e18e050e8dded44dc8501b9bc8f Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 8 May 2008 15:51:02 +0000
Subject: Implemented the background "music" / atmospheric sounds in Woodruff

svn-id: r31949
---
 engines/gob/videoplayer.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/gob/videoplayer.h')

diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index a04a0dbc9d..29531f7ce2 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -132,6 +132,7 @@ private:
 	bool doPlay(int16 frame, int16 breakKey,
 			uint16 palCmd, int16 palStart, int16 palEnd,
 			int16 palFrame, int16 endFrame);
+	void evalBgShading(CoktelVideo &video);
 };
 
 } // End of namespace Gob
-- 
cgit v1.2.3


From aac4786bbe6be0618266eb4f24ed2171523b268e Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 14 May 2008 23:58:26 +0000
Subject: This should fix the video not closing / chunk slot clogging bug
 (Yeah, I'm apparently stupid *g*)

svn-id: r32131
---
 engines/gob/videoplayer.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/gob/videoplayer.h')

diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 29531f7ce2..278045b9e5 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -128,6 +128,8 @@ private:
 
 	const Video *getVideoBySlot(int slot = -1) const;
 
+	int getNextFreeSlot();
+
 	void copyPalette(CoktelVideo &video, int16 palStart = -1, int16 palEnd = -1);
 	bool doPlay(int16 frame, int16 breakKey,
 			uint16 palCmd, int16 palStart, int16 palEnd,
-- 
cgit v1.2.3


From 62d0a0d1d1e3735e4898729493ea2dcaa7f85df4 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Fri, 23 May 2008 20:40:28 +0000
Subject: Implemented GobEngine::pauseEngineIntern()

svn-id: r32233
---
 engines/gob/videoplayer.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/gob/videoplayer.h')

diff --git a/engines/gob/videoplayer.h b/engines/gob/videoplayer.h
index 278045b9e5..b7aa7313b0 100644
--- a/engines/gob/videoplayer.h
+++ b/engines/gob/videoplayer.h
@@ -83,6 +83,8 @@ public:
 	void writeVideoInfo(const char *videoFile, int16 varX, int16 varY,
 			int16 varFrames, int16 varWidth, int16 varHeight);
 
+	void notifyPaused(uint32 duration);
+
 private:
 	class Video {
 		public:
-- 
cgit v1.2.3