history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 14:55:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

HostInterface: Modify settings loading interface to support per-frontend settings

Browse Source
This commit is contained in:
Connor McLaughlin
2020-05-01 01:01:50 +10:00
parent 6e7c58de43
commit d8ab587153
8 changed files with 82 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/duckstation-qt/qthostinterface.cpp
View File

@ -144,9 +144,12 @@ void QtHostInterface::setDefaultSettings()
return;
}
std::lock_guard<std::recursive_mutex> guard(m_qsettings_mutex);
QtSettingsInterface si(m_qsettings.get());
UpdateSettings([this, &si]() { m_settings.Load(si); });
{
std::lock_guard<std::recursive_mutex> guard(m_qsettings_mutex);
SetDefaultSettings(si);
}
UpdateSettings(si);
CommonHostInterface::UpdateInputMap(si);
}
@ -160,7 +163,7 @@ void QtHostInterface::applySettings()
std::lock_guard<std::recursive_mutex> guard(m_qsettings_mutex);
QtSettingsInterface si(m_qsettings.get());
UpdateSettings([this, &si]() { m_settings.Load(si); });
UpdateSettings(si);
CommonHostInterface::UpdateInputMap(si);
// detect when render-to-main flag changes
@ -388,6 +391,14 @@ bool QtHostInterface::SetFullscreen(bool enabled)
return true;
}
void QtHostInterface::PollAndUpdate()
{
CommonHostInterface::PollAndUpdate();
if (m_controller_interface)
m_controller_interface->PollEvents();
}
void QtHostInterface::RequestExit()
{
emit exitRequested();
@ -450,7 +461,7 @@ void QtHostInterface::OnSystemPerformanceCountersUpdated()
void QtHostInterface::OnRunningGameChanged()
{
HostInterface::OnRunningGameChanged();
CommonHostInterface::OnRunningGameChanged();
if (m_system)
{
@ -485,7 +496,7 @@ void QtHostInterface::LoadSettings()
// load in settings
CheckSettings(si);
m_settings.Load(si);
ApplySettings(si);
}
void QtHostInterface::SetDefaultSettings(SettingsInterface& si)
@ -495,6 +506,12 @@ void QtHostInterface::SetDefaultSettings(SettingsInterface& si)
si.SetBoolValue("Main", "RenderToMainWindow", true);
}
void QtHostInterface::ApplySettings(SettingsInterface& si)
{
std::lock_guard<std::recursive_mutex> lock(m_qsettings_mutex);
CommonHostInterface::ApplySettings(si);
}
void QtHostInterface::UpdateInputMap()
{
updateInputMap();
@ -771,7 +788,7 @@ void QtHostInterface::saveScreenshot()
void QtHostInterface::doBackgroundControllerPoll()
{
m_controller_interface->PollEvents();
PollAndUpdate();
}
void QtHostInterface::createBackgroundControllerPollTimer()
@ -855,8 +872,7 @@ void QtHostInterface::threadEntryPoint()
m_system->Throttle();
m_worker_thread_event_loop->processEvents(QEventLoop::AllEvents);
if (m_controller_interface)
m_controller_interface->PollEvents();
PollAndUpdate();
}
shutdownOnThread();

2
src/duckstation-qt/qthostinterface.h
View File

@ -136,6 +136,7 @@ protected:
void ReleaseHostDisplay() override;
bool IsFullscreen() const override;
bool SetFullscreen(bool enabled) override;
void PollAndUpdate() override;
void RequestExit() override;
std::optional<HostKeyCode> GetHostKeyCode(const std::string_view key_code) const override;
@ -149,6 +150,7 @@ protected:
void LoadSettings() override;
void SetDefaultSettings(SettingsInterface& si) override;
void ApplySettings(SettingsInterface& si) override;
void UpdateInputMap() override;
private: