diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-04 03:42:34 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-04 03:42:34 +0000 |
| commit | 5756373841675a879833f98bb4008dd0c40714d3 (patch) | |
| tree | 5ab9e96d4e4314554a818b541bbc8e0e5f0c3e70 /gtk2_ardour/editor_ops.cc | |
| parent | 79986643c0c904f6574bb5323e2233a43a9e622e (diff) | |
Really fixed conflicts. Ready to merge into trunk.
git-svn-id: svn://localhost/ardour2/branches/undo@757 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d98be4f088..1e5f336e52 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2594,7 +2594,7 @@ Editor::naturalize () XMLNode &before = (*i)->region().get_state(); (*i)->region().move_to_natural_position (this); XMLNode &after = (*i)->region().get_state(); - session->add_command (new MementoCommand<AudioRegion>((*i)->region(), before, after)); + session->add_command (new MementoCommand<Region>((*i)->region(), before, after)); } commit_reversible_command (); } @@ -3401,7 +3401,7 @@ Editor::normalize_region () continue; XMLNode &before = arv->region().get_state(); arv->audio_region().normalize_to (0.0f); - session->add_command (new MementoCommand<Region>(arv->region, arv->region().get_state()); + session->add_command (new MementoCommand<Region>(arv->region(), before, arv->region().get_state())); } commit_reversible_command (); @@ -3428,7 +3428,7 @@ Editor::denormalize_region () continue; XMLNode &before = arv->region().get_state(); arv->audio_region().set_scale_amplitude (1.0f); - session->add_command (new MementoCommand<Region>(arv->region, before, arv->region().get_state()); + session->add_command (new MementoCommand<Region>(arv->region(), before, arv->region().get_state())); } commit_reversible_command (); @@ -3473,7 +3473,7 @@ Editor::apply_filter (AudioFilter& filter, string command) if (arv->audio_region().apply (filter) == 0) { XMLNode &before = playlist->get_state(); - playlist->replace_region (arv->region(), *(filter.results.front()), arv->region()position()); + playlist->replace_region (arv->region(), *(filter.results.front()), arv->region().position()); XMLNode &after = playlist->get_state(); session->add_command(new MementoCommand<Playlist>(*playlist, before, after)); } else { |