X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstereo_panner.cc;h=e5b91d39781ca738cb337e81e3c0285134b868ec;hb=5216bf37711d5687949c279b6a6a80f52d260294;hp=4e5c6de95945ab135929d56cd80d95c9222754f6;hpb=97c68cc2b1f302521244e139a8a49019702038e7;p=ardour.git diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 4e5c6de959..e5b91d3978 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -22,8 +22,8 @@ #include #include +#include -#include "pbd/controllable.h" #include "pbd/compose.h" #include "gtkmm2ext/gui_thread.h" @@ -34,32 +34,36 @@ #include "ardour/pannable.h" #include "ardour/panner.h" +#include "ardour/panner_shell.h" + +#include "gtkmm2ext/colors.h" -#include "ardour_ui.h" -#include "global_signals.h" #include "stereo_panner.h" #include "stereo_panner_editor.h" #include "rgb_macros.h" #include "utils.h" +#include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ARDOUR_UI_UTILS; -static const int pos_box_size = 8; -static const int lr_box_size = 15; -static const int step_down = 10; -static const int top_step = 2; +using PBD::Controllable; StereoPanner::ColorScheme StereoPanner::colors[3]; bool StereoPanner::have_colors = false; +Pango::AttrList StereoPanner::panner_font_attributes; +bool StereoPanner::have_font = false; + using namespace ARDOUR; -StereoPanner::StereoPanner (boost::shared_ptr panner) - : PannerInterface (panner) +StereoPanner::StereoPanner (boost::shared_ptr p) + : PannerInterface (p->panner()) + , _panner_shell (p) , position_control (_panner->pannable()->pan_azimuth_control) , width_control (_panner->pannable()->pan_width_control) , dragging_position (false) @@ -77,11 +81,23 @@ StereoPanner::StereoPanner (boost::shared_ptr panner) set_colors (); have_colors = true; } + if (!have_font) { + Pango::FontDescription font; + Pango::AttrFontDesc* font_attr; + font = Pango::FontDescription (UIConfiguration::instance().get_SmallBoldMonospaceFont()); + font_attr = new Pango::AttrFontDesc (Pango::Attribute::create_attr_font_desc (font)); + panner_font_attributes.change(*font_attr); + delete font_attr; + have_font = true; + } - position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); - width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); + position_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); + width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); - ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); + _panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::bypass_handler, this), gui_context()); + _panner_shell->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&StereoPanner::pannable_handler, this), gui_context()); + + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); set_tooltip (); } @@ -94,6 +110,10 @@ StereoPanner::~StereoPanner () void StereoPanner::set_tooltip () { + if (_panner_shell->bypassed()) { + _tooltip.set_tip (_("bypassed")); + return; + } double pos = position_control->get_value(); // 0..1 /* We show the position of the center of the image relative to the left & right. @@ -117,18 +137,26 @@ StereoPanner::on_expose_event (GdkEventExpose*) Glib::RefPtr win (get_window()); Glib::RefPtr gc (get_style()->get_base_gc (get_state())); Cairo::RefPtr context = get_window()->create_cairo_context(); + Glib::RefPtr layout = Pango::Layout::create(get_pango_context()); + layout->set_attributes (panner_font_attributes); + int tw, th; int width, height; - double pos = position_control->get_value (); /* 0..1 */ - double swidth = width_control->get_value (); /* -1..+1 */ - double fswidth = fabs (swidth); + const double pos = position_control->get_value (); /* 0..1 */ + const double swidth = width_control->get_value (); /* -1..+1 */ + const double fswidth = fabs (swidth); uint32_t o, f, t, b, r; State state; - const double corner_radius = 5.0; width = get_width(); height = get_height (); + const int step_down = rint(height / 3.5); + const double corner_radius = 5.0 * UIConfiguration::instance().get_ui_scale(); + const int lr_box_size = height - 2 * step_down; + const int pos_box_size = (int)(rint(step_down * .8)) | 1; + const int top_step = step_down - pos_box_size; + if (swidth == 0.0) { state = Mono; } else if (swidth < 0.0) { @@ -143,11 +171,26 @@ StereoPanner::on_expose_event (GdkEventExpose*) b = colors[state].background; r = colors[state].rule; + if (_panner_shell->bypassed()) { + b = 0x20202040; + f = 0x404040ff; + o = 0x606060ff; + t = 0x606060ff; + r = 0x606060ff; + } + + if (_send_mode) { + b = UIConfiguration::instance().color ("send bg"); + // b = rgba_from_style("SendStripBase", + // UINT_RGBA_R(b), UINT_RGBA_G(b), UINT_RGBA_B(b), 255, + // "fg"); + } /* background */ context->set_source_rgba (UINT_RGBA_R_FLT(b), UINT_RGBA_G_FLT(b), UINT_RGBA_B_FLT(b), UINT_RGBA_A_FLT(b)); cairo_rectangle (context->cobj(), 0, 0, width, height); - context->fill (); + context->fill_preserve (); + context->clip(); /* the usable width is reduced from the real width, because we need space for the two halves of LR boxes that will extend past the actual left/right @@ -166,17 +209,13 @@ StereoPanner::on_expose_event (GdkEventExpose*) context->translate (1.0, 0.0); } - double center = (lr_box_size/2.0) + (usable_width * pos); - const double pan_spread = (fswidth * usable_width)/2.0; const double half_lr_box = lr_box_size/2.0; - int left; - int right; - - left = center - pan_spread; // center of left box - right = center + pan_spread; // center of right box + const double center = rint(half_lr_box + (usable_width * pos)); + const double pan_spread = rint((fswidth * (usable_width-1.0))/2.0); + const double left = center - pan_spread; + const double right = center + pan_spread; /* center line */ - context->set_line_width (1.0); context->move_to ((usable_width + lr_box_size)/2.0, 0); context->rel_line_to (0, height); @@ -184,67 +223,64 @@ StereoPanner::on_expose_event (GdkEventExpose*) context->stroke (); /* compute & draw the line through the box */ - context->set_line_width (2); context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - context->move_to (left, top_step+(pos_box_size/2.0)+step_down); - context->line_to (left, top_step+(pos_box_size/2.0)); - context->line_to (right, top_step+(pos_box_size/2.0)); - context->line_to (right, top_step+(pos_box_size/2.0) + step_down); + context->move_to (left, top_step + (pos_box_size/2.0) + step_down + 1.0); + context->line_to (left, top_step + (pos_box_size/2.0)); + context->line_to (right, top_step + (pos_box_size/2.0)); + context->line_to (right, top_step + (pos_box_size/2.0) + step_down + 1.0); context->stroke (); - /* left box */ - - rounded_rectangle (context, left - half_lr_box, - half_lr_box+step_down, - lr_box_size, lr_box_size, corner_radius); - context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - context->stroke_preserve (); - context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); - context->fill (); - - /* add text */ - - context->move_to (left - half_lr_box + 3, - (lr_box_size/2) + step_down + 13); - context->select_font_face ("sans-serif", Cairo::FONT_SLANT_NORMAL, Cairo::FONT_WEIGHT_BOLD); + context->set_line_width (1.0); + /* left box */ if (state != Mono) { + rounded_rectangle (context, left - half_lr_box, + half_lr_box+step_down, + lr_box_size, lr_box_size, corner_radius); + context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); + context->fill_preserve(); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke(); + + /* add text */ context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); if (swidth < 0.0) { - context->show_text (_("R")); + layout->set_text (S_("Panner|R")); } else { - context->show_text (_("L")); + layout->set_text (S_("Panner|L")); } + layout->get_pixel_size(tw, th); + context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2)); + pango_cairo_show_layout (context->cobj(), layout->gobj()); } /* right box */ - rounded_rectangle (context, right - half_lr_box, - half_lr_box+step_down, - lr_box_size, lr_box_size, corner_radius); - context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); - context->stroke_preserve (); + half_lr_box+step_down, + lr_box_size, lr_box_size, corner_radius); context->set_source_rgba (UINT_RGBA_R_FLT(f), UINT_RGBA_G_FLT(f), UINT_RGBA_B_FLT(f), UINT_RGBA_A_FLT(f)); - context->fill (); + context->fill_preserve(); + context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o)); + context->stroke(); /* add text */ - - context->move_to (right - half_lr_box + 3, (lr_box_size/2)+step_down + 13); context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t)); if (state == Mono) { - context->show_text (_("M")); + layout->set_text (S_("Panner|M")); } else { if (swidth < 0.0) { - context->show_text (_("L")); + layout->set_text (S_("Panner|L")); } else { - context->show_text (_("R")); + layout->set_text (S_("Panner|R")); } } + layout->get_pixel_size(tw, th); + context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2)); + pango_cairo_show_layout (context->cobj(), layout->gobj()); /* draw the central box */ - context->set_line_width (2.0); context->move_to (center + (pos_box_size/2.0), top_step); /* top right */ context->rel_line_to (0.0, pos_box_size); /* lower right */ @@ -267,7 +303,11 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) if (PannerInterface::on_button_press_event (ev)) { return true; } - + + if (_panner_shell->bypassed()) { + return true; + } + drag_start_x = ev->x; last_drag_x = ev->x; @@ -316,21 +356,21 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) /* left side dbl click */ if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { /* 2ndary-double click on left, collapse to hard left */ - width_control->set_value (0); - position_control->set_value (0); + width_control->set_value (0, Controllable::NoGroup); + position_control->set_value (0, Controllable::NoGroup); } else { - position_control->set_value (min_pos); + position_control->set_value (min_pos, Controllable::NoGroup); } } else if (ev->x > 2*width/3) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { /* 2ndary-double click on right, collapse to hard right */ - width_control->set_value (0); - position_control->set_value (1.0); + width_control->set_value (0, Controllable::NoGroup); + position_control->set_value (1.0, Controllable::NoGroup); } else { - position_control->set_value (max_pos); + position_control->set_value (max_pos, Controllable::NoGroup); } } else { - position_control->set_value (0.5); + position_control->set_value (0.5, Controllable::NoGroup); } } else { @@ -342,13 +382,13 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) if (ev->x <= width/3) { /* left side dbl click */ - width_control->set_value (max_width); // reset width to 100% + width_control->set_value (max_width, Controllable::NoGroup); // reset width to 100% } else if (ev->x > 2*width/3) { /* right side dbl click */ - width_control->set_value (-max_width); // reset width to inverted 100% + width_control->set_value (-max_width, Controllable::NoGroup); // reset width to inverted 100% } else { /* center dbl click */ - width_control->set_value (0); // collapse width to 0% + width_control->set_value (0, Controllable::NoGroup); // collapse width to 0% } } @@ -372,6 +412,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) double pos = position_control->get_value (); /* 0..1 */ double swidth = width_control->get_value (); /* -1..+1 */ double fswidth = fabs (swidth); + const int lr_box_size = get_height() - 2 * rint(get_height() / 3.5); int usable_width = get_width() - lr_box_size; double center = (lr_box_size/2.0) + (usable_width * pos); int left = lrint (center - (fswidth * usable_width / 2.0)); // center of leftmost box @@ -407,11 +448,15 @@ StereoPanner::on_button_release_event (GdkEventButton* ev) if (PannerInterface::on_button_release_event (ev)) { return true; } - + if (ev->button != 1) { return false; } + if (_panner_shell->bypassed()) { + return false; + } + bool const dp = dragging_position; _dragging = false; @@ -443,6 +488,10 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev) double wv = width_control->get_value(); // 0..1.0 ; 0 = left double step; + if (_panner_shell->bypassed()) { + return false; + } + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { step = one_degree; } else { @@ -452,19 +501,19 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev) switch (ev->direction) { case GDK_SCROLL_LEFT: wv += step; - width_control->set_value (wv); + width_control->set_value (wv, Controllable::NoGroup); break; case GDK_SCROLL_UP: pv -= step; - position_control->set_value (pv); + position_control->set_value (pv, Controllable::NoGroup); break; case GDK_SCROLL_RIGHT: wv -= step; - width_control->set_value (wv); + width_control->set_value (wv, Controllable::NoGroup); break; case GDK_SCROLL_DOWN: pv += step; - position_control->set_value (pv); + position_control->set_value (pv, Controllable::NoGroup); break; } @@ -474,10 +523,14 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev) bool StereoPanner::on_motion_notify_event (GdkEventMotion* ev) { + if (_panner_shell->bypassed()) { + _dragging = false; + } if (!_dragging) { return false; } + const int lr_box_size = get_height() - 2 * rint(get_height() / 3.5); int usable_width = get_width() - lr_box_size; double delta = (ev->x - last_drag_x) / (double) usable_width; double current_width = width_control->get_value (); @@ -485,7 +538,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) if (dragging_left) { delta = -delta; } - + if (dragging_left || dragging_right) { if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) { @@ -495,13 +548,13 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) */ _panner->freeze (); - + double pv = position_control->get_value(); if (dragging_left) { - position_control->set_value (pv - delta); + position_control->set_value (pv - delta, Controllable::NoGroup); } else { - position_control->set_value (pv + delta); + position_control->set_value (pv + delta, Controllable::NoGroup); } if (delta > 0.0) { @@ -511,9 +564,9 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) other side remains in place when we set the position as well. */ - width_control->set_value (current_width + (delta * 2.0)); + width_control->set_value (current_width + (delta * 2.0), Controllable::NoGroup); } else { - width_control->set_value (current_width + delta); + width_control->set_value (current_width + delta, Controllable::NoGroup); } _panner->thaw (); @@ -521,37 +574,37 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev) } else { /* maintain position as invariant as we change the width */ - + /* create a detent close to the center */ - + if (!detented && fabs (current_width) < 0.02) { detented = true; /* snap to zero */ - width_control->set_value (0); + width_control->set_value (0, Controllable::NoGroup); } - + if (detented) { - + accumulated_delta += delta; - + /* have we pulled far enough to escape ? */ - + if (fabs (accumulated_delta) >= 0.025) { - width_control->set_value (current_width + accumulated_delta); + width_control->set_value (current_width + accumulated_delta, Controllable::NoGroup); detented = false; accumulated_delta = false; } - + } else { /* width needs to change by 2 * delta because both L & R move */ - width_control->set_value (current_width + (delta * 2.0)); + width_control->set_value (current_width + (delta * 2.0), Controllable::NoGroup); } } } else if (dragging_position) { double pv = position_control->get_value(); // 0..1.0 ; 0 = left - position_control->set_value (pv + delta); + position_control->set_value (pv + delta, Controllable::NoGroup); } last_drag_x = ev->x; @@ -566,6 +619,10 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) double wv = width_control->get_value(); // 0..1.0 ; 0 = left double step; + if (_panner_shell->bypassed()) { + return false; + } + if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) { step = one_degree; } else { @@ -579,30 +636,30 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) switch (ev->keyval) { case GDK_Up: if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { - width_control->set_value (1.0); + width_control->set_value (1.0, Controllable::NoGroup); } else { - width_control->set_value (wv + step); + width_control->set_value (wv + step, Controllable::NoGroup); } break; case GDK_Down: if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { - width_control->set_value (-1.0); + width_control->set_value (-1.0, Controllable::NoGroup); } else { - width_control->set_value (wv - step); + width_control->set_value (wv - step, Controllable::NoGroup); } break; case GDK_Left: pv -= step; - position_control->set_value (pv); + position_control->set_value (pv, Controllable::NoGroup); break; case GDK_Right: pv += step; - position_control->set_value (pv); + position_control->set_value (pv, Controllable::NoGroup); break; case GDK_0: case GDK_KP_0: - width_control->set_value (0.0); + width_control->set_value (0.0, Controllable::NoGroup); break; default: @@ -615,23 +672,24 @@ StereoPanner::on_key_press_event (GdkEventKey* ev) void StereoPanner::set_colors () { - colors[Normal].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerFill(); - colors[Normal].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerOutline(); - colors[Normal].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerText(); - colors[Normal].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerBackground(); - colors[Normal].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule(); - - colors[Mono].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoFill(); - colors[Mono].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoOutline(); - colors[Mono].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoText(); - colors[Mono].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerMonoBackground(); - colors[Mono].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule(); - - colors[Inverted].fill = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedFill(); - colors[Inverted].outline = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedOutline(); - colors[Inverted].text = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedText(); - colors[Inverted].background = ARDOUR_UI::config()->get_canvasvar_StereoPannerInvertedBackground(); - colors[Inverted].rule = ARDOUR_UI::config()->get_canvasvar_StereoPannerRule(); + colors[Normal].fill = UIConfiguration::instance().color_mod ("stereo panner fill", "panner fill"); + // colors[Normal].outline = UIConfiguration::instance().color ("stereo panner outline"); + colors[Normal].outline = Gtkmm2ext::HSV (colors[Normal].fill).outline().color (); + colors[Normal].text = UIConfiguration::instance().color ("stereo panner text"); + colors[Normal].background = UIConfiguration::instance().color ("stereo panner bg"); + colors[Normal].rule = UIConfiguration::instance().color ("stereo panner rule"); + + colors[Mono].fill = UIConfiguration::instance().color ("stereo panner mono fill"); + colors[Mono].outline = UIConfiguration::instance().color ("stereo panner mono outline"); + colors[Mono].text = UIConfiguration::instance().color ("stereo panner mono text"); + colors[Mono].background = UIConfiguration::instance().color ("stereo panner mono bg"); + colors[Mono].rule = UIConfiguration::instance().color ("stereo panner rule"); + + colors[Inverted].fill = UIConfiguration::instance().color_mod ("stereo panner inverted fill", "stereo panner inverted"); + colors[Inverted].outline = UIConfiguration::instance().color ("stereo panner inverted outline"); + colors[Inverted].text = UIConfiguration::instance().color ("stereo panner inverted text"); + colors[Inverted].background = UIConfiguration::instance().color_mod ("stereo panner inverted bg", "stereo panner inverted bg"); + colors[Inverted].rule = UIConfiguration::instance().color ("stereo panner rule"); } void @@ -641,6 +699,26 @@ StereoPanner::color_handler () queue_draw (); } +void +StereoPanner::bypass_handler () +{ + queue_draw (); +} + +void +StereoPanner::pannable_handler () +{ + panvalue_connections.drop_connections(); + position_control = _panner->pannable()->pan_azimuth_control; + width_control = _panner->pannable()->pan_width_control; + position_binder.set_controllable(position_control); + width_binder.set_controllable(width_control); + + position_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); + width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context()); + queue_draw (); +} + PannerEditor* StereoPanner::editor () {