[Scummvm-git-logs] scummvm-tools master -> 28357669833af123e9ec471b8f371af4bd27e626

[lotharsm]

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

Summary:
fa23b071bf TINSEL: fix FLAC package creation
2835766983 TINSEL: Close file handles when compression job complete


Commit: fa23b071bf7b550d4c41942ef3ea0cef8fa5b66a
    https://github.com/scummvm/scummvm-tools/commit/fa23b071bf7b550d4c41942ef3ea0cef8fa5b66a
Author: eddebaby (ed_j_kearney at yahoo.co.uk)
Date: 2021-07-03T11:37:28+02:00

Commit Message:
TINSEL: fix FLAC package creation

A minor error in the code creates an .IDX file with corrupt data at the beginning of the file. This corrupt .IDX starts with `FLACFLAC` instead of `FLAC`. and the first proper index is blank.

Manually removing the erroneous `FLAC` from the .IDX file, allows the file to work in ScummVM, but some corruption has still occurred.

This can be most easily evidenced with the line "Rincewind, Rincewind, wake up!" in the intro sequence, which is missing given the above circumstances.

This is fixed with this commit.

Note: this also prepends `FLAC` to the .SMP file, to match the OGG and MP3 packages.

Changed paths:
    engines/tinsel/compress_tinsel.cpp


diff --git a/engines/tinsel/compress_tinsel.cpp b/engines/tinsel/compress_tinsel.cpp
index 19e71b78d..18cecc385 100644
--- a/engines/tinsel/compress_tinsel.cpp
+++ b/engines/tinsel/compress_tinsel.cpp
@@ -287,7 +287,7 @@ void CompressTinsel::execute() {
 		_output_smp.writeUint32BE(MKID_BE('OGG '));
 		break;
 	case AUDIO_FLAC:
-		_output_idx.writeUint32BE(MKID_BE('FLAC'));
+		_output_smp.writeUint32BE(MKID_BE('FLAC'));
 		break;
 	default:
 		throw ToolException("Unknown audio format!");


Commit: 28357669833af123e9ec471b8f371af4bd27e626
    https://github.com/scummvm/scummvm-tools/commit/28357669833af123e9ec471b8f371af4bd27e626
Author: eddebaby (ed_j_kearney at yahoo.co.uk)
Date: 2021-07-03T11:37:28+02:00

Commit Message:
TINSEL: Close file handles when compression job complete

Close the open file handles of the input .IDX and .SMP and close and write the output .IDX and .SMP files at the end of the CompressTinsel::execute() function.

Changed paths:
    engines/tinsel/compress_tinsel.cpp


diff --git a/engines/tinsel/compress_tinsel.cpp b/engines/tinsel/compress_tinsel.cpp
index 18cecc385..a7f7eac6f 100644
--- a/engines/tinsel/compress_tinsel.cpp
+++ b/engines/tinsel/compress_tinsel.cpp
@@ -348,6 +348,11 @@ void CompressTinsel::execute() {
 		indexNo++;
 	}
 
+	/* Close file handles */
+	_output_smp.close();
+	_output_idx.close();
+	_input_smp.close();
+	_input_idx.close();
 	/* And some clean-up :-) */
 	Common::removeFile(TEMP_RAW);
 	Common::removeFile(TEMP_ENC);