diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 14:53:03 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-10 14:53:03 -0500 |
commit | d15fda6d751a465d278f477923075d4783f3b1ca (patch) | |
tree | 99e36ff934f50d9c980dbeab09ad021cda3d098c /gtk2_ardour/stereo_panner.cc | |
parent | 22c303d8f6c355a7229eb459cedf4fbdf0eb3c1d (diff) | |
parent | 0bdf4c25cfee8cf2408d2b1367f2c5e5c8c509b1 (diff) |
fix merge errors with master
Diffstat (limited to 'gtk2_ardour/stereo_panner.cc')
-rw-r--r-- | gtk2_ardour/stereo_panner.cc | 150 |
1 files changed, 101 insertions, 49 deletions
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 4e5c6de959..e650338af4 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -22,6 +22,7 @@ #include <cmath> #include <gtkmm/window.h> +#include <pangomm/layout.h> #include "pbd/controllable.h" #include "pbd/compose.h" @@ -34,6 +35,7 @@ #include "ardour/pannable.h" #include "ardour/panner.h" +#include "ardour/panner_shell.h" #include "ardour_ui.h" #include "global_signals.h" @@ -56,10 +58,14 @@ static const int top_step = 2; 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> panner) - : PannerInterface (panner) +StereoPanner::StereoPanner (boost::shared_ptr<PannerShell> 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,9 +83,21 @@ StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner) set_colors (); have_colors = true; } + if (!have_font) { + Pango::FontDescription font; + Pango::AttrFontDesc* font_attr; + font = Pango::FontDescription ("ArdourMono"); + font.set_weight (Pango::WEIGHT_BOLD); + font.set_size(9 * PANGO_SCALE); + 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()); + _panner_shell->Changed.connect (connections, invalidator (*this), boost::bind (&StereoPanner::bypass_handler, this), gui_context()); ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler)); @@ -94,6 +112,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,14 +139,17 @@ StereoPanner::on_expose_event (GdkEventExpose*) Glib::RefPtr<Gdk::Window> win (get_window()); Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state())); Cairo::RefPtr<Cairo::Context> context = get_window()->create_cairo_context(); + Glib::RefPtr<Pango::Layout> 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); + const double corner_radius = 5.0; uint32_t o, f, t, b, r; State state; - const double corner_radius = 5.0; width = get_width(); height = get_height (); @@ -143,11 +168,20 @@ 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; + } + /* 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 +200,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 +214,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 (_("R")); } else { - context->show_text (_("L")); + layout->set_text (_("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 (_("M")); } else { if (swidth < 0.0) { - context->show_text (_("L")); + layout->set_text (_("L")); } else { - context->show_text (_("R")); + layout->set_text (_("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,6 +294,10 @@ 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; @@ -412,6 +443,10 @@ StereoPanner::on_button_release_event (GdkEventButton* ev) return false; } + if (_panner_shell->bypassed()) { + return false; + } + bool const dp = dragging_position; _dragging = false; @@ -443,6 +478,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 { @@ -474,6 +513,9 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev) bool StereoPanner::on_motion_notify_event (GdkEventMotion* ev) { + if (_panner_shell->bypassed()) { + _dragging = false; + } if (!_dragging) { return false; } @@ -566,6 +608,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 { @@ -641,6 +687,12 @@ StereoPanner::color_handler () queue_draw (); } +void +StereoPanner::bypass_handler () +{ + queue_draw (); +} + PannerEditor* StereoPanner::editor () { |