X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fpush2%2Fmix.cc;h=847586f0e5d34d6e4e281ecc53505e8e65ca835c;hb=5e6249b7b1bd2575f2dafc0fa66a0496239c65e9;hp=169eec3140eca1a66a1cf22d31524759a1d50fb9;hpb=6f2ac5d6addd1562667c51bdda64ba471cc23d31;p=ardour.git diff --git a/libs/surfaces/push2/mix.cc b/libs/surfaces/push2/mix.cc index 169eec3140..847586f0e5 100644 --- a/libs/surfaces/push2/mix.cc +++ b/libs/surfaces/push2/mix.cc @@ -40,16 +40,20 @@ #include "ardour/midi_port.h" #include "ardour/session.h" #include "ardour/tempo.h" +#include "ardour/utils.h" #include "ardour/vca_manager.h" #include "canvas/colors.h" +#include "canvas/line.h" #include "canvas/rectangle.h" +#include "canvas/text.h" #include "gtkmm2ext/gui_thread.h" #include "canvas.h" -#include "mix.h" #include "knob.h" +#include "level_meter.h" +#include "mix.h" #include "push2.h" #include "utils.h" @@ -67,10 +71,20 @@ MixLayout::MixLayout (Push2& p, Session& s) , bank_start (0) , vpot_mode (Volume) { - selection_bg = new Rectangle (this); - selection_bg->hide (); + /* background */ + + bg = new Rectangle (this); + bg->set (Rect (0, 0, display_width(), display_height())); + bg->set_fill_color (p2.get_color (Push2::DarkBackground)); + + /* upper line */ + + upper_line = new Line (this); + upper_line->set (Duple (0, 22.5), Duple (display_width(), 22.5)); + upper_line->set_outline_color (p2.get_color (Push2::LightBackground)); Pango::FontDescription fd2 ("Sans 10"); + for (int n = 0; n < 8; ++n) { /* background for text labels for knob function */ @@ -78,7 +92,11 @@ MixLayout::MixLayout (Push2& p, Session& s) Rectangle* r = new Rectangle (this); Coord x0 = 10 + (n*Push2Canvas::inter_button_spacing()) - 5; r->set (Rect (x0, 2, x0 + Push2Canvas::inter_button_spacing(), 2 + 21)); - backgrounds.push_back (r); + upper_backgrounds.push_back (r); + + r = new Rectangle (this); + r->set (Rect (x0, 137, x0 + Push2Canvas::inter_button_spacing(), 137 + 21)); + lower_backgrounds.push_back (r); /* text labels for knob function*/ @@ -117,11 +135,10 @@ MixLayout::MixLayout (Push2& p, Session& s) t->set (txt); upper_text.push_back (t); - /* knobs */ + /* GainMeters */ - knobs[n] = new Push2Knob (p2, this); - knobs[n]->set_position (Duple (60 + (n*Push2Canvas::inter_button_spacing()), 95)); - knobs[n]->set_radius (25); + gain_meter[n] = new GainMeter (this, p2); + gain_meter[n]->set_position (Duple (40 + (n * Push2Canvas::inter_button_spacing()), 95)); /* stripable names */ @@ -147,36 +164,31 @@ MixLayout::~MixLayout () void MixLayout::show () { - Container::show (); + Push2::ButtonID upper_buttons[] = { Push2::Upper1, Push2::Upper2, Push2::Upper3, Push2::Upper4, + Push2::Upper5, Push2::Upper6, Push2::Upper7, Push2::Upper8 }; - mode_button->set_color (Push2::LED::White); - mode_button->set_state (Push2::LED::OneShot24th); - p2.write (mode_button->state_msg()); + + for (size_t n = 0; n < sizeof (upper_buttons) / sizeof (upper_buttons[0]); ++n) { + Push2::Button* b = p2.button_by_id (upper_buttons[n]); + + if (b != mode_button) { + b->set_color (Push2::LED::DarkGray); + } else { + b->set_color (Push2::LED::White); + } + b->set_state (Push2::LED::OneShot24th); + p2.write (b->state_msg()); + } switch_bank (bank_start); + + Container::show (); } void MixLayout::render (Rect const& area, Cairo::RefPtr context) const { - DEBUG_TRACE (DEBUG::Push2, string_compose ("mix render %1\n", area)); - - /* draw background */ - - set_source_rgb (context, p2.get_color (Push2::DarkBackground)); - context->rectangle (0, 0, display_width(), display_height()); - context->fill (); - - /* draw line across top (below labels) */ - - context->move_to (0, 22.5); - context->line_to (display_width(), 22.5); - context->set_line_width (1.0); - context->stroke (); - - /* show the kids ... */ - - render_children (area, context); + Container::render (area, context); } void @@ -237,126 +249,132 @@ MixLayout::show_vpot_mode () p2.write (mode_button->state_msg()); for (int s = 0; s < 8; ++s) { - backgrounds[s]->hide (); + upper_backgrounds[s]->hide (); upper_text[s]->set_color (p2.get_color (Push2::ParameterName)); } + uint32_t n = 0; + boost::shared_ptr ac; switch (vpot_mode) { case Volume: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->gain_control()); + gain_meter[s]->knob->set_controllable (stripable[s]->gain_control()); + boost::shared_ptr pm = stripable[s]->peak_meter(); + if (pm) { + gain_meter[s]->meter->set_meter (pm.get()); + } else { + gain_meter[s]->meter->set_meter (0); + } } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); + gain_meter[s]->meter->set_meter (0); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->show (); } - backgrounds[0]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[0]->show (); - upper_text[0]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 0; break; case PanAzimuth: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->pan_azimuth_control()); - knobs[s]->add_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->set_controllable (stripable[s]->pan_azimuth_control()); + gain_meter[s]->knob->add_flag (Push2Knob::ArcToZero); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } + gain_meter[s]->meter->hide (); } - backgrounds[1]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[1]->show (); - upper_text[1]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 1; break; case PanWidth: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->pan_width_control()); + gain_meter[s]->knob->set_controllable (stripable[s]->pan_width_control()); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[2]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[2]->show (); - upper_text[2]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 2; break; case Send1: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->send_level_controllable (0)); + gain_meter[s]->knob->set_controllable (stripable[s]->send_level_controllable (0)); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[3]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[3]->show (); - upper_text[3]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 3; break; case Send2: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->send_level_controllable (1)); + gain_meter[s]->knob->set_controllable (stripable[s]->send_level_controllable (1)); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[4]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[4]->show (); - upper_text[4]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 4; break; case Send3: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->send_level_controllable (2)); + gain_meter[s]->knob->set_controllable (stripable[s]->send_level_controllable (2)); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[5]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[5]->show (); - upper_text[5]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 5; break; case Send4: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->send_level_controllable (3)); + gain_meter[s]->knob->set_controllable (stripable[s]->send_level_controllable (3)); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[6]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[6]->show (); - upper_text[6]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 6; break; case Send5: for (int s = 0; s < 8; ++s) { if (stripable[s]) { - knobs[s]->set_controllable (stripable[s]->send_level_controllable (4)); + gain_meter[s]->knob->set_controllable (stripable[s]->send_level_controllable (4)); } else { - knobs[s]->set_controllable (boost::shared_ptr()); + gain_meter[s]->knob->set_controllable (boost::shared_ptr()); } - knobs[s]->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero); + gain_meter[s]->meter->hide (); } - backgrounds[7]->set_fill_color (p2.get_color (Push2::ParameterName)); - backgrounds[7]->show (); - upper_text[7]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); + n = 7; break; default: break; } + + upper_backgrounds[n]->set_fill_color (p2.get_color (Push2::ParameterName)); + upper_backgrounds[n]->set_outline_color (p2.get_color (Push2::ParameterName)); + upper_backgrounds[n]->show (); + upper_text[n]->set_color (contrasting_text_color (p2.get_color (Push2::ParameterName))); } void @@ -396,10 +414,12 @@ MixLayout::button_lower (uint32_t n) void MixLayout::strip_vpot (int n, int delta) { - boost::shared_ptr ac = knobs[n]->controllable(); + boost::shared_ptr ac = gain_meter[n]->knob->controllable(); if (ac) { - ac->set_value (ac->get_value() + ((2.0/64.0) * delta), PBD::Controllable::UseGroup); + ac->set_value (ac->interface_to_internal ( + min (ac->upper(), max (ac->lower(), ac->internal_to_interface (ac->get_value()) + (delta/256.0)))), + PBD::Controllable::UseGroup); } } @@ -421,6 +441,18 @@ MixLayout::strip_vpot_touch (int n, bool touching) void MixLayout::stripable_property_change (PropertyChange const& what_changed, uint32_t which) { + if (what_changed.contains (Properties::color)) { + lower_backgrounds[which]->set_fill_color (stripable[which]->presentation_info().color()); + + if (stripable[which]->presentation_info().selected()) { + lower_text[which]->set_fill_color (contrasting_text_color (stripable[which]->presentation_info().color())); + /* might not be a MIDI track, in which case this will + do nothing + */ + p2.update_selection_color (); + } + } + if (what_changed.contains (Properties::hidden)) { switch_bank (bank_start); } @@ -443,17 +475,15 @@ MixLayout::stripable_property_change (PropertyChange const& what_changed, uint32 void MixLayout::show_selection (uint32_t n) { - selection_bg->show (); - selection_bg->set_fill_color (stripable[n]->presentation_info().color()); - const Coord x0 = 10 + (n * Push2Canvas::inter_button_spacing()) - 5; - selection_bg->set (Rect (x0, 137, x0 + Push2Canvas::inter_button_spacing(), 137 + 21)); - lower_text[n]->set_color (ArdourCanvas::contrasting_text_color (selection_bg->fill_color())); + lower_backgrounds[n]->show (); + lower_backgrounds[n]->set_fill_color (stripable[n]->presentation_info().color()); + lower_text[n]->set_color (ArdourCanvas::contrasting_text_color (lower_backgrounds[n]->fill_color())); } void MixLayout::hide_selection (uint32_t n) { - selection_bg->hide (); + lower_backgrounds[n]->hide (); if (stripable[n]) { lower_text[n]->set_color (stripable[n]->presentation_info().color()); } @@ -511,13 +541,6 @@ MixLayout::switch_bank (uint32_t base) } } - if (!different) { - /* some missing strips; new bank the same or more empty stripables than the old one, do - nothing since we had already reached the end. - */ - return; - } - if (!s[0]) { /* not even the first stripable exists, do nothing */ return; @@ -532,32 +555,38 @@ MixLayout::switch_bank (uint32_t base) bank_start = base; for (int n = 0; n < 8; ++n) { + if (!stripable[n]) { lower_text[n]->hide (); hide_selection (n); - continue; - } + } else { - lower_text[n]->show (); + lower_text[n]->show (); - /* stripable goes away? refill the bank, starting at the same point */ + /* stripable goes away? refill the bank, starting at the same point */ - stripable[n]->DropReferences.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::switch_bank, this, bank_start), &p2); - stripable[n]->presentation_info().PropertyChanged.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::stripable_property_change, this, _1, n), &p2); - stripable[n]->solo_control()->Changed.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::solo_changed, this, n), &p2); - stripable[n]->mute_control()->Changed.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::mute_changed, this, n), &p2); + stripable[n]->DropReferences.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::switch_bank, this, bank_start), &p2); + stripable[n]->presentation_info().PropertyChanged.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::stripable_property_change, this, _1, n), &p2); + stripable[n]->solo_control()->Changed.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::solo_changed, this, n), &p2); + stripable[n]->mute_control()->Changed.connect (stripable_connections, invalidator (*this), boost::bind (&MixLayout::mute_changed, this, n), &p2); - if (stripable[n]->presentation_info().selected()) { - show_selection (n); - } else { - hide_selection (n); - } + if (stripable[n]->presentation_info().selected()) { + show_selection (n); + } else { + hide_selection (n); + } - /* this will set lower text to the correct value (basically - the stripable name) - */ + /* this will set lower text to the correct value (basically + the stripable name) + */ + + solo_mute_changed (n); + + gain_meter[n]->knob->set_text_color (stripable[n]->presentation_info().color()); + gain_meter[n]->knob->set_arc_start_color (stripable[n]->presentation_info().color()); + gain_meter[n]->knob->set_arc_end_color (stripable[n]->presentation_info().color()); + } - solo_mute_changed (n); Push2::Button* b; @@ -588,13 +617,14 @@ MixLayout::switch_bank (uint32_t base) break; } - b->set_color (p2.get_color_index (stripable[n]->presentation_info().color())); + if (stripable[n]) { + b->set_color (p2.get_color_index (stripable[n]->presentation_info().color())); + } else { + b->set_color (Push2::LED::Black); + } + b->set_state (Push2::LED::OneShot24th); p2.write (b->state_msg()); - - knobs[n]->set_text_color (stripable[n]->presentation_info().color()); - knobs[n]->set_arc_start_color (stripable[n]->presentation_info().color()); - knobs[n]->set_arc_end_color (stripable[n]->presentation_info().color()); } show_vpot_mode (); @@ -648,7 +678,6 @@ MixLayout::button_select_release () } else { if (p2.modifier_state() & Push2::ModShift) { - std::cerr << "select prev\n"; /* select prev */ if (selected == 0) { @@ -675,7 +704,6 @@ MixLayout::button_select_release () } else { - std::cerr << "select next\n"; /* select next */ if (selected == 7) { @@ -720,3 +748,26 @@ MixLayout::button_up () { p2.scroll_up_1_track (); } + +void +MixLayout::update_meters () +{ + if (vpot_mode != Volume) { + return; + } + + for (uint32_t n = 0; n < 8; ++n) { + gain_meter[n]->meter->update_meters (); + } +} + +MixLayout::GainMeter::GainMeter (Item* parent, Push2& p2) + : Container (parent) +{ + knob = new Push2Knob (p2, this); + knob->set_radius (25); + /* leave position at (0,0) */ + + meter = new LevelMeter (p2, this, 90, ArdourCanvas::Meter::Vertical); + meter->set_position (Duple (40, -60)); +}