[Scummvm-cvs-logs] SF.net SVN: scummvm:[42336] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Fri Jul 10 16:30:37 CEST 2009
Revision: 42336
http://scummvm.svn.sourceforge.net/scummvm/?rev=42336&view=rev
Author: nolange
Date: 2009-07-10 14:30:37 +0000 (Fri, 10 Jul 2009)
Log Message:
-----------
changed: period in Paula get set immediately instead of queued
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp
scummvm/branches/gsoc2009-mods/sound/mods/paula.h
scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp
Modified: scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp 2009-07-10 13:38:16 UTC (rev 42335)
+++ scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp 2009-07-10 14:30:37 UTC (rev 42336)
@@ -56,7 +56,6 @@
_voice[voice].length = 0;
_voice[voice].lengthRepeat = 0;
_voice[voice].period = 0;
- _voice[voice].periodRepeat = 0;
_voice[voice].volume = 0;
_voice[voice].offset = 0;
_voice[voice].dmaCount = 0;
@@ -147,13 +146,7 @@
_voice[voice].data = data = _voice[voice].dataRepeat;
_voice[voice].length = _voice[voice].lengthRepeat;
sLen = intToFrac(_voice[voice].length);
- // TODO: the value in offset shouldnt be dropped but scaled to new rate
- if (_voice[voice].period != _voice[voice].periodRepeat) {
- _voice[voice].period = _voice[voice].periodRepeat;
- rate = doubleToFrac(_periodScale / _voice[voice].period);
- }
-
// If the "rate" exceeds the sample rate, we would have to perform constant
// wrap arounds. So, apply the first step of the euclidean algorithm to
// achieve the same more efficiently: Take rate modulo sLen
Modified: scummvm/branches/gsoc2009-mods/sound/mods/paula.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/paula.h 2009-07-10 13:38:16 UTC (rev 42335)
+++ scummvm/branches/gsoc2009-mods/sound/mods/paula.h 2009-07-10 14:30:37 UTC (rev 42336)
@@ -80,7 +80,6 @@
uint32 length;
uint32 lengthRepeat;
int16 period;
- int16 periodRepeat;
byte volume;
frac_t offset;
byte panning; // For stereo mixing: 0 = far left, 255 = far right
@@ -119,12 +118,12 @@
ch.length = ch.lengthRepeat;
// actually first 2 bytes are dropped?
ch.offset = intToFrac(0);
- ch.period = ch.periodRepeat;
+ // ch.period = ch.periodRepeat;
}
void setChannelPeriod(byte channel, int16 period) {
assert(channel < NUM_VOICES);
- _voice[channel].periodRepeat = period;
+ _voice[channel].period = period;
}
void setChannelVolume(byte channel, byte volume) {
Modified: scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp 2009-07-10 13:38:16 UTC (rev 42335)
+++ scummvm/branches/gsoc2009-mods/tfmx/mxtxplayer.cpp 2009-07-10 14:30:37 UTC (rev 42336)
@@ -74,7 +74,7 @@
param = atoi(argv[++i]);
debug( "play Song %02X", param);
- player->doSong(0);
+ player->doSong(param);
//player->noteOn(player->_channelCtx[0], 43, 64, 0);
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