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 | |
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')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 22 |
3 files changed, 3 insertions, 36 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3432a3ccbf..7f72725af8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -188,13 +188,13 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , add_route_dialog (X_("add-routes"), _("Add Tracks/Busses")) , about (X_("about"), _("About")) , location_ui (X_("locations"), _("Locations")) + , route_params (X_("inspector"), _("Tracks and Busses")) , session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this)) , add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this)) , bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this)) , big_clock_window (X_("big-clock"), _("Big Clock"), boost::bind (&ARDOUR_UI::create_big_clock_window, this)) , audio_port_matrix (X_("audio-connection-manager"), _("Audio Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::AUDIO)) , midi_port_matrix (X_("midi-connection-manager"), _("MIDI Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::MIDI)) - , route_params (X_("inspector"), _("Tracks and Busses"), boost::bind (&ARDOUR_UI::create_route_params_window, this)) , error_log_button (_("Errors")) @@ -363,18 +363,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) and its functionality are separate */ - if (audio_port_matrix) { - audio_port_matrix->set_session (_session); - } - - if (midi_port_matrix) { - midi_port_matrix->set_session (_session); - } - - if (route_params) { - route_params->set_session (_session); - } - (void) theme_manager.get (true); starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup)); diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e7bc5a2782..0ed5d145b4 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -579,6 +579,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr WM::Proxy<AddRouteDialog> add_route_dialog; WM::Proxy<About> about; WM::Proxy<LocationUIWindow> location_ui; + WM::Proxy<RouteParams_UI> route_params; /* Windows/Dialogs that require a creator method */ @@ -588,7 +589,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr WM::ProxyWithConstructor<BigClockWindow> big_clock_window; WM::ProxyWithConstructor<GlobalPortMatrixWindow> audio_port_matrix; WM::ProxyWithConstructor<GlobalPortMatrixWindow> midi_port_matrix; - WM::ProxyWithConstructor<RouteParams_UI> route_params; /* creator methods */ @@ -597,7 +597,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr AddVideoDialog* create_add_video_dialog (); BigClockWindow* create_big_clock_window(); GlobalPortMatrixWindow* create_global_port_matrix (ARDOUR::DataType); - RouteParams_UI* create_route_params_window (); static UIConfiguration *ui_config; 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 *) { |