[Scummvm-cvs-logs] scummvm master -> 52a1a6e60b418f9f0bcca9b12ef631f6f8176786

[digitall]

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

Summary:
52a1a6e60b TEENAGENT: Fix for bug #3428161 "PSP: No music in TeenAgent".


Commit: 52a1a6e60b418f9f0bcca9b12ef631f6f8176786
    https://github.com/scummvm/scummvm/commit/52a1a6e60b418f9f0bcca9b12ef631f6f8176786
Author: D G Turner (digitall at scummvm.org)
Date: 2012-08-02T04:41:40-07:00

Commit Message:
TEENAGENT: Fix for bug #3428161 "PSP: No music in TeenAgent".

This could occur on other platforms too and was a race hazard between
mixer thread startup and music being valid i.e. If the music doesn't
already exist, when the mixer callback is done, this deletes the channel
as idle. Reordered the calls to fix this.

Also, removed unecessary music->start() as this is done by setMusic(n)
on successful load anyway.

Changed paths:
    engines/teenagent/teenagent.cpp



diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index f06de6f..57c069f 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -535,9 +535,8 @@ Common::Error TeenAgentEngine::run() {
 
 	syncSoundSettings();
 
-	_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
 	setMusic(1);
-	music->start();
+	_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, music, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, false);
 
 	int load_slot = Common::ConfigManager::instance().getInt("save_slot");
 	if (load_slot >= 0) {