/* pattern cache */
struct MeterMatricsMapKey {
- MeterMatricsMapKey (std::string n, MeterType t)
+ MeterMatricsMapKey (std::string n, MeterType t, int dt)
: _n(n)
, _t(t)
+ , _dt(dt)
{}
inline bool operator<(const MeterMatricsMapKey& rhs) const {
- return (_n < rhs._n) || (_n == rhs._n && _t < rhs._t);
+ return (_n < rhs._n) || (_n == rhs._n && _t < rhs._t) || (_n == rhs._n && _t == rhs._t && _dt < rhs._dt);
}
std::string _n;
MeterType _t;
+ int _dt;
};
namespace ArdourMeter {
}
}
+static inline int types_to_bit (vector<ARDOUR::DataType> types) {
+ int rv = 0;
+ for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
+ rv |= 1 << (*i);
+ }
+ return rv;
+}
static inline float mtr_col_and_fract(
cairo_t* cr, Gdk::Color const * const c, const uint32_t peakcolor, const MeterType mt, const float val)
}
break;
case MeterIEC2BBC:
+ fraction = meter_deflect_ppm(val);
+ cairo_set_source_rgb (cr, c->get_red_p(), c->get_green_p(), c->get_blue_p());
+ break;
case MeterIEC2EBU:
fraction = meter_deflect_ppm(val);
if (val >= -10.0) {
return fraction;
}
+static void set_bg_color(Gtk::Widget& w, cairo_t* cr, MeterType type) {
+ float r,g,b;
+ switch(type) {
+ case MeterVU:
+ if (rgba_p_from_style("meterstripVU", &r, &g, &b, "bg")) {
+ cairo_set_source_rgb (cr, r, g, b);
+ } else {
+ cairo_set_source_rgb (cr, 1.0, 1.0, 0.85);
+ }
+ break;
+ case MeterIEC1DIN:
+ case MeterIEC1NOR:
+ case MeterIEC2BBC:
+ case MeterIEC2EBU:
+ case MeterK14:
+ case MeterK20:
+ if (rgba_p_from_style("meterstripPPM", &r, &g, &b, "bg")) {
+ cairo_set_source_rgb (cr, r, g, b);
+ } else {
+ cairo_set_source_rgb (cr, 0.1, 0.1, 0.1);
+ }
+ break;
+ default:
+ {
+ Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_ACTIVE);
+ cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+ }
+ break;
+ }
+}
+static void set_fg_color(Gtk::Widget& w, MeterType type, Gdk::Color * c) {
+ float r,g,b;
+ switch(type) {
+ case MeterVU:
+ if (rgba_p_from_style("meterstripVU", &r, &g, &b)) {
+ c->set_rgb_p(r, g, b);
+ } else {
+ c->set_rgb_p(0.0, 0.0, 0.0);
+ }
+ break;
+ default:
+ if (rgba_p_from_style("meterstripPPM", &r, &g, &b)) {
+ c->set_rgb_p(r, g, b);
+ } else {
+ c->set_rgb_p(1.0, 1.0, 1.0);
+ }
+ break;
+ }
+}
static cairo_pattern_t*
meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> types)
cairo_move_to (cr, 0, 0);
cairo_rectangle (cr, 0, 0, width, height);
- {
- Gdk::Color c = w.get_style()->get_bg (background ? Gtk::STATE_ACTIVE : Gtk::STATE_NORMAL);
+
+ if (background) {
+ /* meterbridge */
+ set_bg_color(w, cr, type);
+ } else {
+ /* mixer */
+ Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_NORMAL);
cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
}
cairo_fill (cr);
for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
Gdk::Color c;
- c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
-
- if (types.size() > 1) {
+ if (types.size() > 1 && (*i) == DataType::MIDI) {
/* we're overlaying more than 1 set of marks, so use different colours */
- switch (*i) {
- case DataType::AUDIO:
- c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- break;
- case DataType::MIDI:
- c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- break;
- }
+ c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
+ } else if (background) {
+ set_fg_color(w, type, &c);
+ cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
} else {
c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
}
+ cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- std::map<int,float> points;
+ // tick-maker position in dBFS, line-thickness
+ std::map<float,float> points;
switch (*i) {
case DataType::AUDIO:
switch (type) {
case MeterK14:
- points.insert (std::pair<int,float>(-54.0f, 1.0));
- points.insert (std::pair<int,float>(-44.0f, 1.0));
- points.insert (std::pair<int,float>(-34.0f, 1.0));
- points.insert (std::pair<int,float>(-24.0f, 1.0));
- points.insert (std::pair<int,float>(-20.0f, 1.0));
- points.insert (std::pair<int,float>(-17.0f, 1.0));
- points.insert (std::pair<int,float>(-14.0f, 1.0));
- points.insert (std::pair<int,float>(-11.0f, 1.0));
- points.insert (std::pair<int,float>( -8.0f, 1.0));
- points.insert (std::pair<int,float>( -4.0f, 1.0));
- points.insert (std::pair<int,float>( 0.0f, 1.0));
+ points.insert (std::pair<float,float>(-54.0f, 1.0));
+ points.insert (std::pair<float,float>(-44.0f, 1.0));
+ points.insert (std::pair<float,float>(-34.0f, 1.0));
+ points.insert (std::pair<float,float>(-24.0f, 1.0));
+ points.insert (std::pair<float,float>(-20.0f, 1.0));
+ points.insert (std::pair<float,float>(-17.0f, 1.0));
+ points.insert (std::pair<float,float>(-14.0f, 1.0));
+ points.insert (std::pair<float,float>(-11.0f, 1.0));
+ points.insert (std::pair<float,float>( -8.0f, 1.0));
+ points.insert (std::pair<float,float>( -4.0f, 1.0));
+ points.insert (std::pair<float,float>( 0.0f, 1.0));
break;
case MeterK20:
- points.insert (std::pair<int,float>(-60.0f, 1.0));
- points.insert (std::pair<int,float>(-50.0f, 1.0));
- points.insert (std::pair<int,float>(-40.0f, 1.0));
- points.insert (std::pair<int,float>(-30.0f, 1.0));
- points.insert (std::pair<int,float>(-26.0f, 1.0));
- points.insert (std::pair<int,float>(-23.0f, 1.0));
- points.insert (std::pair<int,float>(-20.0f, 1.0));
- points.insert (std::pair<int,float>(-17.0f, 1.0));
- points.insert (std::pair<int,float>(-14.0f, 1.0));
- points.insert (std::pair<int,float>(-10.0f, 1.0));
- points.insert (std::pair<int,float>( -5.0f, 1.0));
- points.insert (std::pair<int,float>( 0.0f, 1.0));
+ points.insert (std::pair<float,float>(-60.0f, 1.0));
+ points.insert (std::pair<float,float>(-50.0f, 1.0));
+ points.insert (std::pair<float,float>(-40.0f, 1.0));
+ points.insert (std::pair<float,float>(-30.0f, 1.0));
+ points.insert (std::pair<float,float>(-26.0f, 1.0));
+ points.insert (std::pair<float,float>(-23.0f, 1.0));
+ points.insert (std::pair<float,float>(-20.0f, 1.0));
+ points.insert (std::pair<float,float>(-17.0f, 1.0));
+ points.insert (std::pair<float,float>(-14.0f, 1.0));
+ points.insert (std::pair<float,float>(-10.0f, 1.0));
+ points.insert (std::pair<float,float>( -5.0f, 1.0));
+ points.insert (std::pair<float,float>( 0.0f, 1.0));
break;
case MeterIEC2EBU:
points.insert (std::pair<float,float>(-30.0f, 1.0));
break;
default:
- points.insert (std::pair<int,float>(-60, 0.5));
- points.insert (std::pair<int,float>(-50, 1.0));
- points.insert (std::pair<int,float>(-40, 1.0));
- points.insert (std::pair<int,float>(-30, 1.0));
+ points.insert (std::pair<float,float>(-60, 0.5));
+ points.insert (std::pair<float,float>(-50, 1.0));
+ points.insert (std::pair<float,float>(-40, 1.0));
+ points.insert (std::pair<float,float>(-30, 1.0));
if (Config->get_meter_line_up_level() == MeteringLineUp24) {
- points.insert (std::pair<int,float>(-24, 1.0));
+ points.insert (std::pair<float,float>(-24, 1.0));
} else {
- points.insert (std::pair<int,float>(-25, 1.0));
+ points.insert (std::pair<float,float>(-25, 1.0));
}
- points.insert (std::pair<int,float>(-20, 1.0));
-
- points.insert (std::pair<int,float>(-19, 0.5));
- points.insert (std::pair<int,float>(-18, 1.0));
- points.insert (std::pair<int,float>(-17, 0.5));
- points.insert (std::pair<int,float>(-16, 0.5));
- points.insert (std::pair<int,float>(-15, 1.0));
-
- points.insert (std::pair<int,float>(-14, 0.5));
- points.insert (std::pair<int,float>(-13, 0.5));
- points.insert (std::pair<int,float>(-12, 0.5));
- points.insert (std::pair<int,float>(-11, 0.5));
- points.insert (std::pair<int,float>(-10, 1.0));
-
- points.insert (std::pair<int,float>( -9, 1.0));
- points.insert (std::pair<int,float>( -8, 0.5));
- points.insert (std::pair<int,float>( -7, 0.5));
- points.insert (std::pair<int,float>( -6, 0.5));
- points.insert (std::pair<int,float>( -5, 1.0));
- points.insert (std::pair<int,float>( -4, 0.5));
- points.insert (std::pair<int,float>( -3, 1.0));
- points.insert (std::pair<int,float>( -2, 0.5));
- points.insert (std::pair<int,float>( -1, 0.5));
-
- points.insert (std::pair<int,float>( 0, 1.0));
- points.insert (std::pair<int,float>( 1, 0.5));
- points.insert (std::pair<int,float>( 2, 0.5));
- points.insert (std::pair<int,float>( 3, 1.0));
- points.insert (std::pair<int,float>( 4, 0.5));
- points.insert (std::pair<int,float>( 5, 0.5));
+ points.insert (std::pair<float,float>(-20, 1.0));
+
+ points.insert (std::pair<float,float>(-19, 0.5));
+ points.insert (std::pair<float,float>(-18, 1.0));
+ points.insert (std::pair<float,float>(-17, 0.5));
+ points.insert (std::pair<float,float>(-16, 0.5));
+ points.insert (std::pair<float,float>(-15, 1.0));
+
+ points.insert (std::pair<float,float>(-14, 0.5));
+ points.insert (std::pair<float,float>(-13, 0.5));
+ points.insert (std::pair<float,float>(-12, 0.5));
+ points.insert (std::pair<float,float>(-11, 0.5));
+ points.insert (std::pair<float,float>(-10, 1.0));
+
+ points.insert (std::pair<float,float>( -9, 1.0));
+ points.insert (std::pair<float,float>( -8, 0.5));
+ points.insert (std::pair<float,float>( -7, 0.5));
+ points.insert (std::pair<float,float>( -6, 0.5));
+ points.insert (std::pair<float,float>( -5, 1.0));
+ points.insert (std::pair<float,float>( -4, 0.5));
+ points.insert (std::pair<float,float>( -3, 1.0));
+ points.insert (std::pair<float,float>( -2, 0.5));
+ points.insert (std::pair<float,float>( -1, 0.5));
+
+ points.insert (std::pair<float,float>( 0, 1.0));
+ points.insert (std::pair<float,float>( 1, 0.5));
+ points.insert (std::pair<float,float>( 2, 0.5));
+ points.insert (std::pair<float,float>( 3, 1.0));
+ points.insert (std::pair<float,float>( 4, 0.5));
+ points.insert (std::pair<float,float>( 5, 0.5));
break;
}
break;
case DataType::MIDI:
- points.insert (std::pair<int,float>( 0, 1.0));
- points.insert (std::pair<int,float>( 16, 0.5));
- points.insert (std::pair<int,float>( 32, 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>( 80, 0.5));
- points.insert (std::pair<int,float>( 96, 0.5));
- points.insert (std::pair<int,float>(100, 1.0));
- points.insert (std::pair<int,float>(112, 0.5));
- points.insert (std::pair<int,float>(127, 1.0));
+ points.insert (std::pair<float,float>( 0, 1.0));
+ points.insert (std::pair<float,float>( 16, 0.5));
+ points.insert (std::pair<float,float>( 32, 0.5));
+ points.insert (std::pair<float,float>( 48, 0.5));
+ points.insert (std::pair<float,float>( 64, 1.0));
+ points.insert (std::pair<float,float>( 80, 0.5));
+ points.insert (std::pair<float,float>( 96, 0.5));
+ points.insert (std::pair<float,float>(100, 1.0));
+ points.insert (std::pair<float,float>(112, 0.5));
+ points.insert (std::pair<float,float>(127, 1.0));
break;
}
- for (std::map<int,float>::const_iterator j = points.begin(); j != points.end(); ++j) {
+ for (std::map<float,float>::const_iterator j = points.begin(); j != points.end(); ++j) {
cairo_set_line_width (cr, (j->second));
float fraction = 0;
bool tickleft, tickright;
bool background;
+ int overlay_midi = 1;
gint width, height;
win->get_size (width, height);
cairo_move_to (cr, 0, 0);
cairo_rectangle (cr, 0, 0, width, height);
- {
- Gdk::Color c = w.get_style()->get_bg (background ? Gtk::STATE_ACTIVE : Gtk::STATE_NORMAL);
+ if (background) {
+ /* meterbridge */
+ set_bg_color(w, cr, type);
+ } else {
+ /* mixer */
+ Gdk::Color c = w.get_style()->get_bg (Gtk::STATE_NORMAL);
cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
}
cairo_fill (cr);
height = min(max_pattern_metric_size, height);
uint32_t peakcolor = ARDOUR_UI::config()->color_by_name ("meterbridge peaklabel");
+ Gdk::Color c; // default text color
for (vector<DataType>::const_iterator i = types.begin(); i != types.end(); ++i) {
- Gdk::Color c;
- if (types.size() > 1) {
+ if (types.size() > 1 && (*i) == DataType::MIDI && overlay_midi == 0) {
+ continue;
+ }
+
+ if (types.size() > 1 && (*i) == DataType::MIDI) {
/* we're overlaying more than 1 set of marks, so use different colours */
- switch (*i) {
- case DataType::AUDIO:
- c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- break;
- case DataType::MIDI:
- c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- break;
- }
+ c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
+ } else if (background) {
+ set_fg_color(w, type, &c);
} else {
c = w.get_style()->get_fg (Gtk::STATE_NORMAL);
- cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
}
-
- std::map<float,string> points;
+ std::map<float,string> points; // map: label-pos in dBFS, label-text
switch (*i) {
case DataType::AUDIO:
layout->set_attributes (audio_font_attributes);
switch (type) {
case MeterK14:
- points.insert (std::pair<int,string>(-54.0f, "-40"));
- points.insert (std::pair<int,string>(-44.0f, "-30"));
- points.insert (std::pair<int,string>(-34.0f, "-20"));
- points.insert (std::pair<int,string>(-24.0f, "-10"));
- points.insert (std::pair<int,string>(-20.0f, "-6"));
- points.insert (std::pair<int,string>(-17.0f, "-3"));
- points.insert (std::pair<int,string>(-14.0f, "0"));
- points.insert (std::pair<int,string>(-11.0f, "+3"));
- points.insert (std::pair<int,string>( -8.0f, "+6"));
- points.insert (std::pair<int,string>( -4.0f, "+10"));
- points.insert (std::pair<int,string>( 0.0f, "+14"));
+ overlay_midi = 0;
+ points.insert (std::pair<float,string>(-54.0f, "-40"));
+ points.insert (std::pair<float,string>(-44.0f, "-30"));
+ points.insert (std::pair<float,string>(-34.0f, "-20"));
+ points.insert (std::pair<float,string>(-24.0f, "-10"));
+ points.insert (std::pair<float,string>(-20.0f, "-6"));
+ points.insert (std::pair<float,string>(-17.0f, "-3"));
+ points.insert (std::pair<float,string>(-14.0f, " 0"));
+ points.insert (std::pair<float,string>(-11.0f, "+3"));
+ points.insert (std::pair<float,string>( -8.0f, "+6"));
+ points.insert (std::pair<float,string>( -4.0f, "+10"));
+ points.insert (std::pair<float,string>( 0.0f, "+14"));
break;
case MeterK20:
- points.insert (std::pair<int,string>(-60.0f, "-40"));
- points.insert (std::pair<int,string>(-50.0f, "-30"));
- points.insert (std::pair<int,string>(-40.0f, "-20"));
- points.insert (std::pair<int,string>(-30.0f, "-10"));
- points.insert (std::pair<int,string>(-26.0f, "-6"));
- points.insert (std::pair<int,string>(-23.0f, "-3"));
- points.insert (std::pair<int,string>(-20.0f, "0"));
- points.insert (std::pair<int,string>(-17.0f, "+3"));
- points.insert (std::pair<int,string>(-14.0f, "+6"));
- points.insert (std::pair<int,string>(-10.0f, "+10"));
- points.insert (std::pair<int,string>( -5.0f, "+15"));
- points.insert (std::pair<int,string>( 0.0f, "+20"));
+ overlay_midi = 0;
+ points.insert (std::pair<float,string>(-60.0f, "-40"));
+ points.insert (std::pair<float,string>(-50.0f, "-30"));
+ points.insert (std::pair<float,string>(-40.0f, "-20"));
+ points.insert (std::pair<float,string>(-30.0f, "-10"));
+ points.insert (std::pair<float,string>(-26.0f, "-6"));
+ points.insert (std::pair<float,string>(-23.0f, "-3"));
+ points.insert (std::pair<float,string>(-20.0f, " 0"));
+ points.insert (std::pair<float,string>(-17.0f, "+3"));
+ points.insert (std::pair<float,string>(-14.0f, "+6"));
+ points.insert (std::pair<float,string>(-10.0f, "+10"));
+ points.insert (std::pair<float,string>( -5.0f, "+15"));
+ points.insert (std::pair<float,string>( 0.0f, "+20"));
break;
default:
case MeterPeak:
case MeterKrms:
- points.insert (std::pair<int,string>(-50.0f, "-50"));
- points.insert (std::pair<int,string>(-40.0f, "-40"));
- points.insert (std::pair<int,string>(-30.0f, "-30"));
- points.insert (std::pair<int,string>(-20.0f, "-20"));
+ points.insert (std::pair<float,string>(-50.0f, "-50"));
+ points.insert (std::pair<float,string>(-40.0f, "-40"));
+ points.insert (std::pair<float,string>(-30.0f, "-30"));
+ points.insert (std::pair<float,string>(-20.0f, "-20"));
if (types.size() == 1) {
if (Config->get_meter_line_up_level() == MeteringLineUp24) {
- points.insert (std::pair<int,string>(-24.0f, "-24"));
+ points.insert (std::pair<float,string>(-24.0f, "-24"));
} else {
- points.insert (std::pair<int,string>(-25.0f, "-25"));
+ points.insert (std::pair<float,string>(-25.0f, "-25"));
}
- points.insert (std::pair<int,string>(-15.0f, "-15"));
+ points.insert (std::pair<float,string>(-15.0f, "-15"));
}
- points.insert (std::pair<int,string>(-18.0f, "-18"));
- points.insert (std::pair<int,string>(-10.0f, "-10"));
- points.insert (std::pair<int,string>( -5.0f, "-5"));
- points.insert (std::pair<int,string>( -3.0f, "-3"));
- points.insert (std::pair<int,string>( 0.0f, "+0"));
- points.insert (std::pair<int,string>( 3.0f, "+3"));
+ points.insert (std::pair<float,string>(-18.0f, "-18"));
+ points.insert (std::pair<float,string>(-10.0f, "-10"));
+ points.insert (std::pair<float,string>( -5.0f, "-5"));
+ points.insert (std::pair<float,string>( -3.0f, "-3"));
+ points.insert (std::pair<float,string>( 0.0f, "+0"));
+ points.insert (std::pair<float,string>( 3.0f, "+3"));
break;
case MeterIEC2EBU:
+ overlay_midi = 3;
points.insert (std::pair<float,string>(-30.0f, "-12"));
points.insert (std::pair<float,string>(-26.0f, "-8"));
points.insert (std::pair<float,string>(-22.0f, "-4"));
break;
case MeterIEC2BBC:
- points.insert (std::pair<float,string>(-30.0f, "1"));
- points.insert (std::pair<float,string>(-26.0f, "2"));
- points.insert (std::pair<float,string>(-22.0f, "3"));
- points.insert (std::pair<float,string>(-18.0f, "4"));
- points.insert (std::pair<float,string>(-14.0f, "5"));
- points.insert (std::pair<float,string>(-10.0f, "6"));
- points.insert (std::pair<float,string>( -6.0f, "7"));
+ overlay_midi = 3;
+ points.insert (std::pair<float,string>(-30.0f, " 1 "));
+ points.insert (std::pair<float,string>(-26.0f, " 2 "));
+ points.insert (std::pair<float,string>(-22.0f, " 3 "));
+ points.insert (std::pair<float,string>(-18.0f, " 4 "));
+ points.insert (std::pair<float,string>(-14.0f, " 5 "));
+ points.insert (std::pair<float,string>(-10.0f, " 6 "));
+ points.insert (std::pair<float,string>( -6.0f, " 7 "));
break;
case MeterIEC1NOR:
+ overlay_midi = 0;
//points.insert (std::pair<float,string>(-60.0f, "-42"));
points.insert (std::pair<float,string>(-54.0f, "-36"));
points.insert (std::pair<float,string>(-48.0f, "-30"));
break;
case MeterIEC1DIN:
+ overlay_midi = 2;
//points.insert (std::pair<float,string>( -3.0f, "200%"));
points.insert (std::pair<float,string>( -4.0f, "+5")); // "100%"
points.insert (std::pair<float,string>( -9.0f, "0"));
break;
case MeterVU:
+ overlay_midi = 0;
points.insert (std::pair<float,string>(-17.0f, "+3"));
points.insert (std::pair<float,string>(-18.0f, "+2"));
points.insert (std::pair<float,string>(-19.0f, "+1"));
- points.insert (std::pair<float,string>(-20.0f, "0"));
+ points.insert (std::pair<float,string>(-20.0f, " 0"));
points.insert (std::pair<float,string>(-21.0f, "-1"));
points.insert (std::pair<float,string>(-22.0f, "-2"));
points.insert (std::pair<float,string>(-23.0f, "-3"));
break;
case DataType::MIDI:
layout->set_attributes (midi_font_attributes);
- points.insert (std::pair<int,string>( 0, "0"));
if (types.size() == 1) {
- points.insert (std::pair<int,string>( 16, "16"));
- points.insert (std::pair<int,string>( 32, "32"));
- points.insert (std::pair<int,string>( 48, "48"));
- points.insert (std::pair<int,string>( 64, "64"));
- points.insert (std::pair<int,string>( 80, "80"));
- points.insert (std::pair<int,string>( 96, "96"));
- points.insert (std::pair<int,string>(100, "100"));
- points.insert (std::pair<int,string>(112, "112"));
+ points.insert (std::pair<float,string>( 0, "0"));
+ points.insert (std::pair<float,string>( 16, "16"));
+ points.insert (std::pair<float,string>( 32, "32"));
+ points.insert (std::pair<float,string>( 48, "48"));
+ points.insert (std::pair<float,string>( 64, "64"));
+ points.insert (std::pair<float,string>( 80, "80"));
+ points.insert (std::pair<float,string>( 96, "96"));
+ points.insert (std::pair<float,string>(100, "100"));
+ points.insert (std::pair<float,string>(112, "112"));
} else {
- /* labels that don't overlay with dB */
- points.insert (std::pair<int,string>( 24, "24"));
- points.insert (std::pair<int,string>( 48, "48"));
- points.insert (std::pair<int,string>( 72, "74"));
+ switch (overlay_midi) {
+ case 1:
+ /* labels that don't overlay with dBFS */
+ points.insert (std::pair<float,string>( 0, "0"));
+ points.insert (std::pair<float,string>( 24, "24"));
+ points.insert (std::pair<float,string>( 48, "48"));
+ points.insert (std::pair<float,string>( 72, "72"));
+ points.insert (std::pair<float,string>(127, "127"));
+ break;
+ case 2:
+ /* labels that don't overlay with DIN */
+ points.insert (std::pair<float,string>( 0, "0"));
+ points.insert (std::pair<float,string>( 16, "16"));
+ points.insert (std::pair<float,string>( 40, "40"));
+ points.insert (std::pair<float,string>( 64, "64"));
+ points.insert (std::pair<float,string>(112, "112"));
+ points.insert (std::pair<float,string>(127, "127"));
+ break;
+ case 3:
+ /* labels that don't overlay with BBC nor EBU*/
+ points.insert (std::pair<float,string>( 0, "0"));
+ points.insert (std::pair<float,string>( 16, "16"));
+ points.insert (std::pair<float,string>( 56, "56"));
+ points.insert (std::pair<float,string>( 72, "72"));
+ points.insert (std::pair<float,string>(112, "112"));
+ points.insert (std::pair<float,string>(127, "127"));
+ default:
+ break;
+ }
}
- points.insert (std::pair<int,string>(127, "127"));
break;
}
for (std::map<float,string>::const_iterator j = points.begin(); j != points.end(); ++j) {
float fraction = 0;
+ bool align_center = background; // this is true for meterbridge meters w/ fixed background
switch (*i) {
case DataType::AUDIO:
fraction = mtr_col_and_fract(cr, &c, peakcolor, type, j->first);
break;
case DataType::MIDI:
+ align_center = false; // don't bleed into legend
fraction = (j->first) / 127.0;
pos = 1 + height - (gint) rintf (height * fraction);
pos = min (pos, height);
+ cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
if (tickleft) {
cairo_arc(cr, width - 2.0, pos + .5, 1.0, 0, 2 * M_PI);
cairo_fill(cr);
p = min (p, height - th);
p = max (p, 0);
- cairo_move_to (cr, width-3-tw, p);
+ if (align_center) {
+ cairo_move_to (cr, (width-tw)/2.0, p);
+ } else {
+ cairo_move_to (cr, width-3-tw, p);
+ }
+
+ cairo_set_line_width(cr, 0.12);
+ cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
+ pango_cairo_layout_path(cr, layout->gobj());
+ cairo_stroke_preserve (cr);
+ cairo_set_line_width(cr, 1.0);
+
+ if ((*i) == DataType::AUDIO) {
+ mtr_col_and_fract(cr, &c, peakcolor, type, j->first);
+ } else {
+ cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
+ }
+
pango_cairo_show_layout (cr, layout->gobj());
+ cairo_new_path(cr);
}
}
// add legend
- if (types.size() == 1) {
+ if (types.size() == 1 || overlay_midi == 0) {
int tw, th;
layout->set_attributes (unit_font_attributes);
switch (types.at(0)) {
layout->get_pixel_size(tw, th);
break;
case DataType::MIDI:
- layout->set_text("vel");
+ layout->set_text("mid");
layout->get_pixel_size(tw, th);
break;
}
- Gdk::Color c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
+ if (!background) {
+ c = w.get_style()->get_fg (Gtk::STATE_ACTIVE);
+ }
cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p());
- cairo_move_to (cr, 2, height - th - 0.5);
+ if (tickleft) {
+ cairo_move_to (cr, width - 2 - tw, height - th - 0.5);
+ } else {
+ cairo_move_to (cr, 2, height - th - 0.5);
+ }
pango_cairo_show_layout (cr, layout->gobj());
}
cairo_clip (cr);
cairo_pattern_t* pattern;
- const MeterMatricsMapKey key (mta->get_name(), type);
+ const MeterMatricsMapKey key (mta->get_name(), type, types_to_bit(types));
MetricPatternMap::iterator i = ticks_patterns.find (key);
if (i == ticks_patterns.end()) {
cairo_clip (cr);
cairo_pattern_t* pattern;
- const MeterMatricsMapKey key (mma->get_name(), type);
+ const MeterMatricsMapKey key (mma->get_name(), type, types_to_bit(types));
MetricPatternMap::iterator i = metric_patterns.find (key);
if (i == metric_patterns.end()) {
projects / ardour.git / blobdiff