Merge with 2.0-ongoing R2943.

git-svn-id: svn://localhost/ardour2/branches/3.0@2944 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-01-19 05:06:33 +00:00
parent 4ca1fe7993
commit 7295d8e9f6
26 changed files with 410 additions and 157 deletions

View file

@ -173,7 +173,10 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
current_mixer_strip = 0;
}
cms_new (rt->route ());
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
rt->route(), false);
current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
if (show) {
show_editor_mixer (true);