X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.cc;h=a4801f905d1d0c4307b687453cce77428d13526a;hb=79c918fd6aace3f5d94fe61973819574489ca755;hp=1d98ca00933b793ac7917100680d0cd19408c2bc;hpb=15b5fce90480490455237da917167b0bcb5ce946;p=ardour.git diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 1d98ca0093..a4801f905d 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -24,14 +24,19 @@ #include #include +#include "gtkmm2ext/gtk_ui.h" + #include "pbd/error.h" #include "pbd/cartesian.h" #include "ardour/panner.h" -#include +#include "ardour/pannable.h" +#include "ardour/speakers.h" #include "panner2d.h" #include "keyboard.h" #include "gui_thread.h" +#include "utils.h" +#include "public_editor.h" #include "i18n.h" @@ -41,6 +46,10 @@ using namespace ARDOUR; using namespace PBD; using Gtkmm2ext::Keyboard; +static const int large_size_threshold = 100; +static const int large_border_width = 25; +static const int small_border_width = 8; + Panner2d::Target::Target (const AngularVector& a, const char *txt) : position (a) , text (txt) @@ -59,18 +68,26 @@ Panner2d::Target::set_text (const char* txt) } Panner2d::Panner2d (boost::shared_ptr p, int32_t h) - : panner (p), width (0), height (h) + : panner (p) + , position (AngularVector (0.0, 0.0), "") + , width (0) + , height (h) + , last_width (0) { - panner->StateChanged.connect (state_connection, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); - panner->Changed.connect (change_connection, invalidator (*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); + panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); + + panner->pannable()->pan_azimuth_control->Changed.connect (connections, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context()); + panner->pannable()->pan_width_control->Changed.connect (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_position_change (); } Panner2d::~Panner2d() { - for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) { + for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) { delete *i; } } @@ -80,80 +97,53 @@ Panner2d::reset (uint32_t n_inputs) { uint32_t nouts = panner->out().n_audio(); - /* pucks */ + /* signals */ - while (pucks.size() < n_inputs) { - add_puck ("", AngularVector()); + while (signals.size() < n_inputs) { + add_signal ("", AngularVector()); } - if (pucks.size() > n_inputs) { - for (uint32_t i = pucks.size(); i < n_inputs; ++i) { - delete pucks[i]; + if (signals.size() > n_inputs) { + for (uint32_t i = signals.size(); i < n_inputs; ++i) { + delete signals[i]; } - pucks.resize (n_inputs); + signals.resize (n_inputs); } - for (Targets::iterator x = pucks.begin(); x != pucks.end(); ++x) { - (*x)->visible = false; - } - - switch (n_inputs) { - case 0: - break; - - case 1: - pucks[0]->set_text (""); - break; - - case 2: - pucks[0]->set_text ("R"); - pucks[1]->set_text ("L"); - break; - - default: - for (uint32_t i = 0; i < n_inputs; ++i) { - char buf[64]; - snprintf (buf, sizeof (buf), "%" PRIu32, i + 1); - pucks[i]->set_text (buf); - } - break; - } + label_signals (); -#ifdef PANNER_HACKS - for (uint32_t i = existing_pucks; i < n_inputs; ++i) { - pucks[i]->position = panner->streampanner (i).get_position (); - pucks[i]->visible = true; - } -#endif + for (uint32_t i = 0; i < n_inputs; ++i) { + signals[i]->position = panner->signal_position (i); + } /* add all outputs */ - while (targets.size() < nouts) { - add_target (AngularVector()); + while (speakers.size() < nouts) { + add_speaker (AngularVector()); } - if (targets.size() > nouts) { - for (uint32_t i = nouts; i < targets.size(); ++i) { - delete targets[i]; + if (speakers.size() > nouts) { + for (uint32_t i = nouts; i < speakers.size(); ++i) { + delete speakers[i]; } - targets.resize (nouts); + speakers.resize (nouts); } - for (Targets::iterator x = targets.begin(); x != targets.end(); ++x) { + for (Targets::iterator x = speakers.begin(); x != speakers.end(); ++x) { (*x)->visible = false; } + + vector& the_speakers (panner->get_speakers()->speakers()); for (uint32_t n = 0; n < nouts; ++n) { char buf[16]; snprintf (buf, sizeof (buf), "%d", n+1); - targets[n]->set_text (buf); -#ifdef PANNER_HACKS - targets[n]->position = panner->output(n).position; - targets[n]->visible = true; -#endif + speakers[n]->set_text (buf); + speakers[n]->position = the_speakers[n].angles(); + speakers[n]->visible = true; } queue_draw (); @@ -165,113 +155,210 @@ Panner2d::on_size_allocate (Gtk::Allocation& alloc) width = alloc.get_width(); height = alloc.get_height(); - if (height > 100) { - width -= 20; - height -= 20; - } + if (height > large_size_threshold) { + border = large_border_width; + } else { + border = small_border_width; + } + + radius = min (width, height); + radius -= border; + radius /= 2; + + hoffset = max ((double) (width - height), border); + voffset = max ((double) (height - width), border); + + hoffset /= 2.0; + voffset /= 2.0; DrawingArea::on_size_allocate (alloc); } int -Panner2d::add_puck (const char* text, const AngularVector& a) +Panner2d::add_signal (const char* text, const AngularVector& a) { - Target* puck = new Target (a, text); - pucks.push_back (puck); - puck->visible = true; + Target* signal = new Target (a, text); + signals.push_back (signal); + signal->visible = true; return 0; } int -Panner2d::add_target (const AngularVector& a) +Panner2d::add_speaker (const AngularVector& a) { - Target* target = new Target (a, ""); - targets.push_back (target); - target->visible = true; + Target* speaker = new Target (a, ""); + speakers.push_back (speaker); + speaker->visible = true; queue_draw (); - return targets.size() - 1; + return speakers.size() - 1; } void Panner2d::handle_state_change () { - ENSURE_GUI_THREAD (*this, &Panner2d::handle_state_change) - queue_draw (); } +void +Panner2d::label_signals () +{ + double w = panner->pannable()->pan_width_control->get_value(); + uint32_t sz = signals.size(); + + switch (sz) { + case 0: + break; + + case 1: + signals[0]->set_text (""); + break; + + case 2: + if (w >= 0.0) { + signals[0]->set_text ("R"); + signals[1]->set_text ("L"); + } else { + signals[0]->set_text ("L"); + signals[1]->set_text ("R"); + } + break; + + default: + for (uint32_t i = 0; i < sz; ++i) { + char buf[64]; + if (w >= 0.0) { + snprintf (buf, sizeof (buf), "%" PRIu32, i + 1); + } else { + snprintf (buf, sizeof (buf), "%" PRIu32, sz - i); + } + signals[i]->set_text (buf); + } + break; + } +} + void Panner2d::handle_position_change () { -#ifdef PANNER_HACKS uint32_t n; - ENSURE_GUI_THREAD (*this, &Panner2d::handle_position_change) + double w = panner->pannable()->pan_width_control->get_value(); - for (n = 0; n < pucks.size(); ++n) { - pucks[n]->position = panner->streampanner(n).get_position (); - } + position.position = AngularVector (panner->pannable()->pan_azimuth_control->get_value() * 360.0, 0.0); + + for (uint32_t i = 0; i < signals.size(); ++i) { + signals[i]->position = panner->signal_position (i); + } + + if (w * last_width <= 0) { + /* changed sign */ + label_signals (); + } + + last_width = w; - for (n = 0; n < targets.size(); ++n) { - targets[n]->position = panner->output(n).position; + vector& the_speakers (panner->get_speakers()->speakers()); + + for (n = 0; n < speakers.size(); ++n) { + speakers[n]->position = the_speakers[n].angles(); } queue_draw (); -#endif } void -Panner2d::move_puck (int which, const AngularVector& a) +Panner2d::move_signal (int which, const AngularVector& a) { - if (which >= int (targets.size())) { + if (which >= int (speakers.size())) { return; } - targets[which]->position = a; + speakers[which]->position = a; queue_draw (); } Panner2d::Target * -Panner2d::find_closest_object (gdouble x, gdouble y, int& which) const +Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) { Target *closest = 0; Target *candidate; float distance; float best_distance = FLT_MAX; - int pwhich; + CartesianVector c; - which = 0; - pwhich = 0; + /* start with the position itself + */ - cerr << "@ " << x << ", " << y << endl; - - for (Targets::const_iterator i = pucks.begin(); i != pucks.end(); ++i, ++pwhich) { + 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; + + for (Targets::const_iterator i = signals.begin(); i != signals.end(); ++i) { candidate = *i; - CartesianVector c; - candidate->position.cartesian (c); cart_to_gtk (c); distance = sqrt ((c.x - x) * (c.x - x) + (c.y - y) * (c.y - y)); - cerr << "\tConsider candiate " << candidate->text << " @ " << c.x << ", " << c.y << ", " << c.z << " distance = " << distance << endl; - - if (distance < best_distance) { + if (distance < best_distance) { closest = candidate; best_distance = distance; - which = pwhich; } } - - if (best_distance > 20) { // arbitrary - return 0; - } - - cerr << "the winner is " << closest->text << endl; + 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; + } + } + + /* if we didn't find a signal close by, check the speakers */ + + if (!closest) { + for (Targets::const_iterator i = speakers.begin(); i != speakers.end(); ++i) { + candidate = *i; + + candidate->position.cartesian (c); + cart_to_gtk (c); + + distance = sqrt ((c.x - x) * (c.x - x) + + (c.y - y) * (c.y - y)); + + 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; + } + } + } return closest; } @@ -290,17 +377,24 @@ Panner2d::on_motion_notify_event (GdkEventMotion *ev) state = (GdkModifierType) ev->state; } + if (ev->state & (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK)) { + did_move = true; + } + return handle_motion (x, y, state); } + bool Panner2d::on_expose_event (GdkEventExpose *event) { - gint x, y; + CartesianVector c; cairo_t* cr; + bool small = (height <= large_size_threshold); + const double diameter = radius*2.0; cr = gdk_cairo_create (get_window()->gobj()); - cairo_set_line_width (cr, 1.0); + /* background */ cairo_rectangle (cr, event->area.x, event->area.y, event->area.width, event->area.height); if (!panner->bypassed()) { @@ -311,125 +405,217 @@ Panner2d::on_expose_event (GdkEventExpose *event) cairo_fill_preserve (cr); cairo_clip (cr); - if (height > 100) { - cairo_translate (cr, 10.0, 10.0); - } + /* offset to give us some border */ + + cairo_translate (cr, hoffset, voffset); + + cairo_set_line_width (cr, 1.0); /* horizontal line of "crosshairs" */ - cairo_set_source_rgb (cr, 0.0, 0.1, 0.7); - cairo_move_to (cr, 0.5, height/2.0+0.5); - cairo_line_to (cr, width+0.5, height/2+0.5); + 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); /* vertical line of "crosshairs" */ - cairo_move_to (cr, width/2+0.5, 0.5); - cairo_line_to (cr, width/2+0.5, height+0.5); + cairo_move_to (cr, radius, 0); + cairo_line_to (cr, radius, diameter); cairo_stroke (cr); /* the circle on which signals live */ - cairo_arc (cr, width/2, height/2, height/2, 0, 2.0 * M_PI); + cairo_set_line_width (cr, 2.0); + 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->pannable()->pan_width_control->get_value()) * 2 * M_PI; + double position_angle = (2 * M_PI) - panner->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->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); + } + if (!panner->bypassed()) { - float arc_radius; - cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); + double arc_radius; - if (height < 100) { - cairo_set_font_size (cr, 10); - arc_radius = 2.0; - } else { - cairo_set_font_size (cr, 16); + cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); + + if (small) { arc_radius = 4.0; + } else { + cairo_set_font_size (cr, 10); + arc_radius = 12.0; } - for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) { - - Target* puck = *i; + /* signals */ - if (puck->visible) { - /* redraw puck */ - - CartesianVector c; - - puck->position.cartesian (c); - cart_to_gtk (c); + if (signals.size() > 1) { + for (Targets::iterator i = signals.begin(); i != signals.end(); ++i) { + Target* signal = *i; - x = (gint) floor (c.x); - y = (gint) floor (c.y); + if (signal->visible) { - /* XXX need to shift circles so that they are centered on the circle */ + signal->position.cartesian (c); + cart_to_gtk (c); - cairo_arc (cr, x, y, arc_radius, 0, 2.0 * M_PI); - cairo_set_source_rgb (cr, 0.8, 0.2, 0.1); - cairo_close_path (cr); - cairo_fill (cr); - - cairo_move_to (cr, x + 6, y + 6); - - char buf[256]; - snprintf (buf, sizeof (buf), "%s:%d", puck->text.c_str(), (int) lrint (puck->position.azi)); - cairo_show_text (cr, buf); - } - } - - /* redraw any visible targets */ + 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()); + } + } + } + } + + /* speakers */ int n = 0; - for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) { - Target *target = *i; + for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) { + Target *speaker = *i; char buf[256]; ++n; - if (target->visible) { + if (speaker->visible) { CartesianVector c; - target->position.cartesian (c); + speaker->position.cartesian (c); cart_to_gtk (c); - x = (int) floor (c.x); - y = (int) floor (c.y); - snprintf (buf, sizeof (buf), "%d", n); - cairo_set_source_rgb (cr, 0.0, 0.8, 0.1); - cairo_rectangle (cr, x-2, y-2, 4, 4); + /* 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); + cairo_set_source_rgba (cr, 0.282, 0.517, 0.662, 1.0); cairo_fill (cr); - cairo_move_to (cr, x+6, y+6); - cairo_show_text (cr, buf); + cairo_restore (cr); + + if (!small) { + cairo_set_font_size (cr, 16); + + /* 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); + } } } + + /* 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); - return TRUE; + return true; } bool Panner2d::on_button_press_event (GdkEventButton *ev) { GdkModifierType state; + int x; + int y; + bool is_signal; if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) { return false; } + did_move = false; + switch (ev->button) { case 1: case 2: - if ((drag_target = find_closest_object (ev->x, ev->y, drag_index)) != 0) { - drag_target->set_selected (true); + x = ev->x - border; + y = ev->y - border; + + if ((drag_target = find_closest_object (x, y, is_signal)) != 0) { + if (!is_signal) { + panner->set_position (drag_target->position.azi/360.0); + drag_target = 0; + } else { + drag_target->set_selected (true); + } } - drag_x = (int) floor (ev->x); - drag_y = (int) floor (ev->y); + drag_x = ev->x; + drag_y = ev->y; state = (GdkModifierType) ev->state; return handle_motion (drag_x, drag_y, state); @@ -439,7 +625,7 @@ Panner2d::on_button_press_event (GdkEventButton *ev) break; } - return FALSE; + return false; } bool @@ -454,22 +640,7 @@ Panner2d::on_button_release_event (GdkEventButton *ev) x = (int) floor (ev->x); y = (int) floor (ev->y); state = (GdkModifierType) ev->state; - - if (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier)) { - - for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) { - //Target* puck = i->second; - /* XXX DO SOMETHING TO SET PUCK BACK TO "normal" */ - } - - queue_draw (); - PuckMoved (-1); - ret = true; - - } else { - ret = handle_motion (x, y, state); - } - + ret = handle_motion (x, y, state); drag_target = 0; break; @@ -506,7 +677,7 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) if ((state & (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK)) == 0) { return false; } - + if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) { CartesianVector c; @@ -521,60 +692,71 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) if (need_move) { CartesianVector cp (evx, evy, 0.0); + AngularVector av; - /* canonicalize position */ + /* canonicalize position and then clamp to the circle */ gtk_to_cart (cp); - - /* position actual signal on circle */ - clamp_to_circle (cp.x, cp.y); - - /* generate an angular representation and set drag target (GUI) position */ - cp.angular (drag_target->position); /* sets drag target position */ + /* generate an angular representation of the current mouse position */ -#ifdef PANNER_HACKS - panner->streampanner (drag_index).set_position (drag_target->position); -#endif + cp.angular (av); - queue_draw (); + if (drag_target == &position) { + double degree_fract = av.azi / 360.0; + panner->set_position (degree_fract); + } } } return true; } +bool +Panner2d::on_scroll_event (GdkEventScroll* ev) +{ + switch (ev->direction) { + case GDK_SCROLL_UP: + case GDK_SCROLL_RIGHT: + panner->set_position (panner->pannable()->pan_azimuth_control->get_value() - 1.0/360.0); + break; + + case GDK_SCROLL_DOWN: + case GDK_SCROLL_LEFT: + panner->set_position (panner->pannable()->pan_azimuth_control->get_value() + 1.0/360.0); + break; + } + return true; +} + void Panner2d::cart_to_gtk (CartesianVector& c) const { - /* "c" uses a coordinate space that is: - - center = 0.0 - dimension = 2.0 * 2.0 - so max values along each axis are -1..+1 + /* cartesian coordinate space: + center = 0.0 + dimension = 2.0 * 2.0 + increasing y moves up + so max values along each axis are -1..+1 GTK uses a coordinate space that is: - - top left = 0.0 - dimension = width * height - so max values along each axis are 0,width and - 0,height + top left = 0.0 + dimension = (radius*2.0) * (radius*2.0) + increasing y moves down */ + const double diameter = radius*2.0; - c.x = (width / 2) * (c.x + 1); - c.y = (height / 2) * (1 - c.y); - - /* XXX z-axis not handled - 2D for now */ + c.x = diameter * ((c.x + 1.0) / 2.0); + /* extra subtraction inverts the y-axis to match "increasing y moves down" */ + c.y = diameter - (diameter * ((c.y + 1.0) / 2.0)); } void Panner2d::gtk_to_cart (CartesianVector& c) const { - c.x = (c.x / (width / 2.0)) - 1.0; - c.y = -((c.y / (height / 2.0)) - 1.0); - - /* XXX z-axis not handled - 2D for now */ + const double diameter = radius*2.0; + c.x = ((c.x / diameter) * 2.0) - 1.0; + c.y = (((diameter - c.y) / diameter) * 2.0) - 1.0; } void @@ -582,9 +764,10 @@ Panner2d::clamp_to_circle (double& x, double& y) { double azi, ele; double z = 0.0; - - PBD::cart_to_azi_ele (x, y, z, azi, ele); - PBD::azi_ele_to_cart (azi, ele, x, y, z); + double l; + + PBD::cartesian_to_spherical (x, y, z, azi, ele, l); + PBD::spherical_to_cartesian (azi, ele, 1.0, x, y, z); } void @@ -594,20 +777,19 @@ Panner2d::toggle_bypass () } Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uint32_t inputs) - : widget (p, h) - , reset_button (_("Reset")) + : ArdourDialog (_("Panner (2D)")) + , widget (p, h) , bypass_button (_("Bypass")) - , mute_button (_("Mute")) { 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)); + button_box.set_spacing (6); - button_box.pack_start (reset_button, false, false); button_box.pack_start (bypass_button, false, false); - button_box.pack_start (mute_button, false, false); spinner_box.set_spacing (6); left_side.set_spacing (6); @@ -615,9 +797,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uint32_t left_side.pack_start (button_box, false, false); left_side.pack_start (spinner_box, false, false); - reset_button.show (); bypass_button.show (); - mute_button.show (); button_box.show (); spinner_box.show (); left_side.show (); @@ -628,7 +808,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr p, int32_t h, uint32_t hpacker.pack_start (left_side, false, false); hpacker.show (); - add (hpacker); + get_vbox()->pack_start (hpacker); reset (inputs); widget.show (); } @@ -653,3 +833,26 @@ Panner2dWindow::reset (uint32_t n_inputs) } #endif } + +void +Panner2dWindow::bypass_toggled () +{ + bool view = bypass_button.get_active (); + bool model = widget.get_panner()->bypassed (); + + if (model != view) { + widget.get_panner()->set_bypassed (view); + } +} + +bool +Panner2dWindow::on_key_press_event (GdkEventKey* event) +{ + return relay_key_press (event, &PublicEditor::instance()); +} + +bool +Panner2dWindow::on_key_release_event (GdkEventKey *event) +{ + return true; +}