[Scummvm-cvs-logs] SF.net SVN: scummvm:[48230] scummvm/trunk/engines/scumm
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Wed Mar 10 22:03:50 CET 2010
Revision: 48230
http://scummvm.svn.sourceforge.net/scummvm/?rev=48230&view=rev
Author: fingolfin
Date: 2010-03-10 21:03:50 +0000 (Wed, 10 Mar 2010)
Log Message:
-----------
cleanup
Modified Paths:
--------------
scummvm/trunk/engines/scumm/player_mod.cpp
scummvm/trunk/engines/scumm/player_mod.h
scummvm/trunk/engines/scumm/player_nes.cpp
scummvm/trunk/engines/scumm/player_nes.h
scummvm/trunk/engines/scumm/player_pce.cpp
scummvm/trunk/engines/scumm/player_pce.h
scummvm/trunk/engines/scumm/player_sid.cpp
scummvm/trunk/engines/scumm/player_sid.h
scummvm/trunk/engines/scumm/player_v1.cpp
scummvm/trunk/engines/scumm/player_v2.cpp
scummvm/trunk/engines/scumm/player_v2.h
scummvm/trunk/engines/scumm/player_v2cms.cpp
Modified: scummvm/trunk/engines/scumm/player_mod.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_mod.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -31,10 +31,9 @@
namespace Scumm {
-Player_MOD::Player_MOD(Audio::Mixer *mixer) {
+Player_MOD::Player_MOD(Audio::Mixer *mixer)
+ : _mixer(mixer), _sampleRate(mixer->getOutputRate()) {
int i;
- _mixer = mixer;
- _samplerate = _mixer->getOutputRate();
_mixamt = 0;
_mixpos = 0;
@@ -69,7 +68,7 @@
void Player_MOD::setUpdateProc(ModUpdateProc *proc, void *param, int freq) {
_playproc = proc;
_playparam = param;
- _mixamt = _samplerate / freq;
+ _mixamt = _sampleRate / freq;
}
void Player_MOD::clearUpdateProc() {
_playproc = NULL;
@@ -185,7 +184,7 @@
Audio::st_volume_t vol_r = (127 + _channels[i].pan) * _channels[i].vol / 127;
for (uint j = 0; j < dlen; j++) {
// simple linear resample, unbuffered
- int delta = (uint32)(_channels[i].freq * 0x10000) / _samplerate;
+ int delta = (uint32)(_channels[i].freq * 0x10000) / _sampleRate;
uint16 cfrac = ~_channels[i].ctr & 0xFFFF;
if (_channels[i].ctr + delta < 0x10000)
cfrac = delta;
Modified: scummvm/trunk/engines/scumm/player_mod.h
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.h 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_mod.h 2010-03-10 21:03:50 UTC (rev 48230)
@@ -63,7 +63,7 @@
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
- int getRate() const { return _samplerate; }
+ int getRate() const { return _sampleRate; }
private:
enum {
@@ -86,7 +86,7 @@
uint32 _mixamt;
uint32 _mixpos;
- int _samplerate;
+ const int _sampleRate;
soundChan _channels[MOD_MAXCHANS];
Modified: scummvm/trunk/engines/scumm/player_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_nes.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -591,10 +591,10 @@
int i;
_vm = scumm;
_mixer = mixer;
- _sample_rate = _mixer->getOutputRate();
- _apu = new APUe::APU(_sample_rate);
+ _sampleRate = _mixer->getOutputRate();
+ _apu = new APUe::APU(_sampleRate);
- _samples_per_frame = _sample_rate / 60;
+ _samples_per_frame = _sampleRate / 60;
_current_sample = 0;
for (i = 0; i < NUMSLOTS; i++) {
Modified: scummvm/trunk/engines/scumm/player_nes.h
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.h 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_nes.h 2010-03-10 21:03:50 UTC (rev 48230)
@@ -60,7 +60,7 @@
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return false; }
bool endOfData() const { return false; }
- int getRate() const { return _sample_rate; }
+ int getRate() const { return _sampleRate; }
private:
@@ -81,7 +81,7 @@
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
APUe::APU *_apu;
- int _sample_rate;
+ int _sampleRate;
int _samples_per_frame;
int _current_sample;
int _maxvol;
Modified: scummvm/trunk/engines/scumm/player_pce.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_pce.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_pce.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -717,14 +717,14 @@
}
_mixer = mixer;
- _sample_rate = _mixer->getOutputRate();
+ _sampleRate = _mixer->getOutputRate();
_vm = scumm;
- _samplesPerPeriod = 2 * (int)(_sample_rate / UPDATE_FREQ);
+ _samplesPerPeriod = 2 * (int)(_sampleRate / UPDATE_FREQ);
_sampleBuffer = new int16[_samplesPerPeriod];
_sampleBufferCnt = 0;
- _psg = new PSG_HuC6280(PSG_CLOCK, _sample_rate);
+ _psg = new PSG_HuC6280(PSG_CLOCK, _sampleRate);
_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
}
Modified: scummvm/trunk/engines/scumm/player_pce.h
===================================================================
--- scummvm/trunk/engines/scumm/player_pce.h 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_pce.h 2010-03-10 21:03:50 UTC (rev 48230)
@@ -89,13 +89,13 @@
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return true; }
bool endOfData() const { return false; }
- int getRate() const { return _sample_rate; }
+ int getRate() const { return _sampleRate; }
private:
ScummEngine *_vm;
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
- int _sample_rate;
+ int _sampleRate;
int _maxvol;
private:
Modified: scummvm/trunk/engines/scumm/player_sid.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_sid.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_sid.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -1249,7 +1249,7 @@
_music_timer = 0;
_mixer = mixer;
- _sample_rate = _mixer->getOutputRate();
+ _sampleRate = _mixer->getOutputRate();
_vm = scumm;
// sound speed is slightly different on NTSC and PAL machines
@@ -1314,7 +1314,7 @@
_sid = new Resid::SID();
_sid->set_sampling_parameters(
timingProps[_videoSystem].clockFreq,
- _sample_rate);
+ _sampleRate);
_sid->enable_filter(true);
_sid->reset();
Modified: scummvm/trunk/engines/scumm/player_sid.h
===================================================================
--- scummvm/trunk/engines/scumm/player_sid.h 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_sid.h 2010-03-10 21:03:50 UTC (rev 48230)
@@ -71,7 +71,7 @@
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return false; }
bool endOfData() const { return false; }
- int getRate() const { return _sample_rate; }
+ int getRate() const { return _sampleRate; }
private:
Resid::SID *_sid;
@@ -85,7 +85,7 @@
ScummEngine *_vm;
Audio::Mixer *_mixer;
Audio::SoundHandle _soundHandle;
- int _sample_rate;
+ int _sampleRate;
int _maxvol;
Common::Mutex _mutex;
Modified: scummvm/trunk/engines/scumm/player_v1.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v1.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_v1.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -42,7 +42,7 @@
for (int i = 0; i < 4; ++i)
clear_channel(i);
- _mplex_step = (_sample_rate << FIXP_SHIFT) / 1193000;
+ _mplex_step = (_sampleRate << FIXP_SHIFT) / 1193000;
_next_chunk = _repeat_chunk = 0;
_forced_level = 0;
_random_lsr = 0;
Modified: scummvm/trunk/engines/scumm/player_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_v2.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -339,7 +339,7 @@
_isV3Game = (scumm->_game.version >= 3);
_vm = scumm;
_mixer = mixer;
- _sample_rate = _mixer->getOutputRate();
+ _sampleRate = _mixer->getOutputRate();
_header_len = (scumm->_game.features & GF_OLD_BUNDLE) ? 4 : 6;
@@ -352,7 +352,7 @@
clear_channel(i);
_next_tick = 0;
- _tick_len = (_sample_rate << FIXP_SHIFT) / FREQ_HZ;
+ _tick_len = (_sampleRate << FIXP_SHIFT) / FREQ_HZ;
// Initialize V3 music timer
_music_timer_ctr = _music_timer = 0;
@@ -381,11 +381,11 @@
if (_pcjr) {
_decay = PCJR_DECAY;
- _update_step = (_sample_rate << FIXP_SHIFT) / (111860 * 2);
+ _update_step = (_sampleRate << FIXP_SHIFT) / (111860 * 2);
_freqs_table = pcjr_freq_table;
} else {
_decay = SPK_DECAY;
- _update_step = (_sample_rate << FIXP_SHIFT) / (1193000 * 2);
+ _update_step = (_sampleRate << FIXP_SHIFT) / (1193000 * 2);
_freqs_table = spk_freq_table;
}
@@ -393,7 +393,7 @@
* sample rate doubles.
*/
int i;
- for (i = 0; (_sample_rate << i) < 30000; i++)
+ for (i = 0; (_sampleRate << i) < 30000; i++)
_decay = _decay * _decay / 65536;
Modified: scummvm/trunk/engines/scumm/player_v2.h
===================================================================
--- scummvm/trunk/engines/scumm/player_v2.h 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_v2.h 2010-03-10 21:03:50 UTC (rev 48230)
@@ -90,7 +90,7 @@
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
- int getRate() const { return _sample_rate; }
+ int getRate() const { return _sampleRate; }
protected:
bool _isV3Game;
@@ -101,7 +101,7 @@
bool _pcjr;
int _header_len;
- uint32 _sample_rate;
+ uint32 _sampleRate;
uint32 _next_tick;
uint32 _tick_len;
unsigned int _update_step;
@@ -177,7 +177,7 @@
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return true; }
bool endOfData() const { return false; }
- int getRate() const { return _sample_rate; }
+ int getRate() const { return _sampleRate; }
protected:
@@ -289,7 +289,7 @@
int _header_len;
- uint32 _sample_rate;
+ uint32 _sampleRate;
uint32 _next_tick;
uint32 _tick_len;
Modified: scummvm/trunk/engines/scumm/player_v2cms.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_v2cms.cpp 2010-03-10 21:01:44 UTC (rev 48229)
+++ scummvm/trunk/engines/scumm/player_v2cms.cpp 2010-03-10 21:03:50 UTC (rev 48230)
@@ -30,6 +30,7 @@
#include "sound/mixer.h"
namespace Scumm {
+
#define FREQ_HZ 236 // Don't change!
#define FIXP_SHIFT 16
@@ -55,8 +56,7 @@
#define PROCESS_VIBRATO 5
/* this structure defines a channel */
-struct saa1099_channel
-{
+struct saa1099_channel {
int frequency; /* frequency (0x00..0xff) */
int freq_enable; /* frequency enable */
int noise_enable; /* noise enable */
@@ -71,8 +71,7 @@
};
/* this structure defines a noise channel */
-struct saa1099_noise
-{
+struct saa1099_noise {
/* vars to simulate the noise generator output */
double counter;
double freq;
@@ -80,8 +79,7 @@
};
/* this structure defines a SAA1099 chip */
-struct SAA1099
-{
+struct SAA1099 {
int stream; /* our stream */
int noise_params[2]; /* noise generators parameters */
int env_enable[2]; /* envelope generators enable */
@@ -818,7 +816,7 @@
_vm = scumm;
_mixer = mixer;
// debug("mixer rate: %d", _mixer->getOutputRate());
- _sample_rate = CMS_RATE;
+ _sampleRate = CMS_RATE;
_header_len = (scumm->_game.features & GF_OLD_BUNDLE) ? 4 : 6;
@@ -831,7 +829,7 @@
clear_channel(i);
_next_tick = 0;
- _tick_len = (_sample_rate << FIXP_SHIFT) / FREQ_HZ;
+ _tick_len = (_sampleRate << FIXP_SHIFT) / FREQ_HZ;
// Initialize V3 music timer
_music_timer_ctr = _music_timer = 0;
@@ -878,7 +876,7 @@
_cmsVoices[7].octaveOutput = &(_cmsChips[1].octave[1]);
// inits the CMS Emulator like in the original
- g_cmsEmu = new CMSEmulator(_sample_rate);
+ g_cmsEmu = new CMSEmulator(_sampleRate);
static const byte cmsInitData[13*2] = {
0x1C, 0x02,
0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00,
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