diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /audio/mpu401.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'audio/mpu401.cpp')
| -rw-r--r-- | audio/mpu401.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/mpu401.cpp b/audio/mpu401.cpp index 966e367a93..103a3501db 100644 --- a/audio/mpu401.cpp +++ b/audio/mpu401.cpp @@ -146,6 +146,6 @@ void MidiDriver_MPU401::setTimerCallback(void *timer_param, Common::TimerManager g_system->getTimerManager()->removeTimerProc(_timer_proc); _timer_proc = timer_proc; if (timer_proc) - g_system->getTimerManager()->installTimerProc(timer_proc, 10000, timer_param); + g_system->getTimerManager()->installTimerProc(timer_proc, 10000, timer_param, "MPU401"); } } |