ardour/livetrax
13
0
Fork 0
Code

Merge branch 'master' into cairocanvas

Browse Source
This commit is contained in:
Paul Davis 2013-07-01 03:46:11 -04:00
commit 5d6c986748
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -106,6 +106,7 @@ ARDOUR_UI::set_session (Session *s)
big_clock->set_session (s); big_clock->set_session (s);
time_info_box->set_session (s); time_info_box->set_session (s);
video_timeline->set_session (s); video_timeline->set_session (s);
location_ui->set_session (s);
/* sensitize menu bar options that are now valid */ /* sensitize menu bar options that are now valid */

11
gtk2_ardour/gain_meter.cc
View File

@ -333,7 +333,7 @@ GainMeterBase::reset_peak_display ()
_meter->reset_max(); _meter->reset_max();
level_meter->clear_meters(); level_meter->clear_meters();
max_peak = -INFINITY; max_peak = -INFINITY;
peak_display.set_label (_("-Inf")); peak_display.set_label (_("-inf"));
peak_display.set_name ("MixerStripPeakDisplay"); peak_display.set_name ("MixerStripPeakDisplay");
} }
@ -1163,7 +1163,8 @@ GainMeter::meter_configuration_changed (ChanCount c)
} }
} }
if (boost::dynamic_pointer_cast<AudioTrack>(_route) == 0 if (_route
&& boost::dynamic_pointer_cast<AudioTrack>(_route) == 0
&& boost::dynamic_pointer_cast<MidiTrack>(_route) == 0 && boost::dynamic_pointer_cast<MidiTrack>(_route) == 0
) { ) {
if (_route->active()) { if (_route->active()) {
@ -1173,20 +1174,20 @@ GainMeter::meter_configuration_changed (ChanCount c)
} }
} }
else if (type == (1 << DataType::AUDIO)) { else if (type == (1 << DataType::AUDIO)) {
if (_route->active()) { if (!_route || _route->active()) {
set_meter_strip_name ("AudioTrackMetrics"); set_meter_strip_name ("AudioTrackMetrics");
} else { } else {
set_meter_strip_name ("AudioTrackMetricsInactive"); set_meter_strip_name ("AudioTrackMetricsInactive");
} }
} }
else if (type == (1 << DataType::MIDI)) { else if (type == (1 << DataType::MIDI)) {
if (_route->active()) { if (!_route || _route->active()) {
set_meter_strip_name ("MidiTrackMetrics"); set_meter_strip_name ("MidiTrackMetrics");
} else { } else {
set_meter_strip_name ("MidiTrackMetricsInactive"); set_meter_strip_name ("MidiTrackMetricsInactive");
} }
} else { } else {
if (_route->active()) { if (!_route || _route->active()) {
set_meter_strip_name ("AudioMidiTrackMetrics"); set_meter_strip_name ("AudioMidiTrackMetrics");
} else { } else {
set_meter_strip_name ("AudioMidiTrackMetricsInactive"); set_meter_strip_name ("AudioMidiTrackMetricsInactive");

1
gtk2_ardour/location_ui.cc
View File

@ -1162,6 +1162,7 @@ LocationUIWindow::set_session (Session *s)
{ {
ArdourWindow::set_session (s); ArdourWindow::set_session (s);
_ui.set_session (s); _ui.set_session (s);
_ui.show_all ();
} }
void void