[Scummvm-cvs-logs] scummvm master -> dfd036bf71ddf8fe3abe8c103e7af25f83fbf094

[m-kiewitz]

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:
10741d5bd6 AUDIO: makeAIFFStream seek to start of dataStream
dfd036bf71 Merge branch 'master' of github.com:scummvm/scummvm


Commit: 10741d5bd68f556f5314a80c8d959767e76b4f8a
    https://github.com/scummvm/scummvm/commit/10741d5bd68f556f5314a80c8d959767e76b4f8a
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-07T00:30:15+02:00

Commit Message:
AUDIO: makeAIFFStream seek to start of dataStream

fixes non working audio when playing a File(Stream)

Changed paths:
    audio/decoders/aiff.cpp



diff --git a/audio/decoders/aiff.cpp b/audio/decoders/aiff.cpp
index 7d6ed43..72baf84 100644
--- a/audio/decoders/aiff.cpp
+++ b/audio/decoders/aiff.cpp
@@ -187,6 +187,9 @@ RewindableAudioStream *makeAIFFStream(Common::SeekableReadStream *stream, Dispos
 		return 0;
 	}
 
+	// Seek to the start of dataStream, required for at least FileStream
+	dataStream->seek(0);
+
 	switch (codec) {
 	case kCodecPCM:
 	case MKTAG('t', 'w', 'o', 's'):


Commit: dfd036bf71ddf8fe3abe8c103e7af25f83fbf094
    https://github.com/scummvm/scummvm/commit/dfd036bf71ddf8fe3abe8c103e7af25f83fbf094
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-07T00:30:40+02:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
  A engines/sherlock/tattoo/tattoo_resources.cpp
  A engines/sherlock/tattoo/tattoo_resources.h
    engines/sherlock/detection.cpp
    engines/sherlock/map.cpp
    engines/sherlock/module.mk
    engines/sherlock/people.cpp
    engines/sherlock/sherlock.h
    engines/sherlock/tattoo/tattoo.cpp
    engines/sherlock/tattoo/tattoo_scene.cpp
    engines/sherlock/tattoo/tattoo_talk.cpp