smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +01:00
Code Issues Projects Releases Wiki Activity

format: Protect the special session_configuration_vars.h and its use of CONFIG_VARIABLE

Browse source
This commit is contained in:
Mads Kiilerich 2024-07-23 02:30:40 +02:00 • committed by Robin Gareus
parent 853204e455
commit 81ca475b10
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/session_configuration.h
View file

@ -44,6 +44,7 @@ public:
/* define accessor methods */ /* define accessor methods */
/* clang-format off */
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) \ #define CONFIG_VARIABLE(Type,var,name,value) \
@ -55,11 +56,13 @@ public:
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
/* clang-format on */
private: private:
/* declare variables */ /* declare variables */
/* clang-format off */
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var; #define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
@ -67,6 +70,7 @@ public:
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
/* clang-format on */
int foo; int foo;

3
libs/ardour/session_configuration.cc
View file

@ -41,6 +41,8 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
/* clang-format off */
SessionConfiguration::SessionConfiguration () SessionConfiguration::SessionConfiguration ()
: :
/* construct variables */ /* construct variables */
@ -151,6 +153,7 @@ SessionConfiguration::map_parameters (boost::function<void (std::string)>& funct
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
} }
/* clang-format on */
bool bool
SessionConfiguration::load_state () SessionConfiguration::load_state ()