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

add track auto-naming options from Tracks

Browse source
This commit is contained in:
Paul Davis 2015-05-09 19:34:05 -04:00
parent 3a56004f65
commit c9f6cd88b1
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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, output_auto_connect, "output-auto-connect", AutoConnectMaster)
CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", AutoConnectPhysical) 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 */ /* MIDI and MIDI related */
CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false) CONFIG_VARIABLE (bool, trace_midi_input, "trace-midi-input", false)

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

@ -456,6 +456,11 @@ namespace ARDOUR {
AutoConnectPhysical = 0x1, AutoConnectPhysical = 0x1,
AutoConnectMaster = 0x2 AutoConnectMaster = 0x2
}; };
enum TracksAutoNamingRule {
UseDefaultNames = 0x1,
NameAfterDriver = 0x2
};
enum SampleFormat { enum SampleFormat {
FormatFloat = 0, FormatFloat = 0,
@ -632,6 +637,7 @@ namespace ARDOUR {
std::istream& operator>>(std::istream& o, ARDOUR::SampleFormat& sf); 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::HeaderFormat& sf);
std::istream& operator>>(std::istream& o, ARDOUR::AutoConnectOption& 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::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);
@ -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::SampleFormat& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::HeaderFormat& 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::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::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);

20
libs/ardour/enums.cc
View file

@ -96,6 +96,7 @@ setup_enum_writer ()
AutoState _AutoState; AutoState _AutoState;
AutoStyle _AutoStyle; AutoStyle _AutoStyle;
AutoConnectOption _AutoConnectOption; AutoConnectOption _AutoConnectOption;
TracksAutoNamingRule _TracksAutoNamingRule;
Session::StateOfTheState _Session_StateOfTheState; Session::StateOfTheState _Session_StateOfTheState;
Route::Flag _Route_Flag; Route::Flag _Route_Flag;
Source::Flag _Source_Flag; Source::Flag _Source_Flag;
@ -319,6 +320,10 @@ setup_enum_writer ()
REGISTER_ENUM (AutoConnectMaster); REGISTER_ENUM (AutoConnectMaster);
REGISTER_BITS (_AutoConnectOption); REGISTER_BITS (_AutoConnectOption);
REGISTER_ENUM (UseDefaultNames);
REGISTER_ENUM (NameAfterDriver);
REGISTER_BITS (_TracksAutoNamingRule);
REGISTER_ENUM (FormatFloat); REGISTER_ENUM (FormatFloat);
REGISTER_ENUM (FormatInt24); REGISTER_ENUM (FormatInt24);
REGISTER_ENUM (FormatInt16); REGISTER_ENUM (FormatInt16);
@ -687,6 +692,7 @@ std::ostream& operator<<(std::ostream& o, const SampleFormat& var)
std::string s = enum_2_string (var); std::string s = enum_2_string (var);
return o << s; return o << s;
} }
std::istream& operator>>(std::istream& o, AutoConnectOption& var) std::istream& operator>>(std::istream& o, AutoConnectOption& var)
{ {
std::string s; std::string s;
@ -701,6 +707,20 @@ std::ostream& operator<<(std::ostream& o, const AutoConnectOption& var)
return o << s; 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::istream& operator>>(std::istream& o, MonitorModel& var)
{ {
std::string s; std::string s;