smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

Browse source 
Still need to add API export/visibility macros for the canvas library.
This commit is contained in:
Paul Davis 2013-12-27 14:29:06 -05:00
commit b0e4f81eb3
426 changed files with 2059 additions and 1259 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -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