N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dsp_dsp.cpp: fix registering Interrupt handler on loading savestates (#7055)

Browse source
This commit is contained in:
SachinVin 2023-10-11 01:22:57 +05:30 committed by GitHub
parent 4220f69c06
commit 1acb03b579
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/audio_core/hle/hle.cpp
View file

@ -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;
}; };

12
src/core/hle/service/dsp/dsp_dsp.cpp
View file

@ -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