[Scummvm-git-logs] scummvm master -> 2203386ce6ef169b4797909f63d185fe7eb8e8dd

csnover csnover at users.noreply.github.com
Wed Oct 4 01:57:44 CEST 2017


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:
815e3920a7 DEVTOOLS: Add theoradec support to Xcode create_project
88cd54c057 SCI32: Restore gameplay time in RAMA
2203386ce6 SCI32: Fix audio dumper decompressed size calculation for 16-bit audio


Commit: 815e3920a716e75761948599b836af010025a48d
    https://github.com/scummvm/scummvm/commit/815e3920a716e75761948599b836af010025a48d
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-10-03T18:56:35-05:00

Commit Message:
DEVTOOLS: Add theoradec support to Xcode create_project

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 00ef800..da4e698 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -485,11 +485,14 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
 		DEF_LOCALLIB_STATIC("libpng");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
 		DEF_LOCALLIB_STATIC("libogg");
 		DEF_LOCALLIB_STATIC("libvorbis");
 		DEF_LOCALLIB_STATIC("libvorbisfile");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
+		DEF_LOCALLIB_STATIC("libtheoradec");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
 		DEF_SYSTBD("libz");
 	}
@@ -552,11 +555,14 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
 		frameworks_iOS.push_back("libpng.a");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
 		frameworks_iOS.push_back("libogg.a");
 		frameworks_iOS.push_back("libvorbis.a");
 		frameworks_iOS.push_back("libvorbisfile.a");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
+		frameworks_iOS.push_back("libtheoradec.a");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_MAD")) {
 		frameworks_iOS.push_back("libmad.a");
 	}
@@ -632,11 +638,14 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (CONTAINS_DEFINE(setup.defines, "USE_PNG")) {
 		frameworks_osx.push_back("libpng.a");
 	}
-	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS")) {
+	if (CONTAINS_DEFINE(setup.defines, "USE_VORBIS") || CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
 		frameworks_osx.push_back("libogg.a");
 		frameworks_osx.push_back("libvorbis.a");
 		frameworks_osx.push_back("libvorbisfile.a");
 	}
+	if (CONTAINS_DEFINE(setup.defines, "USE_THEORADEC")) {
+		frameworks_osx.push_back("libtheoradec.a");
+	}
 	if (CONTAINS_DEFINE(setup.defines, "USE_ZLIB")) {
 		frameworks_osx.push_back("libz.tbd");
 	}


Commit: 88cd54c05797c83d24b9cd88a6e70bfecdcd5ed0
    https://github.com/scummvm/scummvm/commit/88cd54c05797c83d24b9cd88a6e70bfecdcd5ed0
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-10-03T18:56:35-05:00

Commit Message:
SCI32: Restore gameplay time in RAMA

This will cause non-linear time shifts in the system timer that
the game's custom save logic may not expect, but in initial testing
the game doesn't seem to care about this.

Fixes Trac#10259.

Changed paths:
    engines/sci/engine/kfile.cpp


diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 51a3cea..5edac18 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -469,6 +469,9 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
 						Graphics::skipThumbnail(*in);
 						valid = true;
 					}
+					if (meta.version >= 34) {
+						g_sci->setTickCount(meta.playTime);
+					}
 				}
 			} else {
 				out = saveFileMan->openForSaving(fileName);


Commit: 2203386ce6ef169b4797909f63d185fe7eb8e8dd
    https://github.com/scummvm/scummvm/commit/2203386ce6ef169b4797909f63d185fe7eb8e8dd
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-10-03T18:56:35-05:00

Commit Message:
SCI32: Fix audio dumper decompressed size calculation for 16-bit audio

Changed paths:
    engines/sci/console.cpp


diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 97a6164..2416834 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -1507,13 +1507,17 @@ bool Console::cmdAudioDump(int argc, const char **argv) {
 
 			// All AudioStreams must output 16-bit samples
 			bytesPerSample = 2;
-			decompressedSize = compressedSize * bytesPerSample;
+
+			decompressedSize = compressedSize;
 
 			if (flags & kCompressed) {
 				decompressedSize *= 2;
 			}
 			if (flags & k16Bit) {
 				sourceIs8Bit = false;
+			} else {
+				// 8-bit is implicitly up-converted by AudioStream to 16-bit
+				decompressedSize *= 2;
 			}
 			if (flags & kStereo) {
 				numChannels = 2;





More information about the Scummvm-git-logs mailing list