diff options
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 7 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 17 |
3 files changed, 0 insertions, 25 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index e895d5773e..a753e1bdf9 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -85,7 +85,6 @@ CONFIG_VARIABLE (float, ltc_output_volume, "ltc-output-volume", 0.125893) CONFIG_VARIABLE (uint32_t, feedback_interval_ms, "feedback-interval-ms", 100) CONFIG_VARIABLE (bool, use_tranzport, "use-tranzport", false) -CONFIG_VARIABLE (RemoteModel, remote_model, "remote-model", MixerOrdered) /* disk operations */ diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 856ba7197b..ce28484519 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -466,11 +466,6 @@ namespace ARDOUR { DenormalFTZDAZ }; - enum RemoteModel { - UserOrdered, - MixerOrdered - }; - enum LayerModel { LaterHigher, Manual @@ -699,7 +694,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::EditMode& sf); std::istream& operator>>(std::istream& o, ARDOUR::MonitorModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::PFLPosition& sf); std::istream& operator>>(std::istream& o, ARDOUR::AFLPosition& sf); -std::istream& operator>>(std::istream& o, ARDOUR::RemoteModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::ListenPosition& sf); std::istream& operator>>(std::istream& o, ARDOUR::LayerModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::InsertMergePolicy& sf); @@ -723,7 +717,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::EditMode& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::MonitorModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::PFLPosition& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::AFLPosition& sf); -std::ostream& operator<<(std::ostream& o, const ARDOUR::RemoteModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::ListenPosition& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::LayerModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf); diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 92d95d7f6a..6e90bd01f0 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -74,7 +74,6 @@ setup_enum_writer () MonitorState _MonitorState; PFLPosition _PFLPosition; AFLPosition _AFLPosition; - RemoteModel _RemoteModel; DenormalModel _DenormalModel; LayerModel _LayerModel; InsertMergePolicy _InsertMergePolicy; @@ -323,9 +322,6 @@ setup_enum_writer () REGISTER_ENUM (DenormalFTZDAZ); REGISTER (_DenormalModel); - REGISTER_ENUM (UserOrdered); - REGISTER_ENUM (MixerOrdered); - REGISTER (_RemoteModel); /* * EditorOrdered has been deprecated * since the removal of independent @@ -850,19 +846,6 @@ std::ostream& operator<<(std::ostream& o, const AFLPosition& var) return o << s; } -std::istream& operator>>(std::istream& o, RemoteModel& var) -{ - std::string s; - o >> s; - var = (RemoteModel) string_2_enum (s, var); - return o; -} - -std::ostream& operator<<(std::ostream& o, const RemoteModel& var) -{ - std::string s = enum_2_string (var); - return o << s; -} std::istream& operator>>(std::istream& o, EditMode& var) { std::string s; |