diff options
author | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-08-01 17:19:38 +0000 |
commit | 79fc27de2ef9db51a8c7c69764b663a9921c5a40 (patch) | |
tree | 09d5e86fa212f2b8dde0811b2c9e8cc7cfbc7136 /gtk2_ardour/editor_ops.cc | |
parent | 9d5d82b4df5b3510177fd31557ac765f46778fe8 (diff) |
Mostly Cosmetic/Design changes to bring trunk and midi branch closer
git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 91409b3429..af366e18d0 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -51,7 +51,7 @@ #include "audio_time_axis.h" #include "automation_time_axis.h" #include "streamview.h" -#include "audio_regionview.h" +#include "audio_region_view.h" #include "rgb_macros.h" #include "selection_templates.h" #include "selection.h" @@ -2117,20 +2117,14 @@ Editor::audition_selected_region () { if (!selection->regions.empty()) { RegionView* rv = *(selection->regions.begin()); - // FIXME - AudioRegion* const ar = dynamic_cast<AudioRegion*>(&rv->region()); - assert(ar); - session->audition_region (*ar); + session->audition_region (rv->region()); } } void Editor::audition_playlist_region_standalone (Region& region) { - // FIXME - AudioRegion* const ar = dynamic_cast<AudioRegion*>(®ion); - assert(ar); - session->audition_region (*ar); + session->audition_region (region); } void @@ -2195,12 +2189,12 @@ Editor::region_from_selection () continue; } - if ((current = dynamic_cast<AudioRegion*> (current_r)) != 0) { + current = dynamic_cast<AudioRegion*> (current_r); + assert(current); // FIXME + if (current != 0) { internal_start = start - current->position(); session->region_name (new_name, current->name(), true); region = new AudioRegion (*current, internal_start, selection_cnt, new_name); - } else { - assert(false); // FIXME } } } |