[Scummvm-cvs-logs] scummvm master -> 49a8f7675f9685df984f5acd88ea4ac56b703f33

[clone2727]

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

Summary:
dfb6822886 GROOVIE: Detect iOS platform based on binary existence
49a8f7675f Merge pull request #20 from scott-t/t7g-ios


Commit: dfb682288699e84321c14cc5d52cbd3fdaeba40c
    https://github.com/scummvm/scummvm/commit/dfb682288699e84321c14cc5d52cbd3fdaeba40c
Author: Scott Thomas (scott_t at users.sourceforge.net)
Date: 2011-06-01T06:50:12-07:00

Commit Message:
GROOVIE: Detect iOS platform based on binary existence

Change to choice of music file encoding means the gu16.m4a may not exist

Changed paths:
    engines/groovie/detection.cpp



diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 87ad534..0dd510a 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -116,7 +116,7 @@ static const GroovieGameDescription gameDescriptions[] = {
 			"t7g", "",
 			{
 				{ "script.grv", 0, "d1b8033b40aa67c076039881eccce90d", 16659},
-				{ "gu16.m4a", 0, NULL, 2051214 },
+				{ "SeventhGuest", 0, NULL, -1},
 				{ NULL, 0, NULL, 0}
 			},
 			Common::EN_ANY, Common::kPlatformIOS, ADGF_NO_FLAGS,


Commit: 49a8f7675f9685df984f5acd88ea4ac56b703f33
    https://github.com/scummvm/scummvm/commit/49a8f7675f9685df984f5acd88ea4ac56b703f33
Author: clone2727 (clone2727 at gmail.com)
Date: 2011-06-01T07:04:05-07:00

Commit Message:
Merge pull request #20 from scott-t/t7g-ios

T7G iOS support

Changed paths:
  A audio/decoders/aac.cpp
  A audio/decoders/aac.h
  A audio/decoders/qdm2.cpp
  A audio/decoders/qdm2.h
  A audio/decoders/qdm2data.h
  A audio/decoders/quicktime.cpp
  A audio/decoders/quicktime.h
  A audio/decoders/quicktime_intern.h
  A common/quicktime.cpp
  A common/quicktime.h
  R video/codecs/qdm2.cpp
  R video/codecs/qdm2.h
  R video/codecs/qdm2data.h
    audio/audiostream.cpp
    audio/module.mk
    base/version.cpp
    common/module.mk
    common/util.cpp
    common/util.h
    configure
    engines/groovie/detection.cpp
    engines/groovie/groovie.cpp
    engines/groovie/groovie.h
    engines/groovie/music.cpp
    engines/groovie/music.h
    engines/groovie/player.cpp
    engines/groovie/player.h
    engines/groovie/resource.cpp
    engines/groovie/resource.h
    engines/groovie/script.cpp
    engines/groovie/script.h
    engines/groovie/vdx.cpp
    ports.mk
    video/module.mk
    video/qt_decoder.cpp
    video/qt_decoder.h