#include "ardour/vca_manager.h"
#include "canvas/colors.h"
-#include "canvas/rectangle.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"
#include "pbd/i18n.h"
+#ifdef __APPLE__
+#define Rect ArdourCanvas::Rect
+#endif
+
using namespace ARDOUR;
using namespace std;
using namespace PBD;
using namespace ArdourSurface;
using namespace ArdourCanvas;
-MixLayout::MixLayout (Push2& p, Session& s)
- : Push2Layout (p, s)
+MixLayout::MixLayout (Push2& p, Session & s, std::string const & name)
+ : Push2Layout (p, s, name)
, bank_start (0)
, vpot_mode (Volume)
{
/* background */
- bg = new Rectangle (this);
+ bg = new ArdourCanvas::Rectangle (this);
bg->set (Rect (0, 0, display_width(), display_height()));
bg->set_fill_color (p2.get_color (Push2::DarkBackground));
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 */
- Rectangle* r = new Rectangle (this);
+ ArdourCanvas::Rectangle* r = new ArdourCanvas::Rectangle (this);
Coord x0 = 10 + (n*Push2Canvas::inter_button_spacing()) - 5;
r->set (Rect (x0, 2, x0 + Push2Canvas::inter_button_spacing(), 2 + 21));
upper_backgrounds.push_back (r);
- r = new Rectangle (this);
+ r = new ArdourCanvas::Rectangle (this);
r->set (Rect (x0, 137, x0 + Push2Canvas::inter_button_spacing(), 137 + 21));
lower_backgrounds.push_back (r);
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 */
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<PeakMeter> 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<AutomationControl>());
+ gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
+ 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 ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
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<AutomationControl>());
+
gain_meter[s]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
}
- knobs[s]->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->knob->remove_flag (Push2Knob::ArcToZero);
+ gain_meter[s]->meter->hide ();
}
n = 7;
break;
if (s) {
boost::shared_ptr<AutomationControl> ac = s->solo_control();
if (ac) {
- ac->set_value (!ac->get_value(), PBD::Controllable::UseGroup);
+ session.set_control (ac, !ac->get_value(), PBD::Controllable::UseGroup);
}
}
}
void
MixLayout::strip_vpot (int n, int delta)
{
- boost::shared_ptr<Controllable> ac = knobs[n]->controllable();
+ boost::shared_ptr<Controllable> ac = gain_meter[n]->knob->controllable();
if (ac) {
- if (ac->is_gain_like()) {
- /* 128 steps from fader position 0 to 1.0 ..
- */
- const double new_fader_position = min (1.0, max (0.0, ac->internal_to_interface (ac->get_value()) + ((1.0 / 128.0) * delta)));
- ac->set_value (ac->interface_to_internal (new_fader_position), PBD::Controllable::UseGroup);
- } else {
- /* 128 steps from min to max */
- ac->set_value (ac->get_value() + (((ac->upper() - ac->lower()) / 128.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);
}
}
if (!s[0]) {
/* not even the first stripable exists, do nothing */
+ for (int n = 0; n < 8; ++n) {
+ stripable[n].reset ();
+ gain_meter[n]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
+ gain_meter[n]->meter->set_meter (0);
+ }
return;
}
if (!stripable[n]) {
lower_text[n]->hide ();
hide_selection (n);
+ gain_meter[n]->knob->set_controllable (boost::shared_ptr<AutomationControl>());
+ gain_meter[n]->meter->set_meter (0);
} else {
lower_text[n]->show ();
solo_mute_changed (n);
- 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());
+ 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());
}
{
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));
+}
projects / ardour.git / blobdiff