diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-09-21 15:54:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-09-21 15:54:19 +0000 |
| commit | 185b58f259d558651bc33b0b560c27fa613f4b3b (patch) | |
| tree | acc62312a83f941db7c5f9a584f9d564a9d9d432 /libs/ardour | |
| parent | 2e59536dd8f5d65c26fa19fc643831418efca876 (diff) | |
Use a MementoCommandBinder for Crossfades so that the undo record can contain details for crossfades that are subsequently deleted (#4325).
git-svn-id: svn://localhost/ardour2/branches/3.0@10104 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/midi_automation_list_binder.h | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_automation_list_binder.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_command.cc | 14 | ||||
| -rw-r--r-- | libs/ardour/wscript | 1 |
4 files changed, 13 insertions, 6 deletions
diff --git a/libs/ardour/ardour/midi_automation_list_binder.h b/libs/ardour/ardour/midi_automation_list_binder.h index 95576b47de..89c6cdb90b 100644 --- a/libs/ardour/ardour/midi_automation_list_binder.h +++ b/libs/ardour/ardour/midi_automation_list_binder.h @@ -33,7 +33,7 @@ public: MidiAutomationListBinder (boost::shared_ptr<ARDOUR::MidiSource>, Evoral::Parameter); MidiAutomationListBinder (XMLNode *, ARDOUR::Session::SourceMap const &); - ARDOUR::AutomationList* get (); + ARDOUR::AutomationList* get () const; void add_state (XMLNode *); private: diff --git a/libs/ardour/midi_automation_list_binder.cc b/libs/ardour/midi_automation_list_binder.cc index 0f8e4884ca..fbb87c5cfa 100644 --- a/libs/ardour/midi_automation_list_binder.cc +++ b/libs/ardour/midi_automation_list_binder.cc @@ -49,7 +49,7 @@ MidiAutomationListBinder::MidiAutomationListBinder (XMLNode* node, Session::Sour } AutomationList* -MidiAutomationListBinder::get () +MidiAutomationListBinder::get () const { boost::shared_ptr<MidiModel> model = _source->model (); assert (model); diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index c240a4aa94..e5ddd0a097 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -34,6 +34,7 @@ #include "ardour/session_playlists.h" #include "ardour/region_factory.h" #include "ardour/midi_automation_list_binder.h" +#include "ardour/crossfade_binder.h" #include "ardour/crossfade.h" #include "pbd/error.h" #include "pbd/id.h" @@ -143,11 +144,16 @@ Session::memento_command_factory(XMLNode *n) cerr << "Alist " << id << " not found\n"; } else if (obj_T == "ARDOUR::Crossfade") { - boost::shared_ptr<Crossfade> c = playlists->find_crossfade (id); - if (c) { - return new MementoCommand<Crossfade> (*c.get(), before, after); + if (have_id) { + boost::shared_ptr<Crossfade> c = playlists->find_crossfade (id); + if (c) { + return new MementoCommand<Crossfade> (*c.get(), before, after); + } } else { - error << string_compose (X_("Crossfade %1 not found in session"), id) << endmsg; + return new MementoCommand<Crossfade> ( + new CrossfadeBinder (n, playlists), + before, after + ); } } else if (registry.count(id)) { // For Editor and AutomationLine which are off-limits herea diff --git a/libs/ardour/wscript b/libs/ardour/wscript index b347e73e7e..1b71f58298 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -71,6 +71,7 @@ libardour_sources = [ 'control_protocol_manager.cc', 'control_protocol_search_path.cc', 'crossfade.cc', + 'crossfade_binder.cc', 'cycle_timer.cc', 'data_type.cc', 'default_click.cc', |