[Scummvm-git-logs] scummvm master -> 5c362f11c2acb96f9c0ee0e1225f26d90b5577fd

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec1d352988 VIDEO: QTVR: Put all debug output in 'gvideo' channel
09f821b03f VIDEO: QTVR: Implement hotspot rendering toggle with 'h'
5c362f11c2 TESTBED: Remove now obsolete hotspot toggling in video test


Commit: ec1d3529888ac9ce96a8c1c1b6a03bbf5bed78c0
    https://github.com/scummvm/scummvm/commit/ec1d3529888ac9ce96a8c1c1b6a03bbf5bed78c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-23T21:53:16+01:00

Commit Message:
VIDEO: QTVR: Put all debug output in 'gvideo' channel

Changed paths:
    video/qt_decoder.cpp
    video/qtvr_decoder.cpp


diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 72768c71a0e..3f909bec2d2 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -64,6 +64,8 @@ QuickTimeDecoder::~QuickTimeDecoder() {
 }
 
 bool QuickTimeDecoder::loadFile(const Common::Path &filename) {
+	debugC(1, kDebugLevelGVideo, "QuickTimeDecoder::loadFile(\"%s\")", filename.toString().c_str());
+
 	if (!Common::QuickTimeParser::parseFile(filename))
 		return false;
 
diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index 10323c081fc..d280a2eec5e 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -369,7 +369,7 @@ void QuickTimeDecoder::updateAngles() {
 		_panAngle = (float)getCurrentColumn() / (float)_nav.columns * 360.0;
 		_tiltAngle = ((_nav.rows - 1) / 2.0 - (float)getCurrentRow()) / (float)(_nav.rows - 1) * 180.0;
 
-		debugC(1, kDebugLevelMacGUI, "QTVR: row: %d col: %d  (%d x %d) pan: %f tilt: %f", getCurrentRow(), getCurrentColumn(), _nav.rows, _nav.columns, getPanAngle(), getTiltAngle());
+		debugC(1, kDebugLevelGVideo, "QTVR: row: %d col: %d  (%d x %d) pan: %f tilt: %f", getCurrentRow(), getCurrentColumn(), _nav.rows, _nav.columns, getPanAngle(), getTiltAngle());
 	}
 }
 
@@ -549,7 +549,7 @@ Graphics::Surface *QuickTimeDecoder::PanoTrackHandler::constructMosaic(VideoTrac
 	Graphics::Surface *target = new Graphics::Surface();
 	target->create(w * framew, h * frameh, track->getPixelFormat());
 
-	warning("Pixel format: %s", track->getPixelFormat().toString().c_str());
+	debugC(1, kDebugLevelGVideo, "Pixel format: %s", track->getPixelFormat().toString().c_str());
 
 	Common::Rect srcRect(0, 0, framew, frameh);
 
@@ -600,12 +600,12 @@ void QuickTimeDecoder::PanoTrackHandler::constructPanorama() {
 		delete _constructedHotspots;
 	}
 
-	warning("scene: %d (%d x %d) hotspots: %d (%d x %d)", desc->_sceneTrackID, desc->_sceneSizeX, desc->_sceneSizeY,
+	debugC(1, kDebugLevelGVideo, "scene: %d (%d x %d) hotspots: %d (%d x %d)", desc->_sceneTrackID, desc->_sceneSizeX, desc->_sceneSizeY,
 			desc->_hotSpotTrackID, desc->_hotSpotSizeX, desc->_hotSpotSizeY);
 
-	warning("sceneNumFrames: %d x %d sceneColorDepth: %d", desc->_sceneNumFramesX, desc->_sceneNumFramesY, desc->_sceneColorDepth);
+	debugC(1, kDebugLevelGVideo, "sceneNumFrames: %d x %d sceneColorDepth: %d", desc->_sceneNumFramesX, desc->_sceneNumFramesY, desc->_sceneColorDepth);
 
-	warning("Node idx: %d", sample->hdr.nodeID);
+	debugC(1, kDebugLevelGVideo, "Node idx: %d", sample->hdr.nodeID);
 
 	int nodeidx = -1;
 	for (int i = 0; i < (int)_parent->panoInfo.nodes.size(); i++)
@@ -621,7 +621,7 @@ void QuickTimeDecoder::PanoTrackHandler::constructPanorama() {
 
 	uint32 timestamp = _parent->panoInfo.nodes[nodeidx].timestamp;
 
-	warning("Timestamp: %d", timestamp);
+	debugC(1, kDebugLevelGVideo, "Timestamp: %d", timestamp);
 
 	VideoTrackHandler *track = (VideoTrackHandler *)(_decoder->getTrack(_decoder->Common::QuickTimeParser::_tracks[desc->_sceneTrackID - 1]->targetTrack));
 


Commit: 09f821b03fbaa09ecec13a49670e3283eb360ad3
    https://github.com/scummvm/scummvm/commit/09f821b03fbaa09ecec13a49670e3283eb360ad3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-23T21:53:16+01:00

Commit Message:
VIDEO: QTVR: Implement hotspot rendering toggle with 'h'

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index d280a2eec5e..f5ff32b0921 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -1224,6 +1224,9 @@ void QuickTimeDecoder::handlePanoKey(Common::KeyState &state, bool down, bool re
 	} else {
 		_zoomState = kZoomNone;
 	}
+
+	if (state.keycode == Common::KEYCODE_h && down && !repeat)
+		renderHotspots(!_renderHotspots);
 }
 
 enum {


Commit: 5c362f11c2acb96f9c0ee0e1225f26d90b5577fd
    https://github.com/scummvm/scummvm/commit/5c362f11c2acb96f9c0ee0e1225f26d90b5577fd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-23T21:53:16+01:00

Commit Message:
TESTBED: Remove now obsolete hotspot toggling in video test

Changed paths:
    engines/testbed/video.cpp


diff --git a/engines/testbed/video.cpp b/engines/testbed/video.cpp
index 216e9a81048..61358b11e71 100644
--- a/engines/testbed/video.cpp
+++ b/engines/testbed/video.cpp
@@ -101,7 +101,6 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 	video->start();
 
 	Common::Point mouse;
-	bool renderHotspots = false;
 
 	while (!video->endOfVideo()) {
 		if (video->needsUpdate()) {
@@ -159,11 +158,6 @@ Common::Error Videotests::videoTest(Common::SeekableReadStream *stream, const Co
 						break;
 					case Common::EVENT_KEYUP:
 					case Common::EVENT_KEYDOWN:
-						if (event.kbd == Common::KEYCODE_h && event.type == Common::EVENT_KEYDOWN) {
-							renderHotspots = !renderHotspots;
-							((Video::QuickTimeDecoder *)video)->renderHotspots(renderHotspots);
-						}
-
 						((Video::QuickTimeDecoder *)video)->handleKey(event.kbd, event.type == Common::EVENT_KEYDOWN);
 						break;
 					default: