diff options
| author | Max Horn | 2010-03-10 21:03:50 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-10 21:03:50 +0000 |
| commit | 43abd0e0192d290d3cf256bbc7cf16869031b98b (patch) | |
| tree | 86a1ee482408c74066eaf510526054e5f9d53ae9 /engines/scumm/player_v2.cpp | |
| parent | c97ee14a65afc0b8a11ef5c10105e966f67a5934 (diff) | |
| download | scummvm-rg350-43abd0e0192d290d3cf256bbc7cf16869031b98b.tar.gz scummvm-rg350-43abd0e0192d290d3cf256bbc7cf16869031b98b.tar.bz2 scummvm-rg350-43abd0e0192d290d3cf256bbc7cf16869031b98b.zip | |
cleanup
svn-id: r48230
Diffstat (limited to 'engines/scumm/player_v2.cpp')
| -rw-r--r-- | engines/scumm/player_v2.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/player_v2.cpp b/engines/scumm/player_v2.cpp index 06e9e929c6..764b7ae3fe 100644 --- a/engines/scumm/player_v2.cpp +++ b/engines/scumm/player_v2.cpp @@ -339,7 +339,7 @@ Player_V2::Player_V2(ScummEngine *scumm, Audio::Mixer *mixer, bool pcjr) { _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 @@ Player_V2::Player_V2(ScummEngine *scumm, Audio::Mixer *mixer, bool pcjr) { 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 @@ void Player_V2::set_pcjr(bool pcjr) { 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 @@ void Player_V2::set_pcjr(bool pcjr) { * sample rate doubles. */ int i; - for (i = 0; (_sample_rate << i) < 30000; i++) + for (i = 0; (_sampleRate << i) < 30000; i++) _decay = _decay * _decay / 65536; |