projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix up wscript/build issues in exportvis after merge with master
[ardour.git]
/
libs
/
ardour
/
enums.cc
diff --git
a/libs/ardour/enums.cc
b/libs/ardour/enums.cc
index 8fec499c35f30b6ce73d7b77d8699183aff7bb74..72125f87723a24556d13e995d37ec0bc6eb7a28f 100644
(file)
--- a/
libs/ardour/enums.cc
+++ b/
libs/ardour/enums.cc
@@
-95,7
+95,6
@@
setup_enum_writer ()
AutoState _AutoState;
AutoStyle _AutoStyle;
AutoConnectOption _AutoConnectOption;
AutoState _AutoState;
AutoStyle _AutoStyle;
AutoConnectOption _AutoConnectOption;
- RouteSortOrderKey _RouteSortOrderKey;
Session::StateOfTheState _Session_StateOfTheState;
Route::Flag _Route_Flag;
Source::Flag _Source_Flag;
Session::StateOfTheState _Session_StateOfTheState;
Route::Flag _Route_Flag;
Source::Flag _Source_Flag;
@@
-281,8
+280,13
@@
setup_enum_writer ()
REGISTER_ENUM (UserOrdered);
REGISTER_ENUM (MixerOrdered);
REGISTER_ENUM (UserOrdered);
REGISTER_ENUM (MixerOrdered);
- REGISTER_ENUM (EditorOrdered);
REGISTER (_RemoteModel);
REGISTER (_RemoteModel);
+ /*
+ * EditorOrdered has been deprecated
+ * since the removal of independent
+ * editor / mixer ordering.
+ */
+ enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered");
REGISTER_ENUM (FullCrossfade);
REGISTER_ENUM (ShortCrossfade);
REGISTER_ENUM (FullCrossfade);
REGISTER_ENUM (ShortCrossfade);
@@
-335,6
+339,7
@@
setup_enum_writer ()
REGISTER (_PluginType);
REGISTER_ENUM (MTC);
REGISTER (_PluginType);
REGISTER_ENUM (MTC);
+ REGISTER_ENUM (JACK);
REGISTER_ENUM (Engine);
REGISTER_ENUM (MIDIClock);
REGISTER_ENUM (LTC);
REGISTER_ENUM (Engine);
REGISTER_ENUM (MIDIClock);
REGISTER_ENUM (LTC);
@@
-433,10
+438,6
@@
setup_enum_writer ()
REGISTER_CLASS_ENUM (Route, MonitorOut);
REGISTER_BITS (_Route_Flag);
REGISTER_CLASS_ENUM (Route, MonitorOut);
REGISTER_BITS (_Route_Flag);
- REGISTER_ENUM (MixerSort);
- REGISTER_ENUM (EditorSort);
- REGISTER (_RouteSortOrderKey);
-
REGISTER_CLASS_ENUM (Source, Writable);
REGISTER_CLASS_ENUM (Source, CanRename);
REGISTER_CLASS_ENUM (Source, Broadcast);
REGISTER_CLASS_ENUM (Source, Writable);
REGISTER_CLASS_ENUM (Source, CanRename);
REGISTER_CLASS_ENUM (Source, Broadcast);