diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | al/eax/globals.cpp | 21 | ||||
| -rw-r--r-- | al/eax/globals.h | 24 |
3 files changed, 11 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73a0836a..23dc7bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -843,7 +843,6 @@ if(ALSOFT_EAX) al/eax/fx_slot_index.h al/eax/fx_slots.cpp al/eax/fx_slots.h - al/eax/globals.cpp al/eax/globals.h al/eax/utils.cpp al/eax/utils.h diff --git a/al/eax/globals.cpp b/al/eax/globals.cpp deleted file mode 100644 index 80e9dbfe..00000000 --- a/al/eax/globals.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "config.h" - -#include "globals.h" - - -bool eax_g_is_enabled = true; - - -const char eax1_ext_name[] = "EAX"; -const char eax2_ext_name[] = "EAX2.0"; -const char eax3_ext_name[] = "EAX3.0"; -const char eax4_ext_name[] = "EAX4.0"; -const char eax5_ext_name[] = "EAX5.0"; - -const char eax_x_ram_ext_name[] = "EAX-RAM"; - -const char eax_eax_set_func_name[] = "EAXSet"; -const char eax_eax_get_func_name[] = "EAXGet"; - -const char eax_eax_set_buffer_mode_func_name[] = "EAXSetBufferMode"; -const char eax_eax_get_buffer_mode_func_name[] = "EAXGetBufferMode"; diff --git a/al/eax/globals.h b/al/eax/globals.h index 1b4d63b8..ff05d009 100644 --- a/al/eax/globals.h +++ b/al/eax/globals.h @@ -1,22 +1,20 @@ #ifndef EAX_GLOBALS_INCLUDED #define EAX_GLOBALS_INCLUDED +inline bool eax_g_is_enabled{true}; -extern bool eax_g_is_enabled; +inline constexpr char eax1_ext_name[]{"EAX"}; +inline constexpr char eax2_ext_name[]{"EAX2.0"}; +inline constexpr char eax3_ext_name[]{"EAX3.0"}; +inline constexpr char eax4_ext_name[]{"EAX4.0"}; +inline constexpr char eax5_ext_name[]{"EAX5.0"}; +inline constexpr char eax_x_ram_ext_name[]{"EAX-RAM"}; -extern const char eax1_ext_name[]; -extern const char eax2_ext_name[]; -extern const char eax3_ext_name[]; -extern const char eax4_ext_name[]; -extern const char eax5_ext_name[]; +inline constexpr char eax_eax_set_func_name[]{"EAXSet"}; +inline constexpr char eax_eax_get_func_name[]{"EAXGet"}; -extern const char eax_x_ram_ext_name[]; - -extern const char eax_eax_set_func_name[]; -extern const char eax_eax_get_func_name[]; - -extern const char eax_eax_set_buffer_mode_func_name[]; -extern const char eax_eax_get_buffer_mode_func_name[]; +inline constexpr char eax_eax_set_buffer_mode_func_name[]{"EAXSetBufferMode"}; +inline constexpr char eax_eax_get_buffer_mode_func_name[]{"EAXGetBufferMode"}; #endif // !EAX_GLOBALS_INCLUDED |