libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DS: Update the MaxMod callback manually

Browse Source
This commit is contained in:
Cameron Cawley 2021-06-15 23:24:46 +01:00 committed by Eugene Sandulenko
parent ac596de969
commit 0a9bf3708f
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/events/ds/ds-events.cpp
View File

@ -26,6 +26,9 @@
#include "backends/platform/ds/osystem_ds.h"
bool DSEventSource::pollEvent(Common::Event &event) {
// Ensure the mixer and timers are updated frequently
g_system->delayMillis(0);
if (_eventQueue.empty()) {
if (!_firstPoll) {
_firstPoll = true;

7
backends/mixer/maxmod/maxmod-mixer.cpp
View File

@ -70,7 +70,7 @@ void MaxModMixerManager::init() {
_stream.callback = on_stream_request;
_stream.format = MM_STREAM_16BIT_STEREO;
_stream.timer = MM_TIMER2;
_stream.manual = 0;
_stream.manual = 1;
mmStreamOpen( &_stream );
@ -91,4 +91,9 @@ int MaxModMixerManager::resumeAudio() {
return 0;
}
void MaxModMixerManager::updateAudio() {
if (!_audioSuspended)
mmStreamUpdate();
}
#endif

5
backends/mixer/maxmod/maxmod-mixer.h
View File

@ -52,6 +52,11 @@ public:
*/
virtual int resumeAudio();
/**
* Updates the audio system
*/
void updateAudio();
protected:
mm_stream _stream;
int _freq, _bufSize;

8
backends/platform/ds/osystem_ds.cpp
View File

@ -85,7 +85,7 @@ void OSystem_DS::initBackend() {
_timerManager = new DefaultTimerManager();
timerStart(0, ClockDivider_1, (u16)TIMER_FREQ(1000), timerTickHandler);
_mixerManager = new MaxModMixerManager(11025, 4096);
_mixerManager = new MaxModMixerManager(11025, 32768);
_mixerManager->init();
BaseBackend::initBackend();
@ -102,9 +102,11 @@ uint32 OSystem_DS::getMillis(bool skipRecord) {
void OSystem_DS::delayMillis(uint msecs) {
int st = getMillis();
while (st + msecs >= getMillis());
doTimerCallback();
if (_mixerManager)
((MaxModMixerManager *)_mixerManager)->updateAudio();
while (st + msecs >= getMillis());
}
void OSystem_DS::doTimerCallback(int interval) {