mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
dsp_dsp.cpp: fix registering Interrupt handler on loading savestates (#7055)
This commit is contained in:
parent
4220f69c06
commit
1acb03b579
@ -114,8 +114,7 @@ private:
|
|||||||
ar& dsp_memory.raw_memory;
|
ar& dsp_memory.raw_memory;
|
||||||
ar& sources;
|
ar& sources;
|
||||||
ar& mixers;
|
ar& mixers;
|
||||||
// interrupt_handler is function pointer and cant be serialised, fortunately though, it
|
// interrupt_handler is reregistered when loading state from DSP_DSP
|
||||||
// should be registerd before the game has started
|
|
||||||
}
|
}
|
||||||
friend class boost::serialization::access;
|
friend class boost::serialization::access;
|
||||||
};
|
};
|
||||||
|
@ -394,6 +394,12 @@ DSP_DSP::DSP_DSP(Core::System& system)
|
|||||||
|
|
||||||
semaphore_event->SetHLENotifier(
|
semaphore_event->SetHLENotifier(
|
||||||
[this]() { this->system.DSP().SetSemaphore(preset_semaphore); });
|
[this]() { this->system.DSP().SetSemaphore(preset_semaphore); });
|
||||||
|
|
||||||
|
system.DSP().SetInterruptHandler([dsp_ref = this](InterruptType type, DspPipe pipe) {
|
||||||
|
if (dsp_ref) {
|
||||||
|
dsp_ref->SignalInterrupt(type, pipe);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
DSP_DSP::~DSP_DSP() {
|
DSP_DSP::~DSP_DSP() {
|
||||||
@ -405,12 +411,6 @@ void InstallInterfaces(Core::System& system) {
|
|||||||
auto& service_manager = system.ServiceManager();
|
auto& service_manager = system.ServiceManager();
|
||||||
auto dsp = std::make_shared<DSP_DSP>(system);
|
auto dsp = std::make_shared<DSP_DSP>(system);
|
||||||
dsp->InstallAsService(service_manager);
|
dsp->InstallAsService(service_manager);
|
||||||
system.DSP().SetInterruptHandler(
|
|
||||||
[dsp_ref = std::weak_ptr<DSP_DSP>(dsp)](InterruptType type, DspPipe pipe) {
|
|
||||||
if (auto locked = dsp_ref.lock()) {
|
|
||||||
locked->SignalInterrupt(type, pipe);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Service::DSP
|
} // namespace Service::DSP
|
||||||
|
Loading…
Reference in New Issue
Block a user