diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-07 17:42:49 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-07 19:29:55 +0200 |
| commit | 2b0fef5933e51a29d5b6bc0ef89146de35c88e81 (patch) | |
| tree | 558751325695196b3775eaed332895320bd4501e /gtk2_ardour/ardour_ui_dialogs.cc | |
| parent | a22e20133d0b5c1678fb41416f74283a93ab208f (diff) | |
revert 3c6ff2f0 now that WM-proxy is session-aware..
also includes a few additional tweaks on top of the revert:
don't set sessions to windows managed by the WM::Manager,
and also call WM::Manager's set_session (s); when closing session.
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index a8ff6305a2..e8d94bbe04 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -65,17 +65,7 @@ ARDOUR_UI::set_session (Session *s) { SessionHandlePtr::set_session (s); - if (audio_port_matrix) { - audio_port_matrix->set_session (s); - } - - if (midi_port_matrix) { - midi_port_matrix->set_session (s); - } - - if (route_params) { - route_params->set_session (s); - } + WM::Manager::instance().set_session (s); if (!_session) { /* Session option editor cannot exist across change-of-session */ @@ -98,7 +88,6 @@ ARDOUR_UI::set_session (Session *s) } AutomationWatch::instance().set_session (s); - WM::Manager::instance().set_session (s); if (shuttle_box) { shuttle_box->set_session (s); @@ -109,7 +98,6 @@ ARDOUR_UI::set_session (Session *s) big_clock->set_session (s); time_info_box->set_session (s); video_timeline->set_session (s); - location_ui->set_session (s); /* sensitize menu bar options that are now valid */ @@ -453,14 +441,6 @@ ARDOUR_UI::create_big_clock_window () return new BigClockWindow (*big_clock); } -RouteParams_UI* -ARDOUR_UI::create_route_params_window () -{ - RouteParams_UI *rv = new RouteParams_UI (); - rv->set_session(_session); - return rv; -} - void ARDOUR_UI::handle_locations_change (Location *) { |