[Scummvm-cvs-logs] SF.net SVN: scummvm:[49907] scummvm/trunk/engines/sci/sound/music.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 49907
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49907&view=rev
Author:   m_kiewitz
Date:     2010-06-16 21:23:47 +0000 (Wed, 16 Jun 2010)

Log Message:
-----------
SCI: dont seek during init of music but on play, fixes assert when restoring saves caused by r49905 - because channel remapping isn't done at that point

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/music.cpp

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-06-16 21:07:26 UTC (rev 49906)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-06-16 21:23:47 UTC (rev 49907)
@@ -224,8 +224,6 @@
 			channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(), _pMidiDrv->hasRhythmChannel());
 			pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
 
-			// Fast forward to the last position and perform associated events when loading
-			pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
 			_mutex.unlock();
 		}
 	}
@@ -316,6 +314,9 @@
 			pSnd->pMidiParser->setVolume(pSnd->volume);
 			if (pSnd->status == kSoundStopped)
 				pSnd->pMidiParser->jumpToTick(0);
+			else
+				// Fast forward to the last position and perform associated events when loading
+				pSnd->pMidiParser->jumpToTick(pSnd->ticker, true);
 		}
 		_mutex.unlock();
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.