diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-27 14:29:06 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-27 14:29:06 -0500 |
| commit | b0e4f81eb3a38b7236ec39f11d5211840a064d15 (patch) | |
| tree | 91a917a2010fbaae80ff7fec6ab343b75bb978c2 /gtk2_ardour/ardour_ui_dialogs.cc | |
| parent | 28759617c4eb0cbadbd41e6d7ea97d5de182966c (diff) | |
| parent | c16551c80820e9f71341b2f940143c8b3f44f5ce (diff) | |
merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.
Still need to add API export/visibility macros for the canvas library.
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index b0ac528b79..d127c40343 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -68,7 +68,6 @@ ARDOUR_UI::set_session (Session *s) { SessionHandlePtr::set_session (s); - if (!_session) { WM::Manager::instance().set_session (s); /* Session option editor cannot exist across change-of-session */ @@ -198,9 +197,15 @@ ARDOUR_UI::set_session (Session *s) editor_meter_peak_display.hide(); } - if (_session - && _session->master_out() - && _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) { + if (meter_box.get_parent()) { + transport_tearoff_hbox.remove (meter_box); + transport_tearoff_hbox.remove (editor_meter_peak_display); + } + + if (_session && + _session->master_out() && + _session->master_out()->n_outputs().n(DataType::AUDIO) > 0) { + editor_meter = new LevelMeterHBox(_session); editor_meter->set_meter (_session->master_out()->shared_peak_meter().get()); editor_meter->clear_meters(); @@ -228,7 +233,7 @@ ARDOUR_UI::set_session (Session *s) meter_box.show(); editor_meter_peak_display.show(); } - } + } } int |