[Scummvm-cvs-logs] SF.net SVN: scummvm: [32811] scummvm/trunk/engines/kyra/sound_towns.cpp
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Thu Jun 26 22:30:44 CEST 2008
Revision: 32811
http://scummvm.svn.sourceforge.net/scummvm/?rev=32811&view=rev
Author: athrxx
Date: 2008-06-26 13:30:43 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
scummvm/trunk/engines/kyra/sound_towns.cpp
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2008-06-26 20:13:04 UTC (rev 32810)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2008-06-26 20:30:43 UTC (rev 32811)
@@ -1103,7 +1103,7 @@
void generateOutput(int phasebuf, int *feedbuf, int &out);
void feedbackLevel(int32 level) {_feedbackLevel = level ? level + 6 : 0; }
- void detune(int value) { _detn = (int32*) &_detnTbl[value << 5]; }
+ void detune(int value) { _detn = &_detnTbl[value << 5]; }
void multiple(uint32 value) { _multiple = value ? (value << 1) : 1; }
void attackRate(uint32 value) { _specifiedAttackRate = value; }
bool scaleRate(uint8 value);
@@ -1132,7 +1132,7 @@
uint8 _kcode;
uint32 _phase;
uint32 _phaseIncrement;
- int32 *_detn;
+ const int32 *_detn;
const uint8 *_rateTbl;
const uint8 *_rshiftTbl;
@@ -1297,7 +1297,7 @@
void TownsPC98_OpnOperator::reset(){
keyOff();
_tick = 0;
- _keyScale2 = -1;
+ _keyScale2 = 0;
_currentLevel = 1023;
frequency(0);
@@ -1676,7 +1676,7 @@
//_channels[i]->flags = (_channels[i]->flags & ~CHS_EOT) | CHS_ALL_BUT_EOT;
//_channels[i]->ticksLeft = 1;
//_channels[i]->dataPtr = data + READ_LE_UINT16(src_a);
- uint8 *tmp = data + READ_LE_UINT16(src_a);
+ //uint8 *tmp = data + READ_LE_UINT16(src_a);
src_a += 2;
}
@@ -1755,7 +1755,7 @@
int *feed = _channels[i]->feedbuf;
int *del = &feed[2];
- for (int ii = 0; ii < bufferSize ; ii++) {
+ for (uint32 ii = 0; ii < bufferSize ; ii++) {
phbuf1 = phbuf2 = output = 0;
switch (_channels[i]->algorithm) {
@@ -1903,7 +1903,6 @@
delete [] _oprDetune;
_oprDetune = new int32[256];
for (int i = 0; i < 128; i++) {
- double rate = ((double)dtt[i]) * 1024.0 * _baserate * (1<<16) / ((double)(1<<20));
_oprDetune[i] = (int32) ((double)dtt[i] * _baserate * 64.0);
_oprDetune[i + 128] = -_oprDetune[i];
}
@@ -2133,9 +2132,9 @@
chan->flags |= CHS_PITCHWHEELOFF;
}
} else {
- uint8 skipChannels = para / 36;
- uint8 entry = para % 36;
- TownsPC98_OpnDriver::TwnChannel *t = &chan[skipChannels];
+ //uint8 skipChannels = para / 36;
+ //uint8 entry = para % 36;
+ //TownsPC98_OpnDriver::TwnChannel *t = &chan[skipChannels];
////// NOT IMPLEMENTED
//t->unnamedEntries[entry] = *chan->dataPtr++;
}
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