[Scummvm-cvs-logs] SF.net SVN: scummvm: [30869] scummvm/branches/branch-0-11-0/engines/scumm/ imuse_digi
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Fri Feb 15 15:41:37 CET 2008
Revision: 30869
http://scummvm.svn.sourceforge.net/scummvm/?rev=30869&view=rev
Author: aquadran
Date: 2008-02-15 06:41:37 -0800 (Fri, 15 Feb 2008)
Log Message:
-----------
sync dimuse to 0.11.0 branch
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_music.cpp
scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_script.cpp
scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.cpp
scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.h
Modified: scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_music.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_music.cpp 2008-02-15 14:14:04 UTC (rev 30868)
+++ scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_music.cpp 2008-02-15 14:41:37 UTC (rev 30869)
@@ -202,7 +202,10 @@
void IMuseDigital::setComiMusicState(int stateId) {
int l, num = -1;
- if (stateId == 0 || stateId == 4)
+ if (stateId == 4) // look into #1881415 bug, ignore stateId == 4 it's seems needed after all
+ return;
+
+ if (stateId == 0)
stateId = 1000;
for (l = 0; _comiStateMusicTable[l].soundId != -1; l++) {
Modified: scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_script.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_script.cpp 2008-02-15 14:14:04 UTC (rev 30868)
+++ scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_script.cpp 2008-02-15 14:41:37 UTC (rev 30869)
@@ -152,16 +152,10 @@
}
break;
case 0x2000: // ImuseSetGroupSfxVolume
- debug(5, "ImuseSetGroupSFXVolume (%d)", b);
-// setGroupSfxVolume(b);
break;
case 0x2001: // ImuseSetGroupVoiceVolume
- debug(5, "ImuseSetGroupVoiceVolume (%d)", b);
-// setGroupVoiceVolume(b);
break;
case 0x2002: // ImuseSetGroupMusicVolume
- debug(5, "ImuseSetGroupMusicVolume (%d)", b);
-// setGroupMusicVolume(b);
break;
default:
error("IMuseDigital::doCommand DEFAULT command %d", cmd);
Modified: scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.cpp 2008-02-15 14:14:04 UTC (rev 30868)
+++ scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.cpp 2008-02-15 14:41:37 UTC (rev 30869)
@@ -93,7 +93,7 @@
debug(5, "IMuseDigital::startSound(%d, trackId:%d)", soundId, l);
Track *track = _track[l];
-
+
// Reset the track
memset(track, 0, sizeof(Track));
@@ -296,7 +296,7 @@
for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
Track *track = _track[l];
if (track->used && !track->toBeRemoved && (track->volGroupId == IMUSE_VOLGRP_MUSIC)) {
- debug(5, "IMuseDigital::fadeOutMusic(fade:%d, soound:%d)", fadeDelay, track->soundId);
+ debug(5, "IMuseDigital::fadeOutMusic(fade:%d, sound:%d)", fadeDelay, track->soundId);
cloneToFadeOutTrack(track, fadeDelay);
flushTrack(track);
break;
Modified: scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.h
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.h 2008-02-15 14:14:04 UTC (rev 30868)
+++ scummvm/branches/branch-0-11-0/engines/scumm/imuse_digi/dimuse_track.h 2008-02-15 14:41:37 UTC (rev 30869)
@@ -81,7 +81,7 @@
Track() : soundId(-1), used(false), stream(NULL) {
}
-
+
int getPan() const { return (pan != 64) ? 2 * pan - 127 : 0; }
int getVol() const { return vol / 1000; }
Audio::Mixer::SoundType getType() const {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list