ardour/livetrax
13
0
Fork 0
Code

Fix annoying warning from canvas var stuff.

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2070 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-06-27 16:45:57 +00:00
parent d7bd270aa1
commit 09264537c4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/ardour/configuration.h
View File

@ -92,11 +92,6 @@ class Configuration : public PBD::Stateful
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
#undef CANVAS_VARIABLE
#define CANVAS_VARIABLE(var,name) ConfigVariable<uint32_t> var; // <-- is this really so bad?
#include "ardour/canvas_vars.h"
#undef CANVAS_VARIABLE
private:
/* declare variables */
@ -109,6 +104,13 @@ class Configuration : public PBD::Stateful
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
public: /* ugh */
#undef CANVAS_VARIABLE
#define CANVAS_VARIABLE(var,name) ConfigVariable<uint32_t> var; // <-- is this really so bad?
#include "ardour/canvas_vars.h"
#undef CANVAS_VARIABLE
private:
ConfigVariableBase::Owner current_owner;
XMLNode* _control_protocol_state;