#include <cairo.h>
#include <gtkmm/menu.h>
+#include "gtkmm2ext/gtk_ui.h"
+
#include "pbd/error.h"
#include "pbd/cartesian.h"
#include "ardour/panner.h"
-#include <gtkmm2ext/gtk_ui.h>
+#include "ardour/panner_shell.h"
+#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 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)
+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)
+ , _selected (false)
{
- azimuth.set_value ((random() / (double) INT_MAX) * (2.0 * M_PI));
}
Panner2d::Target::~Target ()
text = txt;
}
-Panner2d::Panner2d (boost::shared_ptr<Panner> p, int32_t h)
- : panner (p), width (0), height (h)
+Panner2d::Panner2d (boost::shared_ptr<PannerShell> p, int32_t h)
+ : panner_shell (p)
+ , position (AngularVector (0.0, 0.0), "")
+ , width (0)
+ , height (h)
+ , last_width (0)
{
- allow_x = false;
- allow_y = false;
- allow_target = false;
+ panner_shell->Changed.connect (connections, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context());
- 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_shell->pannable()->pan_azimuth_control->Changed.connect (connections, invalidator(*this), boost::bind (&Panner2d::handle_position_change, this), gui_context());
+ panner_shell->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;
}
}
void
Panner2d::reset (uint32_t n_inputs)
{
- Targets::size_type existing_pucks = pucks.size();
+ uint32_t nouts = panner_shell->panner()->out().n_audio();
- /* pucks */
+ /* signals */
- while (pucks.size() < n_inputs) {
- add_puck ("", 0.0, 0.0);
+ 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;
- }
-
- for (uint32_t i = existing_pucks; i < n_inputs; ++i) {
- float x, y;
- double dx, dy;
- panner->streampanner (i).get_position (x, y);
+ label_signals ();
- dx = x;
- dy = y;
- clamp_to_circle (dx, dy);
-
- pucks[i]->x.set_value (dx);
- pucks[i]->y.set_value (dy);
-
- pucks[i]->visible = true;
- }
+ for (uint32_t i = 0; i < n_inputs; ++i) {
+ signals[i]->position = panner_shell->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());
}
- if (targets.size() > panner->nouts()) {
- for (uint32_t i = panner->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 (panner->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;
}
- for (uint32_t n = 0; n < panner->nouts(); ++n) {
+ vector<Speaker>& the_speakers (panner_shell->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);
- 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;
+ }
+
+ 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, float x, float y)
+Panner2d::add_signal (const char* text, const AngularVector& a)
{
- double dx, dy;
-
- dx = x;
- dy = y;
-
- clamp_to_circle (dx, dy);
-
- Target* puck = new Target (dx, dy, 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 (float x, float y)
+Panner2d::add_speaker (const AngularVector& a)
{
- Target* target = new Target (x, y, "");
- 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_shell->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 ()
{
uint32_t n;
- ENSURE_GUI_THREAD (*this, &Panner2d::handle_position_change)
+ double w = panner_shell->pannable()->pan_width_control->get_value();
- 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);
- }
+ position.position = AngularVector (panner_shell->pannable()->pan_azimuth_control->get_value() * 360.0, 0.0);
+
+ 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 ();
+ }
+
+ last_width = w;
+
+ vector<Speaker>& the_speakers (panner_shell->panner()->get_speakers()->speakers());
- 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);
+ for (n = 0; n < speakers.size(); ++n) {
+ speakers[n]->position = the_speakers[n].angles();
}
queue_draw ();
}
void
-Panner2d::move_puck (int which, float x, float y)
+Panner2d::move_signal (int which, const AngularVector& a)
{
- if (which >= int (targets.size())) {
+ if (which >= int (speakers.size())) {
return;
}
-
- targets[which]->x.set_value (x);
- targets[which]->y.set_value (y);
+
+ 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)
{
- 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-1.0);
- efy = 1.0 - (y/(height-1.0)); /* convert from X Window origin */
+ /* start with the position itself
+ */
- which = 0;
- pwhich = 0;
+ 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 = pucks.begin(); i != pucks.end(); ++i, ++pwhich) {
+ 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;
- which = pwhich;
}
}
- if (best_distance > 0.05) { // arbitrary
- return 0;
+ 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;
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()) {
+ if (!panner_shell->bypassed()) {
cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 1.0);
} else {
cairo_set_source_rgba (cr, 0.1, 0.1, 0.1, 0.2);
cairo_fill_preserve (cr);
cairo_clip (cr);
- if (height > 100) {
- cairo_translate (cr, 10.0, 10.0);
- }
+ /* offset to give us some border */
- /* horizontal line of "crosshairs" */
+ cairo_translate (cr, hoffset, voffset);
- 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_stroke (cr);
+ cairo_set_line_width (cr, 1.0);
- /* vertical line of "crosshairs" */
+ /* horizontal 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_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);
- /* the circle on which signals live */
+ /* vertical line of "crosshairs" */
- cairo_arc (cr, width/2, height/2, height/2, 0, 2.0 * M_PI);
+ cairo_move_to (cr, radius, 0);
+ cairo_line_to (cr, radius, diameter);
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;
- }
+ /* the circle on which signals live */
- for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) {
+ 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);
- Target* puck = *i;
+ /* 3 other circles of smaller diameter circle on which signals live */
- if (puck->visible) {
- /* redraw puck */
+ 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);
- fx = min (puck->x.get_value(), 1.0);
- fx = max (fx, -1.0f);
- x = (gint) floor (width * fx - 4);
+ 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);
+ }
- fy = min (fy, 1.0f);
- fy = max (fy, -1.0f);
+ if (!panner_shell->bypassed()) {
- /* translate back to X Window abomination coordinates */
- fy = -(puck->y.get_value() - 1.0);
+ double arc_radius;
- 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_select_font_face (cr, "sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
- cairo_move_to (cr, x + 6, y + 6);
- cairo_show_text (cr, puck->text.c_str());
- }
+ 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;
+ for (Targets::iterator i = speakers.begin(); i != speakers.end(); ++i) {
+ Target *speaker = *i;
char buf[256];
++n;
- if (target->visible) {
+ if (speaker->visible) {
- fx = min (target->x.get_value(), 1.0);
- fx = max (fx, -1.0f);
- x = (gint) floor (width * fx);
+ CartesianVector c;
- fy = min (target->y.get_value(), 1.0);
- fy = max (fy, -1.0f);
- y = (gint) floor (height * fy);
+ 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:
- 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_shell->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);
break;
}
- return FALSE;
+ return false;
}
bool
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;
if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) {
+ CartesianVector c;
+ bool need_move = false;
- double fx = evx;
- double fy = evy;
- bool need_move = false;
+ drag_target->position.cartesian (c);
+ cart_to_gtk (c);
- clamp_to_circle (fx, fy);
+ if ((evx != c.x) || (evy != c.y)) {
+ need_move = true;
+ }
- if ((fx != drag_target->x.get_value()) || (fy != drag_target->y.get_value())) {
- need_move = true;
- }
+ if (need_move) {
+ CartesianVector cp (evx, evy, 0.0);
+ AngularVector av;
- if (need_move) {
- drag_target->x.set_value (fx);
- drag_target->y.set_value (fy);
-
- panner->streampanner (drag_index).set_position (drag_target->x.get_value(), drag_target->y.get_value(), false);
- queue_draw ();
- }
+ /* canonicalize position and then clamp to the circle */
- } else if ((state & GDK_BUTTON2_MASK) && !(state & GDK_BUTTON1_MASK)) {
+ gtk_to_cart (cp);
+ clamp_to_circle (cp.x, cp.y);
- int xdelta = drag_x - evx;
- int ydelta = drag_x - evy;
+ /* generate an angular representation of the current mouse position */
- drag_target->azimuth.set_value (drag_target->azimuth.get_value() + (2 * M_PI) * ((float)ydelta)/height * ((float) -xdelta)/height);
- queue_draw ();
+ cp.angular (av);
+
+ if (drag_target == &position) {
+ double degree_fract = av.azi / 360.0;
+ panner_shell->panner()->set_position (degree_fract);
+ }
+ }
}
return true;
}
-void
-Panner2d::cart_to_azi_ele (double x, double y, double& azi, double& ele)
-{
- x = min (x, (double) width);
- x = max (x, 0.0);
- x = x / (width-1.0);
-
- y = min (y, (double) height);
- y = max (y, 0.0);
- y = y / (height-1.0);
-
- /* at this point, new_x and new_y are in the range [ 0.0 .. 1.0 ], with
- (0,0) at the upper left corner (thank you, X Window)
-
- we need to translate to (0,0) at center
- */
-
- x -= 0.5;
- y = (1.0 - y) - 0.5;
-
- PBD::cart_to_azi_ele (x, y, 0.0, azi, ele);
-}
-
-void
-Panner2d::azi_ele_to_cart (double azi, double ele, double& x, double& y)
+bool
+Panner2d::on_scroll_event (GdkEventScroll* ev)
{
- double z;
-
- PBD::azi_ele_to_cart (azi, ele, x, y, z);
-
- /* xp,yp,zp use a (0,0) == center and 2.0 unit dimension. so convert
- back to (0,0) and 1.0 unit dimension
- */
-
- x /= 2.0;
- y /= 2.0;
- z /= 2.0;
-
- /* and now convert back to (0,0) == upper left corner */
-
- x += 0.5;
- y += 0.5;
- z += 0.5;
+ switch (ev->direction) {
+ case GDK_SCROLL_UP:
+ case GDK_SCROLL_RIGHT:
+ panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() - 1.0/360.0);
+ break;
+
+ case GDK_SCROLL_DOWN:
+ case GDK_SCROLL_LEFT:
+ panner_shell->panner()->set_position (panner_shell->pannable()->pan_azimuth_control->get_value() + 1.0/360.0);
+ break;
+ }
+ return true;
}
void
-Panner2d::clamp_to_circle (double& x, double& y)
+Panner2d::cart_to_gtk (CartesianVector& c) const
{
- double azi, ele;
-
- cart_to_azi_ele (x, y, azi, ele);
- azi_ele_to_cart (azi, ele, x, y);
+ /* 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::toggle_bypass ()
+Panner2d::gtk_to_cart (CartesianVector& c) const
{
- panner->set_bypassed (!panner->bypassed());
+ 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_x_motion (bool yn)
+Panner2d::clamp_to_circle (double& x, double& y)
{
- allow_x = yn;
-}
+ double azi, ele;
+ double z = 0.0;
+ double l;
-void
-Panner2d::allow_target_motion (bool yn)
-{
- allow_target = yn;
+ 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_shell->set_bypassed (!panner_shell->bypassed());
}
-Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs)
- : widget (p, h)
- , reset_button (_("Reset"))
+Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uint32_t inputs)
+ : ArdourWindow (_("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);
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 ();
{
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 ();
}
delete spinners.back();
spinners.erase (--spinners.end());
}
+#endif
+}
+
+void
+Panner2dWindow::bypass_toggled ()
+{
+ bool view = bypass_button.get_active ();
+ bool model = widget.get_panner_shell()->bypassed ();
+
+ if (model != view) {
+ widget.get_panner_shell()->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*)
+{
+ return true;
}