smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

GUI control of insert merge policy for overlapping MIDI notes; quite a bit of whitespace reformatting for some reason

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7284 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-06-21 14:46:17 +00:00
parent 5138cb5d05
commit 4f16de5cfe
5 changed files with 983 additions and 955 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -48,3 +48,4 @@ CONFIG_VARIABLE (bool, show_summary, "show-summary", true)
CONFIG_VARIABLE (bool, show_group_tabs, "show-group-tabs", true)
CONFIG_VARIABLE (bool, external_sync, "external-sync", false)
CONFIG_VARIABLE (SyncSource, sync_source, "sync-source", JACK)
CONFIG_VARIABLE (InsertMergePolicy, insert_merge_policy, "insert-merge-policy", InsertMergeReject)

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

@ -491,6 +491,7 @@ std::istream& operator>>(std::istream& o, ARDOUR::MonitorModel& 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);
std::istream& operator>>(std::istream& o, ARDOUR::CrossfadeModel& sf);
std::istream& operator>>(std::istream& o, ARDOUR::SyncSource& sf);
std::istream& operator>>(std::istream& o, ARDOUR::ShuttleBehaviour& sf);
@ -508,6 +509,7 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::MonitorModel& 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);
std::ostream& operator<<(std::ostream& o, const ARDOUR::CrossfadeModel& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::SyncSource& sf);
std::ostream& operator<<(std::ostream& o, const ARDOUR::ShuttleBehaviour& sf);

23
libs/ardour/enums.cc
View file

@ -69,6 +69,7 @@ setup_enum_writer ()
DenormalModel _DenormalModel;
CrossfadeModel _CrossfadeModel;
LayerModel _LayerModel;
InsertMergePolicy _InsertMergePolicy;
ListenPosition _ListenPosition;
SampleFormat _SampleFormat;
CDMarkerFormat _CDMarkerFormat;
@ -238,6 +239,14 @@ setup_enum_writer ()
REGISTER_ENUM (MoveAddHigher);
REGISTER_ENUM (AddHigher);
REGISTER (_LayerModel);
REGISTER_ENUM (InsertMergeReject);
REGISTER_ENUM (InsertMergeRelax);
REGISTER_ENUM (InsertMergeReplace);
REGISTER_ENUM (InsertMergeTruncateExisting);
REGISTER_ENUM (InsertMergeTruncateAddition);
REGISTER_ENUM (InsertMergeExtend);
REGISTER (_InsertMergePolicy);
REGISTER_ENUM (AfterFaderListen);
REGISTER_ENUM (PreFaderListen);
@ -655,6 +664,20 @@ std::ostream& operator<<(std::ostream& o, const LayerModel& var)
std::string s = enum_2_string (var);
return o << s;
}
std::istream& operator>>(std::istream& o, InsertMergePolicy& var)
{
std::string s;
o >> s;
var = (InsertMergePolicy) string_2_enum (s, var);
return o;
}
std::ostream& operator<<(std::ostream& o, const InsertMergePolicy& var)
{
std::string s = enum_2_string (var);
return o << s;
}
std::istream& operator>>(std::istream& o, CrossfadeModel& var)
{
std::string s;

1894
libs/ardour/midi_model.cc
View file

File diff suppressed because it is too large Load diff