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.h | |
| 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.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 |
1 files changed, 1 insertions, 2 deletions
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; |