diff options
author | Ameer <aj662@drexel.edu> | 2020-07-04 00:59:40 -0400 |
---|---|---|
committer | Ameer <aj662@drexel.edu> | 2020-07-04 00:59:40 -0400 |
commit | f829932ed191ad469df01342191bf2725e8a20bb (patch) | |
tree | 0ae185ce3ef43ef9b085aae7b9ad5abb04e3d239 /src/core/settings.h | |
parent | d00972fce1fe5f2eb13c7e5d7e4e56036cb6bc91 (diff) | |
parent | 3096adb3471af1b094d670751e476c337007d299 (diff) |
Fix merge conflicts?
Diffstat (limited to 'src/core/settings.h')
-rw-r--r-- | src/core/settings.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 33e1e06cd..a598ccbc1 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -459,6 +459,7 @@ struct Values { bool use_dev_keys; // Audio + bool audio_muted; std::string sink_id; bool enable_audio_stretching; std::string audio_device_id; @@ -490,6 +491,8 @@ struct Values { std::map<u64, std::vector<std::string>> disabled_addons; } extern values; +float Volume(); + bool IsGPULevelExtreme(); bool IsGPULevelHigh(); |