X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.cc;h=29806cae673becfefbf3627447389627902bd1af;hb=e6b4c9f610c94cb72cb0003f0c751871b30c513e;hp=59e70acd038d56b947125681a93bc7e4926ad118;hpb=72cec05d46e033d1e33d46ef69b85ef65f991bdd;p=ardour.git diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 59e70acd03..29806cae67 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -33,6 +33,9 @@ #include "ardour/pannable.h" #include "ardour/speakers.h" +#include "canvas/colors.h" + +#include "ardour_ui.h" #include "panner2d.h" #include "keyboard.h" #include "gui_thread.h" @@ -44,6 +47,7 @@ using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using Gtkmm2ext::Keyboard; @@ -69,19 +73,22 @@ Panner2d::Target::set_text (const char* txt) } Panner2d::Panner2d (boost::shared_ptr p, int32_t h) - : panner_shell (p) - , position (AngularVector (0.0, 0.0), "") - , width (0) - , height (h) - , last_width (0) +: panner_shell (p) + , position (AngularVector (0.0, 0.0), "") + , width (0) + , height (h) + , last_width (0) + , have_elevation (false) + , _send_mode (false) { - panner_shell->Changed.connect (connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); + panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); - panner_shell->panner()->SignalPositionChanged.connect (panconnect, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); + panner_shell->panner()->SignalPositionChanged.connect (panner_connections, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); drag_target = 0; set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); + handle_state_change (); handle_position_change (); } @@ -95,7 +102,7 @@ Panner2d::~Panner2d() void Panner2d::reset (uint32_t n_inputs) { - uint32_t nouts = panner_shell->panner()->out().n_audio(); + uint32_t nouts = panner_shell->panner()->out().n_audio(); /* signals */ @@ -111,11 +118,11 @@ Panner2d::reset (uint32_t n_inputs) signals.resize (n_inputs); } - label_signals (); + label_signals (); - for (uint32_t i = 0; i < n_inputs; ++i) { - signals[i]->position = panner_shell->panner()->signal_position (i); - } + for (uint32_t i = 0; i < n_inputs; ++i) { + signals[i]->position = panner_shell->panner()->signal_position (i); + } /* add all outputs */ @@ -135,7 +142,7 @@ Panner2d::reset (uint32_t n_inputs) (*x)->visible = false; } - vector& the_speakers (panner_shell->panner()->get_speakers()->speakers()); + vector& the_speakers (panner_shell->panner()->get_speakers()->speakers()); for (uint32_t n = 0; n < nouts; ++n) { char buf[16]; @@ -152,24 +159,25 @@ Panner2d::reset (uint32_t n_inputs) void Panner2d::on_size_allocate (Gtk::Allocation& alloc) { - width = alloc.get_width(); - height = alloc.get_height(); + width = alloc.get_width(); + height = alloc.get_height(); - if (height > large_size_threshold) { - border = large_border_width; - } else { - border = small_border_width; - } + if (height > large_size_threshold) { + border = large_border_width; + } else { + border = small_border_width; + } - radius = min (width, height); - radius -= border; - radius /= 2; + radius = min (width, height); + radius -= border; + radius /= 2; + radius = rint(radius) + .5; - hoffset = max ((double) (width - height), border); - voffset = max ((double) (height - width), border); + hoffset = max ((double) (width - height), border); + voffset = max ((double) (height - width), border); - hoffset /= 2.0; - voffset /= 2.0; + hoffset = rint(hoffset / 2.0); + voffset = rint(voffset / 2.0); DrawingArea::on_size_allocate (alloc); } @@ -198,36 +206,48 @@ Panner2d::add_speaker (const AngularVector& a) void Panner2d::handle_state_change () { - panconnect.drop_connections(); - panner_shell->panner()->SignalPositionChanged.connect (panconnect, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); + panner_connections.drop_connections(); + if (!panner_shell->panner()) { + return; + } + + panner_shell->panner()->SignalPositionChanged.connect (panner_connections, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); + + set params = panner_shell->panner()->what_can_be_automated(); + set::iterator p = params.find(PanElevationAutomation); + bool elev = have_elevation; + have_elevation = (p == params.end()) ? false : true; + if (elev != have_elevation) { + handle_position_change(); + } queue_draw (); } void Panner2d::label_signals () { - uint32_t sz = signals.size(); + uint32_t sz = signals.size(); switch (sz) { - case 0: - break; - - case 1: - signals[0]->set_text (""); - break; - - case 2: - signals[0]->set_text ("L"); - signals[1]->set_text ("R"); - break; - - default: - for (uint32_t i = 0; i < sz; ++i) { - char buf[64]; - snprintf (buf, sizeof (buf), "%" PRIu32, i + 1); - signals[i]->set_text (buf); - } - break; + case 0: + break; + + case 1: + signals[0]->set_text (""); + break; + + case 2: + signals[0]->set_text (S_("Panner|L")); + signals[1]->set_text (S_("Panner|R")); + break; + + default: + for (uint32_t i = 0; i < sz; ++i) { + char buf[64]; + snprintf (buf, sizeof (buf), "%" PRIu32, i + 1); + signals[i]->set_text (buf); + } + break; } } @@ -235,23 +255,23 @@ void Panner2d::handle_position_change () { uint32_t n; - double w = panner_shell->pannable()->pan_width_control->get_value(); + double w = panner_shell->pannable()->pan_width_control->get_value(); position.position = AngularVector (panner_shell->pannable()->pan_azimuth_control->get_value() * 360.0, - panner_shell->pannable()->pan_elevation_control->get_value() * 90.0); + panner_shell->pannable()->pan_elevation_control->get_value() * 90.0); - for (uint32_t i = 0; i < signals.size(); ++i) { - signals[i]->position = panner_shell->panner()->signal_position (i); - } + for (uint32_t i = 0; i < signals.size(); ++i) { + signals[i]->position = panner_shell->panner()->signal_position (i); + } - if (w * last_width <= 0) { - /* changed sign */ - label_signals (); - } + if (w * last_width <= 0) { + /* changed sign */ + label_signals (); + } - last_width = w; + last_width = w; - vector& the_speakers (panner_shell->panner()->get_speakers()->speakers()); + vector& the_speakers (panner_shell->panner()->get_speakers()->speakers()); for (n = 0; n < speakers.size(); ++n) { speakers[n]->position = the_speakers[n].angles(); @@ -278,17 +298,21 @@ Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) Target *candidate; float distance; float best_distance = FLT_MAX; - CartesianVector c; + CartesianVector c; - /* start with the position itself - */ + /* start with the position itself */ - position.position.cartesian (c); - cart_to_gtk (c); - best_distance = sqrt ((c.x - x) * (c.x - x) + - (c.y - y) * (c.y - y)); - closest = &position; + PBD::AngularVector dp = position.position; + if (!have_elevation) dp.ele = 0; + dp.azi = 270 - dp.azi; + dp.cartesian (c); + cart_to_gtk (c); + best_distance = sqrt ((c.x - x) * (c.x - x) + + (c.y - y) * (c.y - y)); + closest = &position; + +#if 0 // TODO signal grab -> change width, not position for (Targets::const_iterator i = signals.begin(); i != signals.end(); ++i) { candidate = *i; @@ -296,66 +320,78 @@ Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) cart_to_gtk (c); distance = sqrt ((c.x - x) * (c.x - x) + - (c.y - y) * (c.y - y)); + (c.y - y) * (c.y - y)); - if (distance < best_distance) { + if (distance < best_distance) { closest = candidate; best_distance = distance; } } +#endif - is_signal = true; - - if (height > large_size_threshold) { - /* "big" */ - if (best_distance > 30) { // arbitrary - closest = 0; - } - } else { - /* "small" */ - if (best_distance > 10) { // arbitrary - closest = 0; - } - } + is_signal = true; - /* if we didn't find a signal close by, check the speakers */ + if (height > large_size_threshold) { + /* "big" */ + if (best_distance > 30) { // arbitrary + closest = 0; + } + } else { + /* "small" */ + if (best_distance > 10) { // arbitrary + closest = 0; + } + } - if (!closest) { - for (Targets::const_iterator i = speakers.begin(); i != speakers.end(); ++i) { - candidate = *i; + /* if we didn't find a signal close by, check the speakers */ - candidate->position.cartesian (c); + if (!closest) { + for (Targets::const_iterator i = speakers.begin(); i != speakers.end(); ++i) { + candidate = *i; + PBD::AngularVector sp = candidate->position; + sp.azi = 270 -sp.azi; + CartesianVector c; + sp.cartesian (c); cart_to_gtk (c); - distance = sqrt ((c.x - x) * (c.x - x) + - (c.y - y) * (c.y - y)); + distance = sqrt ((c.x - x) * (c.x - x) + + (c.y - y) * (c.y - y)); - if (distance < best_distance) { - closest = candidate; - best_distance = distance; - } - } + if (distance < best_distance) { + closest = candidate; + best_distance = distance; + } + } - if (height > large_size_threshold) { - /* "big" */ - if (best_distance < 30) { // arbitrary - is_signal = false; - } else { - closest = 0; - } - } else { - /* "small" */ - if (best_distance < 10) { // arbitrary - is_signal = false; - } else { - closest = 0; - } - } - } + if (height > large_size_threshold) { + /* "big" */ + if (best_distance < 30) { // arbitrary + is_signal = false; + } else { + closest = 0; + } + } else { + /* "small" */ + if (best_distance < 10) { // arbitrary + is_signal = false; + } else { + closest = 0; + } + } + } return closest; } +void +Panner2d::set_send_drawing_mode (bool onoff) +{ + if (_send_mode != onoff) { + _send_mode = onoff; + queue_draw (); + } +} + bool Panner2d::on_motion_notify_event (GdkEventMotion *ev) { @@ -370,9 +406,9 @@ Panner2d::on_motion_notify_event (GdkEventMotion *ev) state = (GdkModifierType) ev->state; } - if (ev->state & (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK)) { - did_move = true; - } + if (ev->state & (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK)) { + did_move = true; + } return handle_motion (x, y, state); } @@ -380,33 +416,38 @@ Panner2d::on_motion_notify_event (GdkEventMotion *ev) bool Panner2d::on_expose_event (GdkEventExpose *event) { - CartesianVector c; + CartesianVector c; cairo_t* cr; - bool small = (height <= large_size_threshold); - const double diameter = radius*2.0; + bool xsmall = (height <= large_size_threshold); + const double diameter = radius*2.0; cr = gdk_cairo_create (get_window()->gobj()); - /* background */ + /* background */ cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); + + double r, g, b, a; + if (_send_mode) { + ArdourCanvas::color_to_rgba (ARDOUR_UI::config()->color ("send bg"), r, g, b, a); + } if (!panner_shell->bypassed()) { - cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 1.0); + cairo_set_source_rgba (cr, r, g, b, 1.0); } else { - cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 0.2); + cairo_set_source_rgba (cr, r, g, b , 0.2); } cairo_fill_preserve (cr); cairo_clip (cr); - /* offset to give us some border */ + /* offset to give us some border */ - cairo_translate (cr, hoffset, voffset); + cairo_translate (cr, hoffset, voffset); cairo_set_line_width (cr, 1.0); /* horizontal line of "crosshairs" */ - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); cairo_move_to (cr, 0.0, radius); cairo_line_to (cr, diameter, radius); cairo_stroke (cr); @@ -419,92 +460,117 @@ Panner2d::on_expose_event (GdkEventExpose *event) /* the circle on which signals live */ - cairo_set_line_width (cr, 2.0); - cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 1.0); + cairo_set_line_width (cr, 1.5); + cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 1.0); cairo_arc (cr, radius, radius, radius, 0.0, 2.0 * M_PI); cairo_stroke (cr); - /* 3 other circles of smaller diameter circle on which signals live */ - - cairo_set_line_width (cr, 1.0); - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); - cairo_arc (cr, radius, radius, radius * 0.75, 0, 2.0 * M_PI); - cairo_stroke (cr); - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.85); - cairo_arc (cr, radius, radius, radius * 0.50, 0, 2.0 * M_PI); - cairo_stroke (cr); - cairo_arc (cr, radius, radius, radius * 0.25, 0, 2.0 * M_PI); - cairo_stroke (cr); - - if (signals.size() > 1) { - /* arc to show "diffusion" */ - - double width_angle = fabs (panner_shell->pannable()->pan_width_control->get_value()) * 2 * M_PI; - double position_angle = (2 * M_PI) - panner_shell->pannable()->pan_azimuth_control->get_value() * 2 * M_PI; - - cairo_save (cr); - cairo_translate (cr, radius, radius); - cairo_rotate (cr, position_angle - (width_angle/2.0)); - cairo_move_to (cr, 0, 0); - cairo_arc_negative (cr, 0, 0, radius, width_angle, 0.0); - cairo_close_path (cr); - if (panner_shell->pannable()->pan_width_control->get_value() >= 0.0) { - /* normal width */ - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.45); - } else { - /* inverse width */ - cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.45); - } - cairo_fill (cr); - cairo_restore (cr); - } + for (uint32_t rad = 15; rad < 90; rad += 15) { + cairo_set_line_width (cr, .5 + (float)rad / 150.0); + if (rad == 45) { + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); + } else { + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.8); + } + cairo_new_path (cr); + cairo_arc (cr, radius, radius, radius * sin(M_PI * (float) rad / 180.0), 0, 2.0 * M_PI); + cairo_stroke (cr); + } if (!panner_shell->bypassed()) { + /* convention top == front ^= azimuth == .5 (same as stereo/mono panners) */ + + if (signals.size() > 1) { + /* arc to show "diffusion" */ + + double width_angle = fabs (panner_shell->pannable()->pan_width_control->get_value()) * 2 * M_PI; + double position_angle = panner_shell->pannable()->pan_azimuth_control->get_value() * 2 * M_PI; + + cairo_save (cr); + cairo_translate (cr, radius, radius); + cairo_rotate (cr, M_PI / 2.0); + cairo_rotate (cr, position_angle - (width_angle/2.0)); + cairo_move_to (cr, 0, 0); + cairo_arc_negative (cr, 0, 0, radius, width_angle, 0.0); + cairo_close_path (cr); + if (panner_shell->pannable()->pan_width_control->get_value() >= 0.0) { + /* normal width */ + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.45); + } else { + /* inverse width */ + cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.45); + } + cairo_fill (cr); + cairo_restore (cr); + } double arc_radius; cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - if (small) { + if (xsmall) { arc_radius = 4.0; } else { cairo_set_font_size (cr, 10); arc_radius = 12.0; } - /* signals */ - - if (signals.size() > 1) { - for (Targets::iterator i = signals.begin(); i != signals.end(); ++i) { - Target* signal = *i; - - if (signal->visible) { - - signal->position.cartesian (c); - cart_to_gtk (c); - - cairo_new_path (cr); - cairo_arc (cr, c.x, c.y, arc_radius, 0, 2.0 * M_PI); - cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.85); - cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 1.0); - cairo_stroke (cr); - - if (!small && !signal->text.empty()) { - cairo_set_source_rgb (cr, 0.517, 0.772, 0.882); - /* the +/- adjustments are a hack to try to center the text in the circle */ - if (small) { - cairo_move_to (cr, c.x - 1, c.y + 1); - } else { - cairo_move_to (cr, c.x - 4, c.y + 4); - } - cairo_show_text (cr, signal->text.c_str()); - } - } - } - } + /* draw position */ + + PBD::AngularVector dp = position.position; + if (!have_elevation) dp.ele = 0; + dp.azi = 270 - dp.azi; + dp.cartesian (c); + cart_to_gtk (c); + + cairo_new_path (cr); + cairo_arc (cr, c.x, c.y, arc_radius + 1.0, 0, 2.0 * M_PI); + cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.85); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 1.0, 0.905, 0.905, 0.85); + cairo_stroke (cr); + + /* signals */ + + if (signals.size() > 0) { + for (Targets::iterator i = signals.begin(); i != signals.end(); ++i) { + Target* signal = *i; + + if (signal->visible) { + + /* TODO check for overlap - multiple src at same position + * -> visualize it properly + */ + PBD::AngularVector sp = signal->position; + if (!have_elevation) sp.ele = 0; + sp.azi += 270.0; + sp.cartesian (c); + cart_to_gtk (c); + + cairo_new_path (cr); + cairo_arc (cr, c.x, c.y, arc_radius, 0, 2.0 * M_PI); + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 0.75); + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, 0.8); + cairo_stroke (cr); + + if (!xsmall && !signal->text.empty()) { + cairo_set_source_rgba (cr, 0.517, 0.772, 0.882, .9); + /* the +/- adjustments are a hack to try to center the text in the circle + * TODO use pango get_pixel_size() -- see mono_panner.cc + */ + if (xsmall) { + cairo_move_to (cr, c.x - 1, c.y + 1); + } else { + cairo_move_to (cr, c.x - 4, c.y + 4); + } + cairo_show_text (cr, signal->text.c_str()); + } + } + } + } - /* speakers */ + /* speakers */ int n = 0; @@ -515,62 +581,52 @@ Panner2d::on_expose_event (GdkEventExpose *event) if (speaker->visible) { + PBD::AngularVector sp = speaker->position; + sp.azi += 270.0; CartesianVector c; - - speaker->position.cartesian (c); + sp.cartesian (c); cart_to_gtk (c); snprintf (buf, sizeof (buf), "%d", n); - /* stroke out a speaker shape */ - - cairo_move_to (cr, c.x, c.y); - cairo_save (cr); - cairo_rotate (cr, -(speaker->position.azi/360.0) * (2.0 * M_PI)); - if (small) { - cairo_scale (cr, 0.8, 0.8); - } else { - cairo_scale (cr, 1.2, 1.2); - } - cairo_rel_line_to (cr, 4, -2); - cairo_rel_line_to (cr, 0, -7); - cairo_rel_line_to (cr, 5, +5); - cairo_rel_line_to (cr, 5, 0); - cairo_rel_line_to (cr, 0, 5); - cairo_rel_line_to (cr, -5, 0); - cairo_rel_line_to (cr, -5, +5); - cairo_rel_line_to (cr, 0, -7); - cairo_close_path (cr); + /* stroke out a speaker shape */ + + cairo_move_to (cr, c.x, c.y); + cairo_save (cr); + cairo_rotate (cr, -(sp.azi/360.0) * (2.0 * M_PI)); + if (xsmall) { + cairo_scale (cr, 0.8, 0.8); + } else { + cairo_scale (cr, 1.2, 1.2); + } + cairo_rel_line_to (cr, 4, -2); + cairo_rel_line_to (cr, 0, -7); + cairo_rel_line_to (cr, 5, +5); + cairo_rel_line_to (cr, 5, 0); + cairo_rel_line_to (cr, 0, 5); + cairo_rel_line_to (cr, -5, 0); + cairo_rel_line_to (cr, -5, +5); + cairo_rel_line_to (cr, 0, -7); + cairo_close_path (cr); cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); cairo_fill (cr); - cairo_restore (cr); + cairo_restore (cr); - if (!small) { - cairo_set_font_size (cr, 16); + if (!xsmall) { + cairo_set_font_size (cr, 16); - /* move the text in just a bit */ + /* move the text in just a bit */ - AngularVector textpos (speaker->position.azi, speaker->position.ele, 0.85); - textpos.cartesian (c); - cart_to_gtk (c); - cairo_move_to (cr, c.x, c.y); - cairo_show_text (cr, buf); - } + AngularVector textpos (speaker->position.azi + 270.0, speaker->position.ele, 0.85); + + textpos.cartesian (c); + cart_to_gtk (c); + cairo_move_to (cr, c.x, c.y); + cairo_show_text (cr, buf); + } } } - - /* draw position */ - - position.position.cartesian (c); - cart_to_gtk (c); - - cairo_new_path (cr); - cairo_arc (cr, c.x, c.y, arc_radius, 0, 2.0 * M_PI); - cairo_set_source_rgba (cr, 1.0, 0.419, 0.419, 0.85); - cairo_fill_preserve (cr); - cairo_set_source_rgba (cr, 1.0, 0.905, 0.905, 0.85); - cairo_stroke (cr); } cairo_destroy (cr); @@ -595,8 +651,8 @@ Panner2d::on_button_press_event (GdkEventButton *ev) switch (ev->button) { case 1: case 2: - x = ev->x - border; - y = ev->y - border; + x = ev->x - hoffset; + y = ev->y - voffset; if ((drag_target = find_closest_object (x, y, is_signal)) != 0) { if (!is_signal) { @@ -607,11 +663,8 @@ Panner2d::on_button_press_event (GdkEventButton *ev) } } - drag_x = ev->x; - drag_y = ev->y; state = (GdkModifierType) ev->state; - - return handle_motion (drag_x, drag_y, state); + return handle_motion (ev->x, ev->y, state); break; default: @@ -671,6 +724,8 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) return false; } + evx -= hoffset; + evy -= voffset; if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) { CartesianVector c; @@ -684,20 +739,14 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) } if (need_move) { - set params = panner_shell->panner()->what_can_be_automated(); - set::iterator p = params.find(PanElevationAutomation); - - double y0 = 4.0; - if (height > large_size_threshold) { - y0 = 12.0; - } - CartesianVector cp (evx - 12.0, evy - y0, 0.0); + CartesianVector cp (evx, evy, 0.0); AngularVector av; gtk_to_cart (cp); - if (p == params.end()) { + if (!have_elevation) { clamp_to_circle (cp.x, cp.y); cp.angular (av); + av.azi = fmod(270 - av.azi, 360); if (drag_target == &position) { double degree_fract = av.azi / 360.0; panner_shell->panner()->set_position (degree_fract); @@ -709,6 +758,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) double r2d = 180.0 / M_PI; av.azi = r2d * atan2(cp.y, cp.x); av.ele = r2d * asin(cp.z); + av.azi = fmod(270 - av.azi, 360); if (drag_target == &position) { double azi_fract = av.azi / 360.0; @@ -802,27 +852,43 @@ Panner2d::toggle_bypass () Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uint32_t inputs) : ArdourWindow (_("Panner (2D)")) - , widget (p, h) + , widget (p, h) , bypass_button (_("Bypass")) + , width_adjustment (0, -100, 100, 1, 5, 0) + , width_spinner (width_adjustment) { widget.set_name ("MixerPanZone"); set_title (_("Panner")); widget.set_size_request (h, h); - bypass_button.signal_toggled().connect (sigc::mem_fun (*this, &Panner2dWindow::bypass_toggled)); + bypass_button.signal_toggled().connect (sigc::mem_fun (*this, &Panner2dWindow::bypass_toggled)); + width_spinner.signal_changed().connect (sigc::mem_fun (*this, &Panner2dWindow::width_changed)); + + p->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&Panner2dWindow::set_bypassed, this), gui_context()); + /* needed for the width-spinbox in the main window */ + p->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&Panner2dWindow::pannable_handler, this), gui_context()); + p->pannable()->pan_width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&Panner2dWindow::set_width, this), gui_context()); + button_box.set_spacing (6); button_box.pack_start (bypass_button, false, false); - spinner_box.set_spacing (6); left_side.set_spacing (6); left_side.pack_start (button_box, false, false); + + Gtk::Label* l = manage (new Label ( + p->panner()->describe_parameter(PanWidthAutomation), + Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false)); + spinner_box.pack_start (*l, false, false); + spinner_box.pack_start (width_spinner, false, false); left_side.pack_start (spinner_box, false, false); + l->show (); bypass_button.show (); button_box.show (); + width_spinner.show (); spinner_box.show (); left_side.show (); @@ -834,6 +900,8 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uin add (hpacker); reset (inputs); + set_width(); + set_bypassed(); widget.show (); } @@ -841,42 +909,73 @@ void Panner2dWindow::reset (uint32_t n_inputs) { widget.reset (n_inputs); +} -#if 0 - while (spinners.size() < n_inputs) { - // spinners.push_back (new Gtk::SpinButton (widget.azimuth (spinners.size()))); - //spinner_box.pack_start (*spinners.back(), false, false); - //spinners.back()->set_digits (4); - spinners.back()->show (); - } +void +Panner2dWindow::bypass_toggled () +{ + bool view = bypass_button.get_active (); + bool model = widget.get_panner_shell()->bypassed (); - while (spinners.size() > n_inputs) { - spinner_box.remove (*spinners.back()); - delete spinners.back(); - spinners.erase (--spinners.end()); + if (model != view) { + widget.get_panner_shell()->set_bypassed (view); + } +} +void +Panner2dWindow::width_changed () +{ + float model = widget.get_panner_shell()->pannable()->pan_width_control->get_value(); + float view = width_spinner.get_value() / 100.0; + if (model != view) { + widget.get_panner_shell()->panner()->set_width (view); } -#endif } void -Panner2dWindow::bypass_toggled () +Panner2dWindow::pannable_handler () { - bool view = bypass_button.get_active (); - bool model = widget.get_panner_shell()->bypassed (); + panvalue_connections.drop_connections(); + widget.get_panner_shell()->pannable()->pan_width_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&Panner2dWindow::set_width, this), gui_context()); + set_width(); +} - if (model != view) { - widget.get_panner_shell()->set_bypassed (view); - } +void +Panner2dWindow::set_bypassed () +{ + bool view = bypass_button.get_active (); + bool model = widget.get_panner_shell()->bypassed (); + if (model != view) { + bypass_button.set_active(model); + } + + set params = widget.get_panner_shell()->panner()->what_can_be_automated(); + set::iterator p = params.find(PanWidthAutomation); + if (p == params.end()) { + spinner_box.set_sensitive(false); + } else { + spinner_box.set_sensitive(true); + } +} + +void +Panner2dWindow::set_width () +{ + // rounding of spinbox is different from slider -- TODO use slider + float model = (widget.get_panner_shell()->pannable()->pan_width_control->get_value() * 100.0); + float view = (width_spinner.get_value()); + if (model != view) { + width_spinner.set_value (model); + } } bool Panner2dWindow::on_key_press_event (GdkEventKey* event) { - return relay_key_press (event, &PublicEditor::instance()); + return relay_key_press (event, &PublicEditor::instance()); } bool Panner2dWindow::on_key_release_event (GdkEventKey*) { - return true; + return true; }