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

CommonHostInterface: Simplify fullscreen toggle

Browse Source
This commit is contained in:
Connor McLaughlin
2020-04-05 22:58:54 +10:00
parent bf6c1c4866
commit 11e8a91e30
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend-common/common_host_interface.cpp
View File

@ -51,9 +51,15 @@ void CommonHostInterface::Shutdown()
}
}
void CommonHostInterface::SetFullscreen(bool enabled) {}
bool CommonHostInterface::IsFullscreen() const
{
return false;
}
void CommonHostInterface::ToggleFullscreen() {}
bool CommonHostInterface::SetFullscreen(bool enabled)
{
return false;
}
std::unique_ptr<AudioStream> CommonHostInterface::CreateAudioStream(AudioBackend backend)
{
@ -88,19 +94,14 @@ std::unique_ptr<ControllerInterface> CommonHostInterface::CreateControllerInterf
void CommonHostInterface::OnSystemCreated()
{
HostInterface::OnSystemCreated();
if (m_settings.start_fullscreen)
SetFullscreen(true);
}
void CommonHostInterface::OnSystemPaused(bool paused)
{
HostInterface::OnSystemPaused(paused);
if (paused)
if (paused && IsFullscreen())
SetFullscreen(false);
else if (m_settings.start_fullscreen)
SetFullscreen(true);
}
void CommonHostInterface::OnControllerTypeChanged(u32 slot)
@ -375,7 +376,7 @@ void CommonHostInterface::RegisterGeneralHotkeys()
RegisterHotkey(StaticString("General"), StaticString("ToggleFullscreen"), StaticString("Toggle Fullscreen"),
[this](bool pressed) {
if (!pressed)
ToggleFullscreen();
SetFullscreen(!IsFullscreen());
});
RegisterHotkey(StaticString("General"), StaticString("TogglePause"), StaticString("Toggle Pause"),

4
src/frontend-common/common_host_interface.h
View File

@ -46,8 +46,8 @@ protected:
CommonHostInterface();
~CommonHostInterface();
virtual void SetFullscreen(bool enabled);
virtual void ToggleFullscreen();
virtual bool IsFullscreen() const;
virtual bool SetFullscreen(bool enabled);
virtual std::unique_ptr<AudioStream> CreateAudioStream(AudioBackend backend) override;
virtual std::unique_ptr<ControllerInterface> CreateControllerInterface();