Misc: Move SettingInfo declaration to input_types.h

267b74c breaks on cross-compiled Linux otherwise, and I can't be
bothered to set it up locally to debug.
This commit is contained in:
Stenzek
2025-10-07 01:31:18 +10:00
parent 267b74cab8
commit dbf2849803
3 changed files with 42 additions and 42 deletions

View File

@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: CC-BY-NC-ND-4.0
#pragma once
@@ -18,8 +18,6 @@
class SettingsInterface;
class StateWrapper;
struct SettingInfo;
class Controller
{
public:

View File

@@ -1,9 +1,11 @@
// SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin <stenzek@gmail.com>
// SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin <stenzek@gmail.com>
// SPDX-License-Identifier: CC-BY-NC-ND-4.0
#pragma once
#include "types.h"
class SettingsInterface;
enum class GenericInputBinding : u8;
struct InputBindingInfo
@@ -75,3 +77,41 @@ enum class GenericInputBinding : u8
Count,
};
struct SettingInfo
{
enum class Type
{
Boolean,
Integer,
IntegerList,
Float,
String,
Path,
};
Type type;
const char* name;
const char* display_name;
const char* description;
const char* default_value;
const char* min_value;
const char* max_value;
const char* step_value;
const char* format;
const char* const* options;
float multiplier;
const char* StringDefaultValue() const;
bool BooleanDefaultValue() const;
s32 IntegerDefaultValue() const;
s32 IntegerMinValue() const;
s32 IntegerMaxValue() const;
s32 IntegerStepValue() const;
float FloatDefaultValue() const;
float FloatMinValue() const;
float FloatMaxValue() const;
float FloatStepValue() const;
void CopyValue(SettingsInterface* dest_si, const SettingsInterface& src_si, const char* section) const;
};

View File

@@ -24,44 +24,6 @@ enum class Level : u32;
enum class RenderAPI : u8;
enum class MediaCaptureBackend : u8;
struct SettingInfo
{
enum class Type
{
Boolean,
Integer,
IntegerList,
Float,
String,
Path,
};
Type type;
const char* name;
const char* display_name;
const char* description;
const char* default_value;
const char* min_value;
const char* max_value;
const char* step_value;
const char* format;
const char* const* options;
float multiplier;
const char* StringDefaultValue() const;
bool BooleanDefaultValue() const;
s32 IntegerDefaultValue() const;
s32 IntegerMinValue() const;
s32 IntegerMaxValue() const;
s32 IntegerStepValue() const;
float FloatDefaultValue() const;
float FloatMinValue() const;
float FloatMaxValue() const;
float FloatStepValue() const;
void CopyValue(SettingsInterface* dest_si, const SettingsInterface& src_si, const char* section) const;
};
struct GPUSettings
{
GPUSettings();