diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-09 19:34:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:11 -0400 |
commit | c9f6cd88b12847c424589047d0eda089762034a5 (patch) | |
tree | b535006fbfab00e32c3f19c79819205d59b5cafd | |
parent | 3a56004f65c3d61917e9452a6f54b685748856e1 (diff) |
add track auto-naming options from Tracks
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 3 | ||||
-rw-r--r-- | libs/ardour/ardour/types.h | 7 | ||||
-rw-r--r-- | libs/ardour/enums.cc | 20 |
3 files changed, 30 insertions, 0 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 0a48e81597..c326b2e888 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -41,6 +41,9 @@ CONFIG_VARIABLE (bool, auto_connect_standard_busses, "auto-connect-standard-buss CONFIG_VARIABLE (AutoConnectOption, output_auto_connect, "output-auto-connect", AutoConnectMaster) CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", AutoConnectPhysical) +/* Naming */ +CONFIG_VARIABLE (TracksAutoNamingRule, tracks_auto_naming, "tracks-auto-naming", UseDefaultNames) + /* MIDI and MIDI related */ CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false) diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index b1b4388a74..72ed225486 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -456,6 +456,11 @@ namespace ARDOUR { AutoConnectPhysical = 0x1, AutoConnectMaster = 0x2 }; + + enum TracksAutoNamingRule { + UseDefaultNames = 0x1, + NameAfterDriver = 0x2 + }; enum SampleFormat { FormatFloat = 0, @@ -632,6 +637,7 @@ namespace ARDOUR { std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf); std::istream& operator>>(std::istream& o, ARDOUR::HeaderFormat& sf); std::istream& operator>>(std::istream& o, ARDOUR::AutoConnectOption& sf); +std::istream& operator>>(std::istream& o, ARDOUR::TracksAutoNamingRule& sf); 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); @@ -652,6 +658,7 @@ std::istream& operator>>(std::istream& o, ARDOUR::RegionSelectionAfterSplit& sf) std::ostream& operator<<(std::ostream& o, const ARDOUR::SampleFormat& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::HeaderFormat& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::AutoConnectOption& sf); +std::ostream& operator<<(std::ostream& o, const ARDOUR::TracksAutoNamingRule& sf); 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); diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index a1cf8d090c..695113bc6f 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -96,6 +96,7 @@ setup_enum_writer () AutoState _AutoState; AutoStyle _AutoStyle; AutoConnectOption _AutoConnectOption; + TracksAutoNamingRule _TracksAutoNamingRule; Session::StateOfTheState _Session_StateOfTheState; Route::Flag _Route_Flag; Source::Flag _Source_Flag; @@ -319,6 +320,10 @@ setup_enum_writer () REGISTER_ENUM (AutoConnectMaster); REGISTER_BITS (_AutoConnectOption); + REGISTER_ENUM (UseDefaultNames); + REGISTER_ENUM (NameAfterDriver); + REGISTER_BITS (_TracksAutoNamingRule); + REGISTER_ENUM (FormatFloat); REGISTER_ENUM (FormatInt24); REGISTER_ENUM (FormatInt16); @@ -687,6 +692,7 @@ std::ostream& operator<<(std::ostream& o, const SampleFormat& var) std::string s = enum_2_string (var); return o << s; } + std::istream& operator>>(std::istream& o, AutoConnectOption& var) { std::string s; @@ -701,6 +707,20 @@ std::ostream& operator<<(std::ostream& o, const AutoConnectOption& var) return o << s; } +std::istream& operator>>(std::istream& o, TracksAutoNamingRule& var) +{ + std::string s; + o >> s; + var = (TracksAutoNamingRule) string_2_enum (s, var); + return o; +} + +std::ostream& operator<<(std::ostream& o, const TracksAutoNamingRule& var) +{ + std::string s = enum_2_string (var); + return o << s; +} + std::istream& operator>>(std::istream& o, MonitorModel& var) { std::string s; |