From e55b7745845e39ba385bff07d8dc45fa7317a4cb Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Fri, 5 Aug 2016 09:27:17 -0500
Subject: SCI32: Add kPlayVMDGetStatus kernel call

Used by Lighthouse.
---
 engines/sci/engine/kernel.h        |  1 +
 engines/sci/engine/kernel_tables.h |  1 +
 engines/sci/engine/kvideo.cpp      |  4 ++++
 engines/sci/graphics/video32.cpp   | 16 ++++++++++++++++
 engines/sci/graphics/video32.h     | 14 ++++++++++++++
 5 files changed, 36 insertions(+)

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 4ddddd94ef..4208ae348f 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -466,6 +466,7 @@ reg_t kPlayVMD(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDOpen(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDInit(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDClose(EngineState *s, int argc, reg_t *argv);
+reg_t kPlayVMDGetStatus(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDPlayUntilEvent(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDShowCursor(EngineState *s, int argc, reg_t *argv);
 reg_t kPlayVMDSetBlackoutArea(EngineState *s, int argc, reg_t *argv);
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index deb3f3c345..3e048277c1 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -451,6 +451,7 @@ static const SciKernelMapSubEntry kPlayVMD_subops[] = {
 	{ SIG_SINCE_SCI21,     0, MAP_CALL(PlayVMDOpen),               "r(i)(i)",              NULL },
 	{ SIG_SINCE_SCI21,     1, MAP_CALL(PlayVMDInit),               "ii(i)(i)(ii)",         NULL },
 	{ SIG_SINCE_SCI21,     6, MAP_CALL(PlayVMDClose),              "",                     NULL },
+	{ SIG_SINCE_SCI21,    10, MAP_CALL(PlayVMDGetStatus),          "",                     NULL },
 	{ SIG_SINCE_SCI21,    14, MAP_CALL(PlayVMDPlayUntilEvent),     "i(i)(i)",              NULL },
 	{ SIG_SINCE_SCI21,    16, MAP_CALL(PlayVMDShowCursor),         "i",                    NULL },
 	{ SIG_SINCE_SCI21,    17, MAP_DUMMY(PlayVMDStartBlob),         "",                     NULL },
diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp
index f61673eacf..b539c84f5d 100644
--- a/engines/sci/engine/kvideo.cpp
+++ b/engines/sci/engine/kvideo.cpp
@@ -425,6 +425,10 @@ reg_t kPlayVMDClose(EngineState *s, int argc, reg_t *argv) {
 	return make_reg(0, g_sci->_video32->getVMDPlayer().close());
 }
 
+reg_t kPlayVMDGetStatus(EngineState *s, int argc, reg_t *argv) {
+	return make_reg(0, g_sci->_video32->getVMDPlayer().getStatus());
+}
+
 reg_t kPlayVMDPlayUntilEvent(EngineState *s, int argc, reg_t *argv) {
 	const VMDPlayer::EventFlags flags = (VMDPlayer::EventFlags)argv[0].toUint16();
 	const int16 lastFrameNo = argc > 1 ? argv[1].toSint16() : -1;
diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index b4b14d6d23..8b1d4ef32b 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -613,6 +613,22 @@ VMDPlayer::IOStatus VMDPlayer::close() {
 	return kIOSuccess;
 }
 
+VMDPlayer::VMDStatus VMDPlayer::getStatus() const {
+	if (!_isOpen) {
+		return kVMDNotOpen;
+	}
+	if (_decoder->isPaused()) {
+		return kVMDPaused;
+	}
+	if (_decoder->isPlaying()) {
+		return kVMDPlaying;
+	}
+	if (_decoder->endOfVideo()) {
+		return kVMDFinished;
+	}
+	return kVMDOpen;
+}
+
 VMDPlayer::EventFlags VMDPlayer::kernelPlayUntilEvent(const EventFlags flags, const int16 lastFrameNo, const int16 yieldInterval) {
 	assert(lastFrameNo >= -1);
 
diff --git a/engines/sci/graphics/video32.h b/engines/sci/graphics/video32.h
index 3ea244292e..75b8fb2d21 100644
--- a/engines/sci/graphics/video32.h
+++ b/engines/sci/graphics/video32.h
@@ -268,6 +268,15 @@ public:
 		kEventFlagReverse      = 0x80
 	};
 
+	enum VMDStatus {
+		kVMDNotOpen  = 0,
+		kVMDOpen     = 1,
+		kVMDPlaying  = 2,
+		kVMDPaused   = 3,
+		kVMDStopped  = 4,
+		kVMDFinished = 5
+	};
+
 	VMDPlayer(SegManager *segMan, EventManager *eventMan);
 	~VMDPlayer();
 
@@ -295,6 +304,11 @@ public:
 	 */
 	IOStatus close();
 
+	/**
+	 * Gets the playback status of the VMD player.
+	 */
+	VMDStatus getStatus() const;
+
 	// NOTE: Was WaitForEvent in SSCI
 	EventFlags kernelPlayUntilEvent(const EventFlags flags, const int16 lastFrameNo, const int16 yieldInterval);
 
-- 
cgit v1.2.3