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

there is no remote model choice anymore - ordering is determined by the GUI

Browse source
This commit is contained in:
Paul Davis 2016-06-06 12:04:45 -04:00
parent 8bfa2afe11
commit da5119583a
3 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -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 (uint32_t, feedback_interval_ms, "feedback-interval-ms", 100)
CONFIG_VARIABLE (bool, use_tranzport, "use-tranzport", false) CONFIG_VARIABLE (bool, use_tranzport, "use-tranzport", false)
CONFIG_VARIABLE (RemoteModel, remote_model, "remote-model", MixerOrdered)
/* disk operations */ /* disk operations */

7
libs/ardour/ardour/types.h
View file

@ -466,11 +466,6 @@ namespace ARDOUR {
DenormalFTZDAZ DenormalFTZDAZ
}; };
enum RemoteModel {
UserOrdered,
MixerOrdered
};
enum LayerModel { enum LayerModel {
LaterHigher, LaterHigher,
Manual 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::MonitorModel& sf);
std::istream& operator>>(std::istream& o, ARDOUR::PFLPosition& 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::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::ListenPosition& sf);
std::istream& operator>>(std::istream& o, ARDOUR::LayerModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::LayerModel& sf);
std::istream& operator>>(std::istream& o, ARDOUR::InsertMergePolicy& 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::MonitorModel& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::PFLPosition& 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::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::ListenPosition& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::LayerModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::LayerModel& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf);

17
libs/ardour/enums.cc
View file

@ -74,7 +74,6 @@ setup_enum_writer ()
MonitorState _MonitorState; MonitorState _MonitorState;
PFLPosition _PFLPosition; PFLPosition _PFLPosition;
AFLPosition _AFLPosition; AFLPosition _AFLPosition;
RemoteModel _RemoteModel;
DenormalModel _DenormalModel; DenormalModel _DenormalModel;
LayerModel _LayerModel; LayerModel _LayerModel;
InsertMergePolicy _InsertMergePolicy; InsertMergePolicy _InsertMergePolicy;
@ -323,9 +322,6 @@ setup_enum_writer ()
REGISTER_ENUM (DenormalFTZDAZ); REGISTER_ENUM (DenormalFTZDAZ);
REGISTER (_DenormalModel); REGISTER (_DenormalModel);
REGISTER_ENUM (UserOrdered);
REGISTER_ENUM (MixerOrdered);
REGISTER (_RemoteModel);
/* /*
* EditorOrdered has been deprecated * EditorOrdered has been deprecated
* since the removal of independent * since the removal of independent
@ -850,19 +846,6 @@ std::ostream& operator<<(std::ostream& o, const AFLPosition& var)
return o << s; 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::istream& operator>>(std::istream& o, EditMode& var)
{ {
std::string s; std::string s;