ardour/livetrax
13
0
Fork 0
Code

Use .inc.h for #include files that not are plain headers

Browse Source 
Regular .h files *should* be self-contained and independent of previous
includes and guarded to only include once. Make it clear which files
that *doesn't* apply for at all.
This commit is contained in:
Mads Kiilerich 2024-10-20 00:16:01 +02:00
parent 38db12c9ea
commit 140670541f
47 changed files with 105 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MSVCardour3/Ardour3.vcproj
View File

@ -1606,7 +1606,7 @@
> >
</File> </File>
<File <File
RelativePath="..\gtk2_ardour\canvas_vars.h" RelativePath="..\gtk2_ardour\canvas_vars.inc.h"
> >
</File> </File>
<File <File
@ -1682,7 +1682,7 @@
> >
</File> </File>
<File <File
RelativePath="..\gtk2_ardour\editing_syms.h" RelativePath="..\gtk2_ardour\editing_syms.inc.h"
> >
</File> </File>
<File <File
@ -1942,7 +1942,7 @@
> >
</File> </File>
<File <File
RelativePath="..\gtk2_ardour\luasignal_syms.h" RelativePath="..\gtk2_ardour\luasignal_syms.inc.h"
> >
</File> </File>
<File <File
@ -2610,7 +2610,7 @@
> >
</File> </File>
<File <File
RelativePath="..\gtk2_ardour\ui_config_vars.h" RelativePath="..\gtk2_ardour\ui_config_vars.inc.h"
> >
</File> </File>
<File <File

0
gtk2_ardour/canvas_vars.h → gtk2_ardour/canvas_vars.inc.h
View File

0
gtk2_ardour/configuration_metadata.h → gtk2_ardour/configuration_metadata.inc.h
View File

2
gtk2_ardour/cue_editor.h
View File

@ -89,7 +89,7 @@ class CueEditor : public EditingContext, public PBD::HistoryOwner, public sigc::
*/ */
void step_mouse_mode (bool next); void step_mouse_mode (bool next);
/** @return The current mouse mode (gain, object, range, timefx etc.) /** @return The current mouse mode (gain, object, range, timefx etc.)
* (defined in editing_syms.h) * (defined in editing_syms.inc.h)
*/ */
Editing::MouseMode current_mouse_mode () const; Editing::MouseMode current_mouse_mode () const;
/** cue editors are *always* used for internal editing */ /** cue editors are *always* used for internal editing */

32
gtk2_ardour/editing.cc
View File

@ -44,14 +44,14 @@ namespace Editing {
GridType GridType
str2gridtype (const string & str) { str2gridtype (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return GridTypeBar; return GridTypeBar;
} }
#undef GRIDTYPE #undef GRIDTYPE
#define GRIDTYPE(s) N_(#s), #define GRIDTYPE(s) N_(#s),
const char *gridtypestrs[] = { const char *gridtypestrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef GRIDTYPE #undef GRIDTYPE
@ -63,14 +63,14 @@ const char *gridtypestrs[] = {
SnapMode SnapMode
str2snapmode (const string & str) { str2snapmode (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return SnapMagnetic; return SnapMagnetic;
} }
#undef SNAPMODE #undef SNAPMODE
#define SNAPMODE(s) N_(#s), #define SNAPMODE(s) N_(#s),
const char *snapmodestrs[] = { const char *snapmodestrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef SNAPMODE #undef SNAPMODE
@ -83,14 +83,14 @@ const char *snapmodestrs[] = {
RegionListSortType RegionListSortType
str2regionlistsorttype (const string & str) { str2regionlistsorttype (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return ByName; return ByName;
} }
#undef REGIONLISTSORTTYPE #undef REGIONLISTSORTTYPE
#define REGIONLISTSORTTYPE(s) N_(#s), #define REGIONLISTSORTTYPE(s) N_(#s),
const char *regionlistsorttypestrs[] = { const char *regionlistsorttypestrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef REGIONLISTSORTTYPE #undef REGIONLISTSORTTYPE
@ -102,14 +102,14 @@ const char *regionlistsorttypestrs[] = {
MouseMode MouseMode
str2mousemode (const string & str) { str2mousemode (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return MouseObject; return MouseObject;
} }
#undef MOUSEMODE #undef MOUSEMODE
#define MOUSEMODE(s) N_(#s), #define MOUSEMODE(s) N_(#s),
const char *mousemodestrs[] = { const char *mousemodestrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef MOUSEMODE #undef MOUSEMODE
@ -121,14 +121,14 @@ const char *mousemodestrs[] = {
ZoomFocus ZoomFocus
str2zoomfocus (const string & str) { str2zoomfocus (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return ZoomFocusPlayhead; return ZoomFocusPlayhead;
} }
#undef ZOOMFOCUS #undef ZOOMFOCUS
#define ZOOMFOCUS(s) N_(#s), #define ZOOMFOCUS(s) N_(#s),
const char *zoomfocusstrs[] = { const char *zoomfocusstrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef ZOOMFOCUS #undef ZOOMFOCUS
@ -140,14 +140,14 @@ const char *zoomfocusstrs[] = {
DisplayControl DisplayControl
str2displaycontrol (const string & str) { str2displaycontrol (const string & str) {
const char* type = str.c_str(); const char* type = str.c_str();
#include "editing_syms.h" #include "editing_syms.inc.h"
return FollowPlayhead; return FollowPlayhead;
} }
#undef DISPLAYCONTROL #undef DISPLAYCONTROL
#define DISPLAYCONTROL(s) N_(#s), #define DISPLAYCONTROL(s) N_(#s),
const char *displaycontrolstrs[] = { const char *displaycontrolstrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef DISPLAYCONTROL #undef DISPLAYCONTROL
@ -157,7 +157,7 @@ const char *displaycontrolstrs[] = {
#undef IMPORTMODE #undef IMPORTMODE
#define IMPORTMODE(s) N_(#s), #define IMPORTMODE(s) N_(#s),
const char *importmodestrs[] = { const char *importmodestrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef IMPORTMODE #undef IMPORTMODE
@ -167,7 +167,7 @@ const char *importmodestrs[] = {
#undef TEMPOEDITBEHAVIOR #undef TEMPOEDITBEHAVIOR
#define TEMPOEDITBEHAVIOR(s) N_(#s), #define TEMPOEDITBEHAVIOR(s) N_(#s),
const char *tempoeditbehaviorstrs[] = { const char *tempoeditbehaviorstrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef TEMPOEDITBEHAVIOR #undef TEMPOEDITBEHAVIOR
@ -176,7 +176,7 @@ const char *tempoeditbehaviorstrs[] = {
#undef NOTENAMEDISPLAY #undef NOTENAMEDISPLAY
#define NOTENAMEDISPLAY(s) N_(#s), #define NOTENAMEDISPLAY(s) N_(#s),
const char *notenamedisplaystrs[] = { const char *notenamedisplaystrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef NOTENAMEDISPLAY #undef NOTENAMEDISPLAY
@ -185,7 +185,7 @@ const char *notenamedisplaystrs[] = {
#undef MARKERCLICKBEHAVIOR #undef MARKERCLICKBEHAVIOR
#define MARKERCLICKBEHAVIOR(s) N_(#s), #define MARKERCLICKBEHAVIOR(s) N_(#s),
const char *markerclickbehaviorstrs[] = { const char *markerclickbehaviorstrs[] = {
#include "editing_syms.h" #include "editing_syms.inc.h"
0 0
}; };
#undef MARKERCLICKBEHAVIOR #undef MARKERCLICKBEHAVIOR

28
gtk2_ardour/editing.h
View File

@ -50,7 +50,7 @@ namespace Editing {
#undef GRIDTYPE #undef GRIDTYPE
#define GRIDTYPE(a) a, #define GRIDTYPE(a) a,
enum GridType { enum GridType {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
static const int DRAW_VEL_AUTO = -1; static const int DRAW_VEL_AUTO = -1;
@ -68,7 +68,7 @@ GridType str2gridtype(const std::string &);
#undef SNAPMODE #undef SNAPMODE
#define SNAPMODE(a) a, #define SNAPMODE(a) a,
enum SnapMode { enum SnapMode {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *snapmodestrs[]; extern const char *snapmodestrs[];
@ -82,7 +82,7 @@ SnapMode str2snapmode(const std::string &);
#undef REGIONLISTSORTTYPE #undef REGIONLISTSORTTYPE
#define REGIONLISTSORTTYPE(a) a, #define REGIONLISTSORTTYPE(a) a,
enum RegionListSortType { enum RegionListSortType {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *regionlistsorttypestrs[]; extern const char *regionlistsorttypestrs[];
@ -96,7 +96,7 @@ RegionListSortType str2regionlistsorttype(const std::string &);
#undef MOUSEMODE #undef MOUSEMODE
#define MOUSEMODE(a) a, #define MOUSEMODE(a) a,
enum MouseMode { enum MouseMode {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *mousemodestrs[]; extern const char *mousemodestrs[];
@ -110,7 +110,7 @@ MouseMode str2mousemode(const std::string &);
#undef MIDIEDITMODE #undef MIDIEDITMODE
#define MIDIEDITMODE(a) a, #define MIDIEDITMODE(a) a,
enum MidiEditMode { enum MidiEditMode {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *midieditmodestrs[]; extern const char *midieditmodestrs[];
@ -124,7 +124,7 @@ MidiEditMode str2midieditmode(const std::string &);
#undef ZOOMFOCUS #undef ZOOMFOCUS
#define ZOOMFOCUS(a) a, #define ZOOMFOCUS(a) a,
enum ZoomFocus { enum ZoomFocus {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *zoomfocusstrs[]; extern const char *zoomfocusstrs[];
@ -138,7 +138,7 @@ ZoomFocus str2zoomfocus(const std::string &);
#undef DISPLAYCONTROL #undef DISPLAYCONTROL
#define DISPLAYCONTROL(a) a, #define DISPLAYCONTROL(a) a,
enum DisplayControl { enum DisplayControl {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *displaycontrolstrs[]; extern const char *displaycontrolstrs[];
@ -153,7 +153,7 @@ DisplayControl str2displaycontrol (const std::string &);
#undef IMPORTMODE #undef IMPORTMODE
#define IMPORTMODE(a) a, #define IMPORTMODE(a) a,
enum ImportMode { enum ImportMode {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef IMPORTMODE #undef IMPORTMODE
@ -163,7 +163,7 @@ enum ImportMode {
#undef IMPORTPOSITION #undef IMPORTPOSITION
#define IMPORTPOSITION(a) a, #define IMPORTPOSITION(a) a,
enum ImportPosition { enum ImportPosition {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef IMPORTPOSITION #undef IMPORTPOSITION
@ -173,7 +173,7 @@ enum ImportPosition {
#undef IMPORTDISPOSITION #undef IMPORTDISPOSITION
#define IMPORTDISPOSITION(a) a, #define IMPORTDISPOSITION(a) a,
enum ImportDisposition { enum ImportDisposition {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef IMPORTDISPOSITION #undef IMPORTDISPOSITION
@ -183,7 +183,7 @@ enum ImportDisposition {
#undef EDITPOINT #undef EDITPOINT
#define EDITPOINT(a) a, #define EDITPOINT(a) a,
enum EditPoint { enum EditPoint {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef EDITPOINT #undef EDITPOINT
@ -193,7 +193,7 @@ enum EditPoint {
#undef INSERTTIMEOPT #undef INSERTTIMEOPT
#define INSERTTIMEOPT(a) a, #define INSERTTIMEOPT(a) a,
enum InsertTimeOption { enum InsertTimeOption {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef INSERTTIMEOPT #undef INSERTTIMEOPT
@ -202,7 +202,7 @@ enum InsertTimeOption {
#undef NOTENAMEDISPLAY #undef NOTENAMEDISPLAY
#define NOTENAMEDISPLAY(a) a, #define NOTENAMEDISPLAY(a) a,
enum NoteNameDisplay { enum NoteNameDisplay {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
extern const char *notenamedisplaystrs[]; extern const char *notenamedisplaystrs[];
@ -214,7 +214,7 @@ inline const char* enum2str(NoteNameDisplay m) {return notenamedisplaystrs[m];}
#undef MARKERCLICKBEHAVIOR #undef MARKERCLICKBEHAVIOR
#define MARKERCLICKBEHAVIOR(a) a, #define MARKERCLICKBEHAVIOR(a) a,
enum MarkerClickBehavior { enum MarkerClickBehavior {
#include "editing_syms.h" #include "editing_syms.inc.h"
}; };
#undef MARKERCLICKBEHAVIOR #undef MARKERCLICKBEHAVIOR
#define MARKERCLICKBEHAVIOR(a) /*empty*/ #define MARKERCLICKBEHAVIOR(a) /*empty*/

4
gtk2_ardour/editing_context.h
View File

@ -315,7 +315,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
void reset_point_selection (); void reset_point_selection ();
/** Set the mouse mode (gain, object, range, timefx etc.) /** Set the mouse mode (gain, object, range, timefx etc.)
* @param m Mouse mode (defined in editing_syms.h) * @param m Mouse mode (defined in editing_syms.inc.h)
* @param force Perform the effects of the change even if no change is required * @param force Perform the effects of the change even if no change is required
* (ie even if the current mouse mode is equal to @p m) * (ie even if the current mouse mode is equal to @p m)
*/ */
@ -325,7 +325,7 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
*/ */
virtual void step_mouse_mode (bool next) = 0; virtual void step_mouse_mode (bool next) = 0;
/** @return The current mouse mode (gain, object, range, timefx etc.) /** @return The current mouse mode (gain, object, range, timefx etc.)
* (defined in editing_syms.h) * (defined in editing_syms.inc.h)
*/ */
Editing::MouseMode current_mouse_mode () const { return mouse_mode; } Editing::MouseMode current_mouse_mode () const { return mouse_mode; }
virtual Editing::MouseMode effective_mouse_mode () const { return mouse_mode; } virtual Editing::MouseMode effective_mouse_mode () const { return mouse_mode; }

0
gtk2_ardour/editing_syms.h → gtk2_ardour/editing_syms.inc.h
View File

12
gtk2_ardour/luainstance.cc
View File

@ -365,7 +365,7 @@ LuaSignal
str2luasignal (const std::string &str) { str2luasignal (const std::string &str) {
const char* type = str.c_str(); const char* type = str.c_str();
if (0) { } if (0) { }
# include "luasignal_syms.h" # include "luasignal_syms.inc.h"
else { else {
PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", str) << endmsg; PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", str) << endmsg;
abort(); /*NOTREACHED*/ abort(); /*NOTREACHED*/
@ -379,7 +379,7 @@ str2luasignal (const std::string &str) {
#define SESSION(name,c) N_(#name), #define SESSION(name,c) N_(#name),
#define ENGINE(name,c) N_(#name), #define ENGINE(name,c) N_(#name),
const char *luasignalstr[] = { const char *luasignalstr[] = {
# include "luasignal_syms.h" # include "luasignal_syms.inc.h"
0 0
}; };
@ -551,7 +551,7 @@ LuaInstance::register_hooks (lua_State* L)
#define SESSION(name,c) .addConst (stringify(name), (LuaSignal::LuaSignal)LuaSignal::name) #define SESSION(name,c) .addConst (stringify(name), (LuaSignal::LuaSignal)LuaSignal::name)
luabridge::getGlobalNamespace (L) luabridge::getGlobalNamespace (L)
.beginNamespace ("LuaSignal") .beginNamespace ("LuaSignal")
# include "luasignal_syms.h" # include "luasignal_syms.inc.h"
.endNamespace (); .endNamespace ();
#undef ENGINE #undef ENGINE
#undef SESSION #undef SESSION
@ -1114,7 +1114,7 @@ LuaInstance::register_classes (lua_State* L, bool sandbox)
.addFunction ("set_" # var, &UIConfiguration::set_##var) \ .addFunction ("set_" # var, &UIConfiguration::set_##var) \
.addProperty (#var, &UIConfiguration::get_##var, &UIConfiguration::set_##var) .addProperty (#var, &UIConfiguration::get_##var, &UIConfiguration::set_##var)
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
.endClass() .endClass()
@ -1146,7 +1146,7 @@ LuaInstance::register_classes (lua_State* L, bool sandbox)
#define NOTENAMEDISPLAY(NAME) .addConst (stringify(NAME), (Editing::NoteNameDisplay)Editing::NAME) #define NOTENAMEDISPLAY(NAME) .addConst (stringify(NAME), (Editing::NoteNameDisplay)Editing::NAME)
luabridge::getGlobalNamespace (L) luabridge::getGlobalNamespace (L)
.beginNamespace ("Editing") .beginNamespace ("Editing")
# include "editing_syms.h" # include "editing_syms.inc.h"
.endNamespace (); .endNamespace ();
if (!sandbox) { if (!sandbox) {
@ -2379,7 +2379,7 @@ LuaCallback::reconnect_object (T obj)
#define SESSION(n,c) else if (i == LuaSignal::n) { if (_session) { connect (LuaSignal::n, _session, &(_session->c)); } } #define SESSION(n,c) else if (i == LuaSignal::n) { if (_session) { connect (LuaSignal::n, _session, &(_session->c)); } }
#define STATIC(n,c) else if (i == LuaSignal::n) { connect (LuaSignal::n, obj, c); } #define STATIC(n,c) else if (i == LuaSignal::n) { connect (LuaSignal::n, obj, c); }
if (0) {} if (0) {}
# include "luasignal_syms.h" # include "luasignal_syms.inc.h"
else { else {
PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", i) << endmsg; PBD::fatal << string_compose (_("programming error: %1: %2"), "Impossible LuaSignal type", i) << endmsg;
abort(); /*NOTREACHED*/ abort(); /*NOTREACHED*/

2
gtk2_ardour/luasignal.h
View File

@ -24,7 +24,7 @@ namespace LuaSignal {
#define SESSION(name,c) name, #define SESSION(name,c) name,
enum LuaSignal { enum LuaSignal {
# include "luasignal_syms.h" # include "luasignal_syms.inc.h"
LAST_SIGNAL LAST_SIGNAL
}; };

0
gtk2_ardour/luasignal_syms.h → gtk2_ardour/luasignal_syms.inc.h
View File

4
gtk2_ardour/note_base.cc
View File

@ -29,13 +29,13 @@
#include "note_base.h" #include "note_base.h"
#include "editing_context.h" #include "editing_context.h"
#include "editing_syms.h" #include "editing_syms.inc.h"
#include "keyboard.h" #include "keyboard.h"
#include "midi_view.h" #include "midi_view.h"
/* clang-format off */ /* clang-format off */
// Include last, when GRIDTYPE has been defined by editing.h via midi_region_view.h // Include last, when GRIDTYPE has been defined by editing.h via midi_region_view.h
#include "editing_syms.h" #include "editing_syms.inc.h"
/* clang-format on */ /* clang-format on */
using namespace std; using namespace std;

9
gtk2_ardour/preference-metadata
View File

@ -10,9 +10,6 @@
# [never-do-that-thing] # [never-do-that-thing]
# thing that action prevent never stop otherthing # thing that action prevent never stop otherthing
# #
# The file is processed via tools/process-metadata to create build/gtk2_ardour/configuration_metadata.h which is then incorporated via an #include directive
# within gtk2_ardour/ui_config.cc
#
# Whenever a new preference variable is added to the source code, its name should also be added here. # Whenever a new preference variable is added to the source code, its name should also be added here.
# #
# GUIDANCE: # GUIDANCE:
@ -20,6 +17,12 @@
# use "synchronization" rather than sync, because that will match both "sync" and "synchronization". For languages that create plurals with a suffix, # use "synchronization" rather than sync, because that will match both "sync" and "synchronization". For languages that create plurals with a suffix,
# prefer plural forms for the same reason. # prefer plural forms for the same reason.
# #
# This file is processed automatically when invoking a custom tool manually:
#
# tools/process-metadata gtk2_ardour/preference-metadata > gtk2_ardour/configuration_metadata.inc.h
#
# The generated file is incorporated via an #include directive within gtk2_ardour/ui_config.cc .
[SECTION:UI] [SECTION:UI]
[action-table-columns] [action-table-columns]

18
gtk2_ardour/ui_config.cc
View File

@ -84,8 +84,8 @@ UIConfiguration::UIConfiguration ()
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,val) var (name,val), #define UI_CONFIG_VARIABLE(Type,var,name,val) var (name,val),
#define CANVAS_FONT_VARIABLE(var,name) var (name), #define CANVAS_FONT_VARIABLE(var,name) var (name),
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#include "canvas_vars.h" #include "canvas_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
@ -101,7 +101,7 @@ UIConfiguration::UIConfiguration ()
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var))); #define UI_CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
#define CANVAS_FONT_VARIABLE(var,name) /* no need for metadata for these */ #define CANVAS_FONT_VARIABLE(var,name) /* no need for metadata for these */
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
@ -222,7 +222,7 @@ UIConfiguration::map_parameters (std::function<void (std::string)>& functor)
{ {
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,Name,value) functor (Name); #define UI_CONFIG_VARIABLE(Type,var,Name,value) functor (Name);
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
} }
@ -572,8 +572,8 @@ UIConfiguration::get_variables (std::string const & node_name) const
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); } #define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); }
#define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } #define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); }
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#include "canvas_vars.h" #include "canvas_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
@ -707,8 +707,8 @@ UIConfiguration::set_variables (const XMLNode& node)
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,val) if (var.set_from_node (node)) { ParameterChanged (name); } #define UI_CONFIG_VARIABLE(Type,var,name,val) if (var.set_from_node (node)) { ParameterChanged (name); }
#define CANVAS_FONT_VARIABLE(var,name) if (var.set_from_node (node)) { ParameterChanged (name); } #define CANVAS_FONT_VARIABLE(var,name) if (var.set_from_node (node)) { ParameterChanged (name); }
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#include "canvas_vars.h" #include "canvas_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
} }
@ -867,4 +867,4 @@ UIConfiguration::color_to_hex_string_no_alpha (Gtkmm2ext::Color c)
return buf; return buf;
} }
#include "configuration_metadata.h" #include "configuration_metadata.inc.h"

8
gtk2_ardour/ui_config.h
View File

@ -114,13 +114,13 @@ public:
#define UI_CONFIG_VARIABLE(Type,var,name,value) \ #define UI_CONFIG_VARIABLE(Type,var,name,value) \
Type get_##var () const { return var.get(); } \ Type get_##var () const { return var.get(); } \
bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; } bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define CANVAS_FONT_VARIABLE(var,name) \ #define CANVAS_FONT_VARIABLE(var,name) \
Pango::FontDescription get_##var () const { return ARDOUR_UI_UTILS::sanitized_font (var.get()); } \ Pango::FontDescription get_##var () const { return ARDOUR_UI_UTILS::sanitized_font (var.get()); } \
Pango::FontDescription get_Ardour##var () const { return ARDOUR_UI_UTILS::ardour_font (var.get()); } \ Pango::FontDescription get_Ardour##var () const { return ARDOUR_UI_UTILS::ardour_font (var.get()); } \
bool set_##var (const std::string& val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; } bool set_##var (const std::string& val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "canvas_vars.h" #include "canvas_vars.inc.h"
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
private: private:
@ -128,11 +128,11 @@ private:
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var; #define UI_CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
#include "ui_config_vars.h" #include "ui_config_vars.inc.h"
#undef UI_CONFIG_VARIABLE #undef UI_CONFIG_VARIABLE
#define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var; #define CANVAS_FONT_VARIABLE(var,name) PBD::ConfigVariable<std::string> var;
#include "canvas_vars.h" #include "canvas_vars.inc.h"
#undef CANVAS_FONT_VARIABLE #undef CANVAS_FONT_VARIABLE
XMLNode& state () const; XMLNode& state () const;

0
gtk2_ardour/ui_config_vars.h → gtk2_ardour/ui_config_vars.inc.h
View File

4
libs/ardour/MSVClibardour/ardour.vcproj
View File

@ -2350,7 +2350,7 @@
> >
</File> </File>
<File <File
RelativePath="..\ardour\rc_configuration_vars.h" RelativePath="..\ardour\rc_configuration_vars.inc.h"
> >
</File> </File>
<File <File
@ -2458,7 +2458,7 @@
> >
</File> </File>
<File <File
RelativePath="..\ardour\session_configuration_vars.h" RelativePath="..\ardour\session_configuration_vars.inc.h"
> >
</File> </File>
<File <File

4
libs/ardour/ardour/rc_configuration.h
View File

@ -71,7 +71,7 @@ class LIBARDOUR_API RCConfiguration : public PBD::Configuration
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \ #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
Type get_##var () const { return var.get(); } \ Type get_##var () const { return var.get(); } \
bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; } bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -83,7 +83,7 @@ class LIBARDOUR_API RCConfiguration : public PBD::Configuration
#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;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var; #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL

0
libs/ardour/ardour/rc_configuration_vars.h → libs/ardour/ardour/rc_configuration_vars.inc.h
View File

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

@ -53,7 +53,7 @@ public:
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \ #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
Type get_##var () const { return var.get(); } \ Type get_##var () const { return var.get(); } \
bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; } bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
/* clang-format on */ /* clang-format on */
@ -67,7 +67,7 @@ public:
#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;
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var; #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
/* clang-format on */ /* clang-format on */

0
libs/ardour/ardour/session_configuration_vars.h → libs/ardour/ardour/session_configuration_vars.inc.h
View File

4
libs/ardour/luabindings.cc
View File

@ -3006,7 +3006,7 @@ LuaBindings::common (lua_State* L)
.addFunction ("set_" # var, &RCConfiguration::set_##var) \ .addFunction ("set_" # var, &RCConfiguration::set_##var) \
.addProperty (#var, &RCConfiguration::get_##var, &RCConfiguration::set_##var) .addProperty (#var, &RCConfiguration::get_##var, &RCConfiguration::set_##var)
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -3025,7 +3025,7 @@ LuaBindings::common (lua_State* L)
.addFunction ("set_" # var, &SessionConfiguration::set_##var) \ .addFunction ("set_" # var, &SessionConfiguration::set_##var) \
.addProperty (#var, &SessionConfiguration::get_##var, &SessionConfiguration::set_##var) .addProperty (#var, &SessionConfiguration::get_##var, &SessionConfiguration::set_##var)
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL

2
libs/ardour/midi_ui.cc
View File

@ -43,7 +43,7 @@ using namespace Glib;
MidiControlUI* MidiControlUI::_instance = 0; MidiControlUI* MidiControlUI::_instance = 0;
#include "pbd/abstract_ui.cc" /* instantiate the template */ #include "pbd/abstract_ui.inc.cc" /* instantiate the template */
MidiControlUI::MidiControlUI (Session& s) MidiControlUI::MidiControlUI (Session& s)
: AbstractUI<MidiUIRequest> (X_("midiUI")) : AbstractUI<MidiUIRequest> (X_("midiUI"))

10
libs/ardour/rc_configuration.cc
View File

@ -70,7 +70,7 @@ RCConfiguration::RCConfiguration ()
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) var (name,value), #define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator), #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
_control_protocol_state (0) _control_protocol_state (0)
@ -84,7 +84,7 @@ RCConfiguration::RCConfiguration ()
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var))); #define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var))); #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var)));
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -243,7 +243,7 @@ RCConfiguration::get_variables (std::string const & node_name) const
var.add_to_node (*node); var.add_to_node (*node);
#define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \ #define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
var.add_to_node (*node); var.add_to_node (*node);
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -299,7 +299,7 @@ RCConfiguration::set_variables (const XMLNode& node)
ParameterChanged (name); \ ParameterChanged (name); \
} }
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -311,7 +311,7 @@ RCConfiguration::map_parameters (std::function<void (std::string)>& functor)
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(type,var,name,value) functor (name); #define CONFIG_VARIABLE(type,var,name,value) functor (name);
#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name); #define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name);
#include "ardour/rc_configuration_vars.h" #include "ardour/rc_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
} }

10
libs/ardour/session_configuration.cc
View File

@ -50,7 +50,7 @@ SessionConfiguration::SessionConfiguration ()
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) var (name,value), #define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator), #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
foo (0) // needed because above macros end in a comma foo (0) // needed because above macros end in a comma
@ -62,7 +62,7 @@ SessionConfiguration::SessionConfiguration ()
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var))); #define CONFIG_VARIABLE(Type,var,name,value) _my_variables.insert (std::make_pair ((name), &(var)));
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var))); #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) _my_variables.insert (std::make_pair ((name), &(var)));
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -97,7 +97,7 @@ SessionConfiguration::get_variables (std::string const & node_name) const
var.add_to_node (*node); var.add_to_node (*node);
#define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \ #define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
var.add_to_node (*node); var.add_to_node (*node);
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -136,7 +136,7 @@ SessionConfiguration::set_variables (const XMLNode& node)
ParameterChanged (name); \ ParameterChanged (name); \
} }
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
@ -148,7 +148,7 @@ SessionConfiguration::map_parameters (std::function<void (std::string)>& functor
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(type,var,name,value) functor (name); #define CONFIG_VARIABLE(type,var,name,value) functor (name);
#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name); #define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name);
#include "ardour/session_configuration_vars.h" #include "ardour/session_configuration_vars.inc.h"
#undef CONFIG_VARIABLE #undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL #undef CONFIG_VARIABLE_SPECIAL
} }

2
libs/ardour/test/test_ui.cc
View File

@ -25,7 +25,7 @@
#include "ardour/session_event.h" #include "ardour/session_event.h"
#include "ardour/rc_configuration.h" #include "ardour/rc_configuration.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
using namespace ARDOUR; using namespace ARDOUR;

2
libs/ctrl-interface/midi_surface/midi_surface.cc
View File

@ -35,7 +35,7 @@ using namespace ARDOUR;
using namespace Glib; using namespace Glib;
using namespace PBD; using namespace PBD;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
MIDISurface::MIDISurface (ARDOUR::Session& s, std::string const & namestr, std::string const & port_prefix, bool use_pad_filter) MIDISurface::MIDISurface (ARDOUR::Session& s, std::string const & namestr, std::string const & port_prefix, bool use_pad_filter)
: ControlProtocol (s, namestr) : ControlProtocol (s, namestr)

2
libs/gtkmm2ext/gtk_ui.cc
View File

@ -69,7 +69,7 @@ BaseUI::RequestType Gtkmm2ext::SetTip = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::AddIdle = BaseUI::new_request_type(); BaseUI::RequestType Gtkmm2ext::AddIdle = BaseUI::new_request_type();
BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type(); BaseUI::RequestType Gtkmm2ext::AddTimeout = BaseUI::new_request_type();
#include "pbd/abstract_ui.cc" /* instantiate the template */ #include "pbd/abstract_ui.inc.cc" /* instantiate the template */
template class AbstractUI<Gtkmm2ext::UIRequest>; template class AbstractUI<Gtkmm2ext::UIRequest>;

0
libs/pbd/pbd/abstract_ui.cc → libs/pbd/pbd/abstract_ui.inc.cc
View File

2
libs/surfaces/cc121/cc121.cc
View File

@ -69,7 +69,7 @@ using namespace std;
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
CC121::CC121 (Session& s) CC121::CC121 (Session& s)
: ControlProtocol (s, _("Steinberg CC121")) : ControlProtocol (s, _("Steinberg CC121"))

2
libs/surfaces/console1/console1.cc
View File

@ -18,7 +18,7 @@
#include <optional> #include <optional>
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#include "pbd/controllable.h" #include "pbd/controllable.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"

2
libs/surfaces/contourdesign/contourdesign.cc
View File

@ -38,7 +38,7 @@ using namespace Glib;
using namespace std; using namespace std;
using namespace ArdourSurface; using namespace ArdourSurface;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
static const uint16_t ContourDesign = 0x0b33; static const uint16_t ContourDesign = 0x0b33;
static const uint16_t ShuttlePRO_id = 0x0010; static const uint16_t ShuttlePRO_id = 0x0010;

2
libs/surfaces/faderport/faderport.cc
View File

@ -63,7 +63,7 @@ using namespace std;
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
FaderPort::FaderPort (Session& s) FaderPort::FaderPort (Session& s)
: MIDISurface (s, X_("PreSonus FaderPort"), X_("FaderPort"), false) : MIDISurface (s, X_("PreSonus FaderPort"), X_("FaderPort"), false)

2
libs/surfaces/faderport8/faderport8.cc
View File

@ -62,7 +62,7 @@ using namespace ArdourSurface::FP_NAMESPACE::FP8Types;
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#ifndef NDEBUG #ifndef NDEBUG
//#define VERBOSE_DEBUG //#define VERBOSE_DEBUG

2
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View File

@ -66,7 +66,7 @@
#include "midifunction.h" #include "midifunction.h"
#include "midiaction.h" #include "midiaction.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#include "pbd/i18n.h" #include "pbd/i18n.h"

2
libs/surfaces/launch_control_xl/launch_control_xl.cc
View File

@ -65,7 +65,7 @@ using namespace std;
using namespace PBD; using namespace PBD;
using namespace Glib; using namespace Glib;
using namespace ArdourSurface; using namespace ArdourSurface;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
/* init global object */ /* init global object */
LaunchControlXL* lcxl = 0; LaunchControlXL* lcxl = 0;

2
libs/surfaces/launchkey_4/launchkey_4.cc
View File

@ -78,7 +78,7 @@ using namespace ArdourSurface;
using namespace ArdourSurface::LAUNCHPAD_NAMESPACE; using namespace ArdourSurface::LAUNCHPAD_NAMESPACE;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
/* USB IDs */ /* USB IDs */

2
libs/surfaces/launchpad_pro/lppro.cc
View File

@ -73,7 +73,7 @@ using namespace Glib;
using namespace ArdourSurface; using namespace ArdourSurface;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#define NOVATION 0x1235 #define NOVATION 0x1235
#define LAUNCHPADPROMK3 0x0123 #define LAUNCHPADPROMK3 0x0123

2
libs/surfaces/launchpad_x/lpx.cc
View File

@ -80,7 +80,7 @@ using namespace ArdourSurface;
using namespace ArdourSurface::LAUNCHPAD_NAMESPACE; using namespace ArdourSurface::LAUNCHPAD_NAMESPACE;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#define NOVATION 0x1235 #define NOVATION 0x1235

2
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -98,7 +98,7 @@ using namespace ArdourSurface::MACKIE_NAMESPACE;
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_OPTION = 0x1; const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_OPTION = 0x1;
const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_CONTROL = 0x2; const int MACKIE_NAMESPACE::MackieControlProtocol::MODIFIER_CONTROL = 0x2;

2
libs/surfaces/maschine2/maschine2.cc
View File

@ -42,7 +42,7 @@
#include "canvas.h" #include "canvas.h"
#include "pbd/abstract_ui.cc" // instantiate template, includes i18n #include "pbd/abstract_ui.inc.cc" // instantiate template, includes i18n
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;

2
libs/surfaces/osc/osc.cc
View File

@ -84,7 +84,7 @@ using namespace std;
using namespace Glib; using namespace Glib;
using namespace ArdourSurface; using namespace ArdourSurface;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
OSC* OSC::_instance = 0; OSC* OSC::_instance = 0;

2
libs/surfaces/push2/push2.cc
View File

@ -74,7 +74,7 @@ using namespace Glib;
using namespace ArdourSurface; using namespace ArdourSurface;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#define ABLETON 0x2982 #define ABLETON 0x2982
#define PUSH2 0x1967 #define PUSH2 0x1967

2
libs/surfaces/us2400/us2400_control_protocol.cc
View File

@ -83,7 +83,7 @@ using namespace US2400;
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
const int US2400Protocol::MODIFIER_OPTION = 0x1; const int US2400Protocol::MODIFIER_OPTION = 0x1;
const int US2400Protocol::MODIFIER_CONTROL = 0x2; const int US2400Protocol::MODIFIER_CONTROL = 0x2;

2
libs/surfaces/websockets/ardour_websockets.cc
View File

@ -32,7 +32,7 @@
using namespace ARDOUR; using namespace ARDOUR;
using namespace ArdourSurface; using namespace ArdourSurface;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
ArdourWebsockets::ArdourWebsockets (Session& s) ArdourWebsockets::ArdourWebsockets (Session& s)
: ControlProtocol (s, X_ (surface_name)) : ControlProtocol (s, X_ (surface_name))

2
libs/surfaces/websockets/feedback.cc
View File

@ -20,7 +20,7 @@
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/tempo.h" #include "ardour/tempo.h"
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
#include "feedback.h" #include "feedback.h"
#include "transport.h" #include "transport.h"

2
libs/surfaces/wiimote/wiimote.cc
View File

@ -31,7 +31,7 @@ using namespace ARDOUR;
using namespace PBD; using namespace PBD;
using namespace std; using namespace std;
#include "pbd/abstract_ui.cc" // instantiate template #include "pbd/abstract_ui.inc.cc" // instantiate template
void wiimote_control_protocol_mesg_callback (cwiid_wiimote_t *wiimote, int mesg_count, union cwiid_mesg mesg[], timespec *t); void wiimote_control_protocol_mesg_callback (cwiid_wiimote_t *wiimote, int mesg_count, union cwiid_mesg mesg[], timespec *t);