[Scummvm-git-logs] scummvm master -> 266c32669c0ce7a9eae3a58be96759e66ccfa436

[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:
11044ee5f6 QDENGINE: Fix xml output
a8459bcca2 QDENGINE: Rectify filename encoding in music track playback
266c32669c QDENGINE: Fix filename encoding in intro video playback


Commit: 11044ee5f617b0ff6caf33b18f46f67dba47a642
    https://github.com/scummvm/scummvm/commit/11044ee5f617b0ff6caf33b18f46f67dba47a642
Author: kunxl-gg (tiwari.25 at iitj.ac.in)
Date: 2024-08-31T14:10:35+02:00

Commit Message:
QDENGINE: Fix xml output

Signed-off-by: kunxl-gg <tiwari.25 at iitj.ac.in>

Changed paths:
    engines/qdengine/qdcore/qd_music_track.cpp


diff --git a/engines/qdengine/qdcore/qd_music_track.cpp b/engines/qdengine/qdcore/qd_music_track.cpp
index 4e583cfc6e1..6a4dda60a32 100644
--- a/engines/qdengine/qdcore/qd_music_track.cpp
+++ b/engines/qdengine/qdcore/qd_music_track.cpp
@@ -85,6 +85,7 @@ bool qdMusicTrack::save_script(Common::WriteStream &fh, int indent) const {
 	for (int i = 0; i < indent; i++) {
 		fh.writeString("\t");
 	}
+	fh.writeString("<music_track");
 
 	if (name()) {
 		fh.writeString(Common::String::format(" name=\"%s\"", qdscr_XML_string(name())));


Commit: a8459bcca27e7b4bc7c7fbc23fa1464af4b113b7
    https://github.com/scummvm/scummvm/commit/a8459bcca27e7b4bc7c7fbc23fa1464af4b113b7
Author: kunxl-gg (tiwari.25 at iitj.ac.in)
Date: 2024-08-31T14:10:35+02:00

Commit Message:
QDENGINE: Rectify filename encoding in music track playback

Signed-off-by: kunxl-gg <tiwari.25 at iitj.ac.in>

Changed paths:
    engines/qdengine/qdcore/qd_game_dispatcher.cpp


diff --git a/engines/qdengine/qdcore/qd_game_dispatcher.cpp b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
index 445961013c5..bd13f002a9c 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
@@ -2664,6 +2664,7 @@ bool qdGameDispatcher::play_music_track(const qdMusicTrack *p, bool interface_mo
 	_interface_music_mode = interface_mode;
 
 	debugC(3, kDebugLoad, "qdGameDispatcher::play_music_track() %s", transCyrillic(fname.toString()));
+	fname = Common::Path((char *)transCyrillic(fname.toString()));
 
 	return mpegPlayer::instance().play(fname, p->is_cycled(), p->volume());
 }


Commit: 266c32669c0ce7a9eae3a58be96759e66ccfa436
    https://github.com/scummvm/scummvm/commit/266c32669c0ce7a9eae3a58be96759e66ccfa436
Author: kunxl-gg (tiwari.25 at iitj.ac.in)
Date: 2024-08-31T14:10:35+02:00

Commit Message:
QDENGINE: Fix filename encoding in intro video playback

Signed-off-by: kunxl-gg <tiwari.25 at iitj.ac.in>

Changed paths:
    engines/qdengine/qdcore/util/WinVideo.cpp


diff --git a/engines/qdengine/qdcore/util/WinVideo.cpp b/engines/qdengine/qdcore/util/WinVideo.cpp
index 840ccd75a69..a7dd26e6dd0 100644
--- a/engines/qdengine/qdcore/util/WinVideo.cpp
+++ b/engines/qdengine/qdcore/util/WinVideo.cpp
@@ -73,10 +73,13 @@ void winVideo::set_window(int x, int y, int xsize, int ysize) {
 }
 
 bool winVideo::open_file(const Common::Path fname) {
+	Common::String filename = (char *)transCyrillic(fname.toString());
+	debugC(3, kDebugLoad, "winVideo::open_file(%s)", filename.c_str());
+
 	_videostream = new Common::File();
 
-	if (!_videostream->open(fname)) {
-		warning("WinVideo::open: Failed to open file %s", transCyrillic(fname.toString()));
+	if (!_videostream->open(filename.c_str())) {
+		warning("WinVideo::open: Failed to open file %s", filename.c_str());
 		delete _videostream;
 		return false;
 	}