From fb8db038f7c8a322fc86901f86cf3313cc12055a Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 29 Jun 2013 17:19:49 +0200 Subject: [PATCH 1/3] Fix crash when showing external send GUI --- gtk2_ardour/gain_meter.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 99f1f75f0e..c38fbc6642 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -1163,7 +1163,8 @@ GainMeter::meter_configuration_changed (ChanCount c) } } - if (boost::dynamic_pointer_cast(_route) == 0 + if (_route + && boost::dynamic_pointer_cast(_route) == 0 && boost::dynamic_pointer_cast(_route) == 0 ) { if (_route->active()) { @@ -1173,20 +1174,20 @@ GainMeter::meter_configuration_changed (ChanCount c) } } else if (type == (1 << DataType::AUDIO)) { - if (_route->active()) { + if (!_route || _route->active()) { set_meter_strip_name ("AudioTrackMetrics"); } else { set_meter_strip_name ("AudioTrackMetricsInactive"); } } else if (type == (1 << DataType::MIDI)) { - if (_route->active()) { + if (!_route || _route->active()) { set_meter_strip_name ("MidiTrackMetrics"); } else { set_meter_strip_name ("MidiTrackMetricsInactive"); } } else { - if (_route->active()) { + if (!_route || _route->active()) { set_meter_strip_name ("AudioMidiTrackMetrics"); } else { set_meter_strip_name ("AudioMidiTrackMetricsInactive"); From 4fa8b8708364f6dbe7ca199349ef6fe1af82f4a5 Mon Sep 17 00:00:00 2001 From: Colin Fletcher Date: Sun, 30 Jun 2013 13:08:03 +0100 Subject: [PATCH 2/3] Fix 'Location window is blank' (#5538) Call set_session() on the location window from ARDOUR_UI::set_session(), and show_all() on the location window's LocationUI in set_session, so that it displays the markers and ranges of the current session. --- gtk2_ardour/ardour_ui_dialogs.cc | 1 + gtk2_ardour/location_ui.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 3ff625a207..02b1efaa2e 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -106,6 +106,7 @@ 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 */ diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 30a5b62426..9b9f3bfa22 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -1162,6 +1162,7 @@ LocationUIWindow::set_session (Session *s) { ArdourWindow::set_session (s); _ui.set_session (s); + _ui.show_all (); } void From 6ff66a40819b516af30734a2c0b4c7c9f025ba76 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 30 Jun 2013 14:27:11 +0200 Subject: [PATCH 3/3] common spelling of infinity (lowercase as libc's printf) --- gtk2_ardour/gain_meter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index c38fbc6642..242396c93c 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -333,7 +333,7 @@ GainMeterBase::reset_peak_display () _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; - peak_display.set_label (_("-Inf")); + peak_display.set_label (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); }