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

Commit one reversible command for the whole of an import, rather than one per region; makes MIDI imports into multiple tracks undoable in one step (#4788).

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12630 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-06-09 15:04:24 +00:00
parent 8da3833895
commit 94b6c7626c
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gtk2_ardour/editor_audio_import.cc
View file

@ -827,6 +827,8 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
int n = 0; int n = 0;
framepos_t rlen = 0; framepos_t rlen = 0;
begin_reversible_command (Operations::insert_file);
for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) { for (vector<boost::shared_ptr<Region> >::iterator r = regions.begin(); r != regions.end(); ++r, ++n) {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r); boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (*r);
@ -874,6 +876,8 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
} }
} }
commit_reversible_command ();
/* setup peak file building in another thread */ /* setup peak file building in another thread */
for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) { for (SourceList::iterator x = sources.begin(); x != sources.end(); ++x) {
@ -885,7 +889,7 @@ Editor::add_sources (vector<string> paths, SourceList& sources, framepos_t& pos,
int int
Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos, Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t in_chans, uint32_t out_chans, framepos_t& pos,
ImportMode mode, boost::shared_ptr<Track>& existing_track) ImportMode mode, boost::shared_ptr<Track>& existing_track)
{ {
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region); boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(region);
boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region); boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(region);
@ -912,11 +916,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
boost::shared_ptr<Playlist> playlist = existing_track->playlist(); boost::shared_ptr<Playlist> playlist = existing_track->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties())); boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties()));
begin_reversible_command (Operations::insert_file);
playlist->clear_changes (); playlist->clear_changes ();
playlist->add_region (copy, pos); playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist)); _session->add_command (new StatefulDiffCommand (playlist));
commit_reversible_command ();
break; break;
} }
@ -946,11 +948,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
boost::shared_ptr<Playlist> playlist = existing_track->playlist(); boost::shared_ptr<Playlist> playlist = existing_track->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region, true)); boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
begin_reversible_command (Operations::insert_file);
playlist->clear_changes (); playlist->clear_changes ();
playlist->add_region (copy, pos); playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist)); _session->add_command (new StatefulDiffCommand (playlist));
commit_reversible_command ();
break; break;
} }
@ -964,11 +964,9 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t
if (!at.empty()) { if (!at.empty()) {
boost::shared_ptr<Playlist> playlist = at.front()->playlist(); boost::shared_ptr<Playlist> playlist = at.front()->playlist();
boost::shared_ptr<Region> copy (RegionFactory::create (region, true)); boost::shared_ptr<Region> copy (RegionFactory::create (region, true));
begin_reversible_command (Operations::insert_file);
playlist->clear_changes (); playlist->clear_changes ();
playlist->add_region (copy, pos); playlist->add_region (copy, pos);
_session->add_command (new StatefulDiffCommand (playlist)); _session->add_command (new StatefulDiffCommand (playlist));
commit_reversible_command ();
} }
break; break;
} }