diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
| commit | b6f4cdaea27fbf49f924b2684d4c638089314067 (patch) | |
| tree | 4328e93333d13eccadc18455ba32a7293d3cbd73 /gtk2_ardour/editor_mixer.cc | |
| parent | f53cbaede885cd52b8fee59890e33575a4fc11fa (diff) | |
rationalize destruction pathway (some more); tidy-ify some ImageFrame code
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mixer.cc')
| -rw-r--r-- | gtk2_ardour/editor_mixer.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 311506ecdf..b2cca47e98 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -64,12 +64,6 @@ Editor::editor_list_button_toggled () } void -Editor::cms_deleted () -{ - current_mixer_strip = 0; -} - -void Editor::show_editor_mixer (bool yn) { boost::shared_ptr<ARDOUR::Route> r; @@ -169,7 +163,7 @@ Editor::create_editor_mixer () _session, false); current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden)); - current_mixer_strip->CatchDeletion.connect (*this, boost::bind (&Editor::current_mixer_strip_removed, this), gui_context()); + #ifdef GTKOSX current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn)); #endif @@ -297,15 +291,6 @@ Editor::update_current_screen () } void -Editor::current_mixer_strip_removed () -{ - if (current_mixer_strip) { - /* it is being deleted elsewhere */ - current_mixer_strip = 0; - } -} - -void Editor::current_mixer_strip_hidden () { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { |