[Scummvm-cvs-logs] CVS: scummvm/backends/midi ym2612.cpp,1.25,1.26 adlib.cpp,1.59,1.60
Max Horn
fingolfin at users.sourceforge.net
Sun Oct 17 10:13:02 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13693
Modified Files:
ym2612.cpp adlib.cpp
Log Message:
Cleanup
Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ym2612.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ym2612.cpp 11 Oct 2004 22:19:22 -0000 1.25
+++ ym2612.cpp 17 Oct 2004 17:12:35 -0000 1.26
@@ -742,7 +742,7 @@
_timer_proc = 0;
_timer_param = 0;
_next_tick = 0;
- _samples_per_tick = (_mixer->getOutputRate() << FIXP_SHIFT) / BASE_FREQ;
+ _samples_per_tick = (getRate() << FIXP_SHIFT) / BASE_FREQ;
_next_voice = 0;
createLookupTables();
@@ -750,7 +750,7 @@
int i;
for (i = 0; i < ARRAYSIZE(_channel); i++)
_channel[i] = new MidiChannel_YM2612;
- rate(_mixer->getOutputRate());
+ rate(getRate());
}
MidiDriver_YM2612::~MidiDriver_YM2612() {
Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- adlib.cpp 11 Oct 2004 22:19:21 -0000 1.59
+++ adlib.cpp 17 Oct 2004 17:12:35 -0000 1.60
@@ -626,7 +626,6 @@
AdlibVoice *allocate_voice(byte pri);
- void reset_tick();
void mc_off(AdlibVoice * voice);
static void link_mc(AdlibPart *part, AdlibVoice *voice);
@@ -863,14 +862,14 @@
_adlib_reg_cache = (byte *)calloc(256, 1);
- _opl = makeAdlibOPL(_mixer->getOutputRate());
+ _opl = makeAdlibOPL(getRate());
adlib_write(1, 0x20);
adlib_write(8, 0x40);
adlib_write(0xBD, 0x00);
create_lookup_table();
- _samples_per_tick = (_mixer->getOutputRate() << FIXP_SHIFT) / BASE_FREQ;
+ _samples_per_tick = (getRate() << FIXP_SHIFT) / BASE_FREQ;
_mixer->setupPremix(this);
@@ -1027,17 +1026,13 @@
if (_timer_proc)
(*_timer_proc)(_timer_param);
on_timer();
- reset_tick();
+ _next_tick += _samples_per_tick;
}
data += step;
len -= step;
} while (len);
}
-void MidiDriver_ADLIB::reset_tick() {
- _next_tick += _samples_per_tick;
-}
-
void MidiDriver_ADLIB::on_timer() {
AdlibVoice *voice;
int i;
More information about the Scummvm-git-logs
mailing list