[Scummvm-git-logs] scummvm master -> 251fc08de6b228fb66a7fde3768008fc6073340d
whoozle
noreply at scummvm.org
Tue Jul 21 17:50:50 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
251fc08de6 PHOENIXVR: Pause video decoder if engine was paused
Commit: 251fc08de6b228fb66a7fde3768008fc6073340d
https://github.com/scummvm/scummvm/commit/251fc08de6b228fb66a7fde3768008fc6073340d
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-07-21T18:50:14+01:00
Commit Message:
PHOENIXVR: Pause video decoder if engine was paused
Changed paths:
engines/phoenixvr/phoenixvr.cpp
engines/phoenixvr/phoenixvr.h
diff --git a/engines/phoenixvr/phoenixvr.cpp b/engines/phoenixvr/phoenixvr.cpp
index b073f1fca0f..e2d53dac53d 100644
--- a/engines/phoenixvr/phoenixvr.cpp
+++ b/engines/phoenixvr/phoenixvr.cpp
@@ -1021,6 +1021,7 @@ void PhoenixVREngine::playMovie(const Common::String &movie) {
g_system->fillScreen(0);
_system->lockMouse(false);
dec->start();
+ _currentDecoder = dec.get();
Common::SharedPtr<Video::Subtitles> subtitles = loadSubtitles(movie);
if (subtitles) {
@@ -1070,6 +1071,7 @@ void PhoenixVREngine::playMovie(const Common::String &movie) {
if (subtitles)
g_system->hideOverlay();
_system->lockMouse(_vr.isVR());
+ _currentDecoder = nullptr;
}
void PhoenixVREngine::playAnimation(const Common::String &name, const Common::String &var, int varValue, float speed) {
@@ -1919,12 +1921,15 @@ void PhoenixVREngine::processGenericEvents(const Common::Event &event) {
void PhoenixVREngine::pauseEngineIntern(bool pause) {
// this is called when main menu appears on the screen
+ debug("pauseEngineIntern %d", pause);
Engine::pauseEngineIntern(pause);
if (pause) {
_system->lockMouse(false);
} else {
_system->lockMouse(_vr.isVR());
}
+ if (_currentDecoder)
+ _currentDecoder->pauseVideo(pause);
}
bool PhoenixVREngine::testSaveSlot(int idx) const {
diff --git a/engines/phoenixvr/phoenixvr.h b/engines/phoenixvr/phoenixvr.h
index a418ed330c9..743e1247eb8 100644
--- a/engines/phoenixvr/phoenixvr.h
+++ b/engines/phoenixvr/phoenixvr.h
@@ -385,6 +385,8 @@ private:
bool _restarted = false;
bool _loaded = false;
+
+ Video::VideoDecoder *_currentDecoder = nullptr;
};
extern PhoenixVREngine *g_engine;
More information about the Scummvm-git-logs
mailing list