ardour/livetrax
13
0
Fork 0
Code

cleanup - prepare narrow mixer strips

Browse Source
This commit is contained in:
Robin Gareus 2013-07-10 15:11:51 +02:00
parent 50a1eb04a5
commit 84465f1ca2
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk2_ardour/gain_meter.cc
View File

@ -274,23 +274,22 @@ void
GainMeterBase::setup_meters (int len) GainMeterBase::setup_meters (int len)
{ {
int meter_width = 5; int meter_width = 5;
if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
meter_width = 10;
}
level_meter->setup_meters(len, meter_width);
switch (_width) { switch (_width) {
case Wide: case Wide:
//meter_metric_area.show(); meter_ticks1_area.show();
meter_ticks1_area.show(); meter_ticks2_area.show();
meter_ticks2_area.show(); if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
break; meter_width = 10;
case Narrow: }
//meter_metric_area.hide(); break;
meter_ticks1_area.hide(); case Narrow:
meter_ticks2_area.hide(); meter_width = 2;
break; meter_ticks1_area.hide();
meter_ticks2_area.hide();
break;
} }
level_meter->setup_meters(len, meter_width);
} }
void void
@ -894,7 +893,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
gain_display_box.pack_start (gain_display, true, true); gain_display_box.pack_start (gain_display, true, true);
meter_metric_area.set_name ("AudioTrackMetrics"); meter_metric_area.set_name ("AudioTrackMetrics");
meter_metric_area.set_size_request(25, 10); meter_metric_area.set_size_request(24, -1);
gain_automation_style_button.set_name ("mixer strip button"); gain_automation_style_button.set_name ("mixer strip button");
gain_automation_state_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button");
@ -937,7 +936,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
sigc::mem_fun(*this, &GainMeter::meter_ticks2_expose)); sigc::mem_fun(*this, &GainMeter::meter_ticks2_expose));
meter_hbox.pack_start (meter_ticks1_area, false, false); meter_hbox.pack_start (meter_ticks1_area, false, false);
meter_hbox.pack_start (meter_alignment, true, true); meter_hbox.pack_start (meter_alignment, false, false);
meter_hbox.pack_start (meter_ticks2_area, false, false); meter_hbox.pack_start (meter_ticks2_area, false, false);
meter_hbox.pack_start (meter_metric_area, false, false); meter_hbox.pack_start (meter_metric_area, false, false);
} }