WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mac

Browse Source 
# Conflicts:
#	GpApp/Main.cpp
This commit is contained in:
Madthijs
2021-05-11 14:28:46 +02:00
parent 14ef73a8ab 6858230dde
commit 6fd1edd2c8
76 changed files with 3895 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AerofoilX/GpSystemServices_X.cpp
View File

@@ -70,8 +70,9 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context)
return thread;
}
void GpSystemServices_X::Beep() const
bool GpSystemServices_X::Beep() const
{
return false;
}
bool GpSystemServices_X::IsTouchscreen() const
@@ -103,6 +104,21 @@ bool GpSystemServices_X::IsFullscreenOnStartup() const
return false;
}
bool GpSystemServices_X::HasNativeFileManager() const
{
return true;
}
GpOperatingSystem_t GpSystemServices_X::GetOperatingSystem() const
{
return GpOperatingSystems::kLinux;
}
GpOperatingSystemFlavor_t GpSystemServices_X::GetOperatingSystemFlavor() const
{
return GpOperatingSystemFlavors::kGeneric;
}
unsigned int GpSystemServices_X::GetCPUCount() const
{
return SDL_GetCPUCount();

5
AerofoilX/GpSystemServices_X.h
View File

@@ -12,12 +12,15 @@ public:
~GpSystemServices_X();
void *CreateThread(ThreadFunc_t threadFunc, void *context) override;
void Beep() const override;
bool Beep() const override;
bool IsTouchscreen() const override;
bool IsUsingMouseAsTouch() const override;
bool IsTextInputObstructive() const override;
bool IsFullscreenPreferred() const override;
bool IsFullscreenOnStartup() const override;
bool HasNativeFileManager() const override;
GpOperatingSystem_t GetOperatingSystem() const override;
GpOperatingSystemFlavor_t GetOperatingSystemFlavor() const override;
unsigned int GetCPUCount() const override;
void SetTextInputEnabled(bool isEnabled) override;
bool IsTextInputEnabled() const override;