[Scummvm-cvs-logs] SF.net SVN: scummvm: [30481] scummvm/trunk/engines/scumm/imuse_digi

[aquadran at users.sourceforge.net]

Revision: 30481
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30481&view=rev
Author:   aquadran
Date:     2008-01-14 06:48:35 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
fixed setting hookId for music, it doesn't worked before

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.h
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2008-01-13 23:48:56 UTC (rev 30480)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.h	2008-01-14 14:48:35 UTC (rev 30481)
@@ -149,6 +149,7 @@
 
 	int getSoundIdByName(const char *soundName);
 	void fadeOutMusic(int fadeDelay);
+	void setHookIdForMusic(int hookId);
 	Track *cloneToFadeOutTrack(Track *track, int fadeDelay);
 
 	void setFtMusicState(int stateId);

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2008-01-13 23:48:56 UTC (rev 30480)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_music.cpp	2008-01-14 14:48:35 UTC (rev 30481)
@@ -298,11 +298,11 @@
 	case 0:
 		break;
 	case 8:
-		setHookId(table->soundId, table->hookId);
+		setHookIdForMusic(table->hookId);
 		break;
 	case 9:
 		_stopingSequence = true;
-		setHookId(table->soundId, table->hookId);
+		setHookIdForMusic(table->hookId);
 		break;
 	case 2:
 		if (table->filename[0] == 0) {

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-13 23:48:56 UTC (rev 30480)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_track.cpp	2008-01-14 14:48:35 UTC (rev 30481)
@@ -280,6 +280,18 @@
 	}
 }
 
+void IMuseDigital::setHookIdForMusic(int hookId) {
+	Common::StackLock lock(_mutex, "IMuseDigital::setHookIdForMusic()");
+	debug(5, "IMuseDigital::setHookIdForMusic");
+
+	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
+		Track *track = _track[l];
+		if (track->used && !track->toBeRemoved && (track->volGroupId == IMUSE_VOLGRP_MUSIC)) {
+			track->curHookId = hookId;
+		}
+	}
+}
+
 IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) {
 	assert(track);
 	Track *fadeTrack = 0;


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