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

metrics test (should not be part of 1st meter)

Browse source
This commit is contained in:
Robin Gareus 2013-07-02 19:31:40 +02:00
parent 52f31957de
commit 3c82b99a3b
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gtk2_ardour/meter_strip.cc
View file

@ -75,7 +75,7 @@ MeterStrip::MeterStrip (Meterbridge& mtr, Session* sess, boost::shared_ptr<ARDOU
level_meter->set_meter (_route->shared_peak_meter().get()); level_meter->set_meter (_route->shared_peak_meter().get());
level_meter->clear_meters(); level_meter->clear_meters();
level_meter->setup_meters (400, meter_width, 6); level_meter->setup_meters (400, meter_width, 6);
#ifdef WITH_METRICS #ifdef WITH_METRICSINMETER
level_meter->pack_start (meter_metric_area, false, false); level_meter->pack_start (meter_metric_area, false, false);
#endif #endif
@ -84,6 +84,7 @@ MeterStrip::MeterStrip (Meterbridge& mtr, Session* sess, boost::shared_ptr<ARDOU
meter_align->add(*level_meter); meter_align->add(*level_meter);
#ifdef WITH_METRICS #ifdef WITH_METRICS
meterbox.pack_start(meter_metric_area, true, false);
meterbox.pack_start(meter_ticks1_area, true, false); meterbox.pack_start(meter_ticks1_area, true, false);
meterbox.pack_start(*meter_align, true, true); meterbox.pack_start(*meter_align, true, true);
meterbox.pack_start(meter_ticks2_area, true, false); meterbox.pack_start(meter_ticks2_area, true, false);
@ -221,15 +222,11 @@ MeterStrip::fast_update ()
void void
MeterStrip::display_metrics (bool show) MeterStrip::display_metrics (bool show)
{ {
#ifdef WITH_METRICSTOGGLE
if (show) { if (show) {
meter_metric_area.show(); meter_metric_area.show();
meter_ticks1_area.hide();
} else { } else {
meter_metric_area.hide(); meter_metric_area.hide();
meter_ticks1_area.show();
} }
#endif
} }
void void
@ -396,7 +393,7 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
points.push_back (-6); points.push_back (-6);
points.push_back (-3); points.push_back (-3);
points.push_back (0); points.push_back (0);
points.push_back (4); points.push_back (3);
break; break;
case DataType::MIDI: case DataType::MIDI:
@ -436,12 +433,6 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
} }
gint const pos = height - (gint) floor (height * fraction); gint const pos = height - (gint) floor (height * fraction);
cairo_set_line_width (cr, 1.0);
cairo_move_to (cr, width-3.5, pos);
cairo_line_to (cr, width, pos);
cairo_stroke (cr);
layout->set_text(buf); layout->set_text(buf);
/* we want logical extents, not ink extents here */ /* we want logical extents, not ink extents here */
@ -453,7 +444,7 @@ MeterStrip::render_metrics (Gtk::Widget& w, vector<DataType> types)
p = min (p, height - th); p = min (p, height - th);
p = max (p, 0); p = max (p, 0);
cairo_move_to (cr, width-5-tw, p); cairo_move_to (cr, width-2-tw, p + .5);
pango_cairo_show_layout (cr, layout->gobj()); pango_cairo_show_layout (cr, layout->gobj());
} }
} }
@ -606,11 +597,11 @@ MeterStrip::render_ticks (Gtk::Widget& w, vector<DataType> types)
case DataType::MIDI: case DataType::MIDI:
points.insert (std::pair<int,float>( 0, 1.0)); points.insert (std::pair<int,float>( 0, 1.0));
points.insert (std::pair<int,float>( 16, 0.5)); points.insert (std::pair<int,float>( 16, 0.5));
points.insert (std::pair<int,float>( 32, 1.0)); points.insert (std::pair<int,float>( 32, 0.5));
points.insert (std::pair<int,float>( 48, 0.5)); points.insert (std::pair<int,float>( 48, 0.5));
points.insert (std::pair<int,float>( 64, 1.0)); points.insert (std::pair<int,float>( 64, 1.0));
points.insert (std::pair<int,float>( 72, 0.5)); points.insert (std::pair<int,float>( 72, 0.5));
points.insert (std::pair<int,float>( 96, 1.0)); points.insert (std::pair<int,float>( 96, 0.5));
points.insert (std::pair<int,float>(100, 1.0)); points.insert (std::pair<int,float>(100, 1.0));
points.insert (std::pair<int,float>(112, 0.5)); points.insert (std::pair<int,float>(112, 0.5));
points.insert (std::pair<int,float>(127, 1.0)); points.insert (std::pair<int,float>(127, 1.0));

4
gtk2_ardour/meterbridge.cc
View file

@ -471,9 +471,7 @@ Meterbridge::sync_order_keys (RouteSortOrderKey src)
(*i)->show(); (*i)->show();
} }
if (pos == 0) {
if (pos%8 == 0) {
(*i)->display_metrics(true); (*i)->display_metrics(true);
} else { } else {
(*i)->display_metrics(false); (*i)->display_metrics(false);