X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpanner2d.cc;h=a4801f905d1d0c4307b687453cce77428d13526a;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=f03946e9aa3c631a055047d55562af5dba1e8561;hpb=7703f0a76a82ec3fe21609c396ebf2f950803bf9;p=ardour.git diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index f03946e9aa..a4801f905d 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -24,405 +24,341 @@ #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" using namespace std; using namespace Gtk; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using Gtkmm2ext::Keyboard; -Panner2d::Target::Target (float xa, float ya, const char *txt) - : x (xa, 0.0, 1.0, 0.01, 0.1) - , y (ya, 0.0, 1.0, 0.01, 0.1) - , azimuth (M_PI/2.0, 0.0, 2.0 * M_PI, 0.1, 0.5) - , text (txt ? strdup (txt) : 0) +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) + , _selected (false) { - azimuth.set_value ((random() / (double) INT_MAX) * (2.0 * M_PI)); } Panner2d::Target::~Target () { - if (text) { - free (text); - } } void Panner2d::Target::set_text (const char* txt) { - if (text) { - free (text); - } - text = strdup (txt); + text = 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) { - allow_x = false; - allow_y = false; - allow_target = false; + panner->StateChanged.connect (connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context()); - panner->StateChanged.connect (mem_fun(*this, &Panner2d::handle_state_change)); - panner->Changed.connect (mem_fun(*this, &Panner2d::handle_position_change)); + 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) { - delete i->second; + for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) { + delete *i; } } void Panner2d::reset (uint32_t n_inputs) { - Targets::size_type existing_pucks = pucks.size(); - - /* pucks */ + uint32_t nouts = panner->out().n_audio(); - while (pucks.size() < n_inputs) { - add_puck ("", 0.0, 0.0); - } + /* signals */ - while (pucks.size() > n_inputs) { - pucks.erase (pucks.begin()); + while (signals.size() < n_inputs) { + add_signal ("", AngularVector()); } - for (Targets::iterator x = pucks.begin(); x != pucks.end(); ++x) { - (*x).second->visible = false; - } - - switch (n_inputs) { - case 0: - break; - - case 1: - pucks[0]->set_text (""); - pucks[0]->x.set_value (0.0); - pucks[0]->y.set_value (0.5); - pucks[0]->visible = true; - break; - - case 2: - pucks[0]->set_text ("R"); - pucks[0]->visible = true; - pucks[1]->set_text ("L"); - if (existing_pucks < 2) { - pucks[1]->x.set_value (0.25f); - pucks[1]->y.set_value (0.5f); + if (signals.size() > n_inputs) { + for (uint32_t i = signals.size(); i < n_inputs; ++i) { + delete signals[i]; } - pucks[1]->visible = true; - break; - default: - for (uint32_t i = 0; i < n_inputs; ++i) { - char buf[64]; - snprintf (buf, sizeof (buf), "%" PRIu32, i); - pucks[i]->set_text (buf); - - if (existing_pucks < i) { - float x, y; - panner->streampanner (i).get_position (x, y); - pucks[i]->x.set_value (x); - pucks[i]->y.set_value (y); - } - - pucks[i]->visible = true; - } - break; + signals.resize (n_inputs); } + + label_signals (); + + for (uint32_t i = 0; i < n_inputs; ++i) { + signals[i]->position = panner->signal_position (i); + } /* add all outputs */ - while (targets.size() < panner->nouts()) { - add_target (0.0, 0.0); + while (speakers.size() < nouts) { + add_speaker (AngularVector()); } - while (targets.size() > panner->nouts()) { - targets.erase (targets.begin()); + if (speakers.size() > nouts) { + for (uint32_t i = nouts; i < speakers.size(); ++i) { + delete speakers[i]; + } + + speakers.resize (nouts); } - for (Targets::iterator x = targets.begin(); x != targets.end(); ++x) { - (*x).second->visible = false; + 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 < panner->nouts(); ++n) { + for (uint32_t n = 0; n < nouts; ++n) { char buf[16]; snprintf (buf, sizeof (buf), "%d", n+1); - targets[n]->set_text (buf); - targets[n]->x.set_value (panner->output(n).x); - targets[n]->y.set_value (panner->output(n).y); - targets[n]->visible = true; + speakers[n]->set_text (buf); + speakers[n]->position = the_speakers[n].angles(); + speakers[n]->visible = true; } - allow_x_motion (true); - allow_y_motion (true); - allow_target_motion (true); - queue_draw (); } -Gtk::Adjustment& -Panner2d::azimuth (uint32_t which) -{ - assert (which < pucks.size()); - return pucks[which]->azimuth; -} - void 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; + } - DrawingArea::on_size_allocate (alloc); -} + radius = min (width, height); + radius -= border; + radius /= 2; -int -Panner2d::add_puck (const char* text, float x, float y) -{ - Target* puck = new Target (x, y, text); - - pair newpair; - newpair.first = pucks.size(); - newpair.second = puck; + hoffset = max ((double) (width - height), border); + voffset = max ((double) (height - width), border); - pucks.insert (newpair); - puck->visible = true; + hoffset /= 2.0; + voffset /= 2.0; - return 0; + DrawingArea::on_size_allocate (alloc); } int -Panner2d::add_target (float x, float y) +Panner2d::add_signal (const char* text, const AngularVector& a) { - Target *target = new Target (x, y, ""); - - pair newpair; - newpair.first = targets.size(); - newpair.second = target; + Target* signal = new Target (a, text); + signals.push_back (signal); + signal->visible = true; - targets.insert (newpair); - target->visible = true; - queue_draw (); - - return newpair.first; + return 0; } -void -Panner2d::drop_targets () +int +Panner2d::add_speaker (const AngularVector& a) { - for (Targets::iterator i = targets.begin(); i != targets.end(); ) { - - Targets::iterator tmp; - - tmp = i; - ++tmp; - - delete i->second; - targets.erase (i); - - i = tmp; - } - + Target* speaker = new Target (a, ""); + speakers.push_back (speaker); + speaker->visible = true; queue_draw (); -} - -void -Panner2d::remove_target (int which) -{ - Targets::iterator i = targets.find (which); - if (i != targets.end()) { - delete i->second; - targets.erase (i); - queue_draw (); - } + return speakers.size() - 1; } void Panner2d::handle_state_change () { - ENSURE_GUI_THREAD(mem_fun(*this, &Panner2d::handle_state_change)); - queue_draw (); } void -Panner2d::handle_position_change () +Panner2d::label_signals () { - uint32_t n; - ENSURE_GUI_THREAD(mem_fun(*this, &Panner2d::handle_position_change)); - - for (n = 0; n < pucks.size(); ++n) { - float x, y; - panner->streampanner(n).get_position (x, y); - pucks[n]->x.set_value (x); - pucks[n]->y.set_value (y); - } - - for (n = 0; n < targets.size(); ++n) { - targets[n]->x.set_value (panner->output(n).x); - targets[n]->y.set_value (panner->output(n).y); - } - - queue_draw (); -} + double w = panner->pannable()->pan_width_control->get_value(); + uint32_t sz = signals.size(); -void -Panner2d::move_target (int which, float x, float y) -{ - Targets::iterator i = targets.find (which); - Target *target; + switch (sz) { + case 0: + break; - if (!allow_target) { - return; - } + case 1: + signals[0]->set_text (""); + break; - if (i != targets.end()) { - target = i->second; - target->x.set_value (x); - target->y.set_value (y); + 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; - queue_draw (); + 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::move_puck (int which, float x, float y) +Panner2d::handle_position_change () { - Targets::iterator i = pucks.find (which); - Target *target; + uint32_t n; + double w = panner->pannable()->pan_width_control->get_value(); - if (i != pucks.end()) { - target = i->second; - target->x.set_value (x); - target->y.set_value (y); + position.position = AngularVector (panner->pannable()->pan_azimuth_control->get_value() * 360.0, 0.0); - queue_draw (); - } -} + for (uint32_t i = 0; i < signals.size(); ++i) { + signals[i]->position = panner->signal_position (i); + } -void -Panner2d::show_puck (int which) -{ - Targets::iterator i = pucks.find (which); + if (w * last_width <= 0) { + /* changed sign */ + label_signals (); + } - if (i != pucks.end()) { - Target* puck = i->second; - if (!puck->visible) { - puck->visible = true; - queue_draw (); - } - } -} + last_width = w; -void -Panner2d::hide_puck (int which) -{ - Targets::iterator i = pucks.find (which); + vector& the_speakers (panner->get_speakers()->speakers()); - if (i != pucks.end()) { - Target* puck = i->second; - if (!puck->visible) { - puck->visible = false; - queue_draw (); - } + for (n = 0; n < speakers.size(); ++n) { + speakers[n]->position = the_speakers[n].angles(); } -} -void -Panner2d::show_target (int which) -{ - Targets::iterator i = targets.find (which); - if (i != targets.end()) { - if (!i->second->visible) { - i->second->visible = true; - queue_draw (); - } - } + queue_draw (); } void -Panner2d::hide_target (int which) +Panner2d::move_signal (int which, const AngularVector& a) { - Targets::iterator i = targets.find (which); - if (i != targets.end()) { - if (i->second->visible) { - i->second->visible = false; - queue_draw (); - } + if (which >= int (speakers.size())) { + return; } + + speakers[which]->position = a; + queue_draw (); } Panner2d::Target * -Panner2d::find_closest_object (gdouble x, gdouble y, int& which, bool& is_puck) const +Panner2d::find_closest_object (gdouble x, gdouble y, bool& is_signal) { - gdouble efx, efy; - gdouble cx, cy; Target *closest = 0; Target *candidate; float distance; float best_distance = FLT_MAX; - int pwhich; + CartesianVector c; - efx = x/width; - efy = y/height; - which = 0; - pwhich = 0; - is_puck = false; + /* start with the position itself + */ - for (Targets::const_iterator i = targets.begin(); i != targets.end(); ++i, ++which) { - candidate = i->second; + 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; - cx = candidate->x.get_value(); - cy = candidate->y.get_value(); + candidate->position.cartesian (c); + cart_to_gtk (c); - distance = sqrt ((cx - efx) * (cx - efx) + - (cy - efy) * (cy - efy)); + distance = sqrt ((c.x - x) * (c.x - x) + + (c.y - y) * (c.y - y)); - if (distance < best_distance) { + if (distance < best_distance) { closest = candidate; best_distance = distance; } } - for (Targets::const_iterator i = pucks.begin(); i != pucks.end(); ++i, ++pwhich) { - candidate = i->second; - - cx = candidate->x.get_value(); - cy = candidate->y.get_value(); - - distance = sqrt ((cx - efx) * (cx - efx) + - (cy - efy) * (cy - efy)); - - if (distance < best_distance) { - closest = candidate; - best_distance = distance; - is_puck = true; - which = pwhich; - } - } + 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; } @@ -441,18 +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; - float fx, fy; + 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()) { @@ -463,144 +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); - } - - 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, height+0.5, height/2+0.5); - cairo_stroke (cr); - - cairo_move_to (cr, height/2+0.5, 0.5); - cairo_line_to (cr, height/2+0.5, height+0.5); - cairo_stroke (cr); - - cairo_arc (cr, height/2, height/2, height/2, 0, 2.0 * M_PI); - cairo_stroke (cr); - - if (!panner->bypassed()) { - float arc_radius; - - cairo_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - - if (height < 100) { - cairo_set_font_size (cr, 10); - arc_radius = 2.0; - } else { - cairo_set_font_size (cr, 16); - arc_radius = 4.0; - } - - for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) { - - Target* puck = i->second; - - if (puck->visible) { - /* redraw puck */ + /* offset to give us some border */ - fx = min (puck->x.get_value(), 1.0); - fx = max (fx, -1.0f); - x = (gint) floor (width * fx - 4); + cairo_translate (cr, hoffset, voffset); - fy = min (puck->y.get_value(), 1.0); - fy = max (fy, -1.0f); - y = (gint) floor (height * fy - 4); - - 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_set_line_width (cr, 1.0); - /* arrow */ + /* horizontal line of "crosshairs" */ - if (height > 100.0f) { + 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); - float endx, endy; - endx = x; - endy = y; + /* vertical line of "crosshairs" */ + + cairo_move_to (cr, radius, 0); + cairo_line_to (cr, radius, diameter); + cairo_stroke (cr); - cairo_save (cr); - cairo_translate (cr, x, y); - cairo_rotate (cr, puck->azimuth.get_value()); + /* the circle on which signals live */ - /* horizontal left-to-right line (rotation will rotate it, duh) */ + 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); - endx = 30.0; - endy = 0.0; + /* 3 other circles of smaller diameter circle on which signals live */ - /* stem */ - cairo_set_line_width (cr, 4.0); - cairo_move_to (cr, 0.0, 0.0); - cairo_line_to (cr, endx, endy); - cairo_stroke (cr); + 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); - /* arrow head */ + 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); + } - cairo_move_to (cr, endx - 10.0, endy + 10.0); - cairo_line_to (cr, endx, endy); - cairo_line_to (cr, endx - 10.0, endy - 10.0); - cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND); - cairo_stroke (cr); + if (!panner->bypassed()) { - cairo_restore (cr); - } + double arc_radius; - cairo_move_to (cr, x + 6, y + 6); - cairo_show_text (cr, puck->text); - } + 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; } - /* redraw any visible targets */ + /* 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()); + } + } + } + } + + /* speakers */ int n = 0; - for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) { - Target *target = i->second; + for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) { + Target *speaker = *i; char buf[256]; ++n; - if (target->visible) { - - fx = min (target->x.get_value(), 1.0); - fx = max (fx, -1.0f); - x = (gint) floor (width * fx); + if (speaker->visible) { - fy = min (target->y.get_value(), 1.0); - fy = max (fy, -1.0f); - y = (gint) floor (height * fy); + CartesianVector c; + + speaker->position.cartesian (c); + cart_to_gtk (c); 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: - drag_target = find_closest_object (ev->x, ev->y, drag_index, drag_is_puck); - drag_x = (int) floor (ev->x); - drag_y = (int) floor (ev->y); + 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 = ev->x; + drag_y = ev->y; state = (GdkModifierType) ev->state; return handle_motion (drag_x, drag_y, state); @@ -610,7 +625,7 @@ Panner2d::on_button_press_event (GdkEventButton *ev) break; } - return FALSE; + return false; } bool @@ -625,24 +640,7 @@ Panner2d::on_button_release_event (GdkEventButton *ev) x = (int) floor (ev->x); y = (int) floor (ev->y); state = (GdkModifierType) ev->state; - - if (drag_is_puck && (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; @@ -651,7 +649,7 @@ Panner2d::on_button_release_event (GdkEventButton *ev) y = (int) floor (ev->y); state = (GdkModifierType) ev->state; - if (drag_is_puck && (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier))) { + if (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier)) { toggle_bypass (); ret = true; } else { @@ -679,110 +677,119 @@ Panner2d::handle_motion (gint evx, gint evy, GdkModifierType state) if ((state & (GDK_BUTTON1_MASK|GDK_BUTTON2_MASK)) == 0) { return false; } - - int x, y; - bool need_move = false; - - if (!drag_is_puck && !allow_target) { - cerr << "dip = " << drag_is_puck << " at = " << allow_target << endl; - return true; - } + if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) { - - if (allow_x || !drag_is_puck) { - float new_x; - x = min (evx, width - 1); - x = max (x, 0); - new_x = (float) x / (width - 1); - if (new_x != drag_target->x.get_value()) { - drag_target->x.set_value (new_x); - need_move = true; - } - } - - if (allow_y || drag_is_puck) { - float new_y; - y = min (evy, height - 1); - y = max (y, 0); - new_y = (float) y / (height - 1); - if (new_y != drag_target->y.get_value()) { - drag_target->y.set_value (new_y); - need_move = true; - } + CartesianVector c; + bool need_move = false; + + drag_target->position.cartesian (c); + cart_to_gtk (c); + + if ((evx != c.x) || (evy != c.y)) { + need_move = true; } if (need_move) { + CartesianVector cp (evx, evy, 0.0); + AngularVector av; - if (drag_is_puck) { + /* canonicalize position and then clamp to the circle */ - panner->streampanner(drag_index).set_position ( - drag_target->x.get_value(), drag_target->y.get_value(), false); + gtk_to_cart (cp); + clamp_to_circle (cp.x, cp.y); - } else { + /* generate an angular representation of the current mouse position */ - TargetMoved (drag_index); - } - - queue_draw (); - } - - - } else if ((state & GDK_BUTTON2_MASK) && !(state & GDK_BUTTON1_MASK)) { - - if (!drag_is_puck) { - return false; + cp.angular (av); + + if (drag_target == &position) { + double degree_fract = av.azi / 360.0; + panner->set_position (degree_fract); + } } + } - int xdelta = drag_x - evx; - int ydelta = drag_x - evy; + return true; +} - drag_target->azimuth.set_value (drag_target->azimuth.get_value() + (2 * M_PI) * ((float)ydelta)/height * ((float) -xdelta)/height); - queue_draw (); - } +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; - return true; + 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::toggle_bypass () +Panner2d::cart_to_gtk (CartesianVector& c) const { - panner->set_bypassed (!panner->bypassed()); + /* 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 = (radius*2.0) * (radius*2.0) + increasing y moves down + */ + const double diameter = radius*2.0; + + 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::allow_x_motion (bool yn) +Panner2d::gtk_to_cart (CartesianVector& c) const { - allow_x = yn; + 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 -Panner2d::allow_target_motion (bool yn) +Panner2d::clamp_to_circle (double& x, double& y) { - allow_target = yn; + double azi, ele; + double z = 0.0; + double l; + + PBD::cartesian_to_spherical (x, y, z, azi, ele, l); + PBD::spherical_to_cartesian (azi, ele, 1.0, x, y, z); } void -Panner2d::allow_y_motion (bool yn) +Panner2d::toggle_bypass () { - allow_y = yn; + panner->set_bypassed (!panner->bypassed()); } 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); @@ -790,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 (); @@ -803,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 (); } @@ -813,10 +818,11 @@ 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.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 (); } @@ -825,4 +831,28 @@ Panner2dWindow::reset (uint32_t n_inputs) delete spinners.back(); spinners.erase (--spinners.end()); } +#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; }