X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fspeaker_dialog.cc;h=3578682422a0842e270c2384f249bf3eb335d401;hb=7b57d47e2592641181d0e87b51ee93e89b4068f2;hp=3b2418ec0c7dce1a8d302274d1e3ec3dce1f70bb;hpb=88ff3c0bd120090f38d7b5f8d46236c0f296dde0;p=ardour.git diff --git a/gtk2_ardour/speaker_dialog.cc b/gtk2_ardour/speaker_dialog.cc index 3b2418ec0c..3578682422 100644 --- a/gtk2_ardour/speaker_dialog.cc +++ b/gtk2_ardour/speaker_dialog.cc @@ -22,6 +22,7 @@ #include "gtkmm2ext/keyboard.h" #include "speaker_dialog.h" +#include "gui_thread.h" #include "i18n.h" @@ -32,22 +33,23 @@ using namespace Gtk; using namespace Gtkmm2ext; SpeakerDialog::SpeakerDialog () - : ArdourDialog (_("Speaker Configuration")) - , aspect_frame ("", 0.5, 0.5, 1.0, false) + : ArdourWindow (_("Speaker Configuration")) + , aspect_frame ("", 0.5, 0.5, 1.5, false) , azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0) , azimuth_spinner (azimuth_adjustment) , add_speaker_button (_("Add Speaker")) - , use_system_button (_("Use System")) - + , remove_speaker_button (_("Remove Speaker")) + /* initialize to 0 so that set_selected works below */ + , selected_index (0) + , ignore_speaker_position_change (false) + , ignore_azimuth_change (false) { side_vbox.set_homogeneous (false); - side_vbox.set_border_width (9); + side_vbox.set_border_width (6); side_vbox.set_spacing (6); - side_vbox.pack_start (azimuth_spinner, false, false); side_vbox.pack_start (add_speaker_button, false, false); - side_vbox.pack_start (use_system_button, false, false); - aspect_frame.set_size_request (200, 200); + aspect_frame.set_size_request (300, 200); aspect_frame.set_shadow_type (SHADOW_NONE); aspect_frame.add (darea); @@ -56,8 +58,17 @@ SpeakerDialog::SpeakerDialog () hbox.pack_start (aspect_frame, true, true); hbox.pack_start (side_vbox, false, false); - get_vbox()->pack_start (hbox); - get_vbox()->show_all (); + HBox* current_speaker_hbox = manage (new HBox); + current_speaker_hbox->set_spacing (4); + current_speaker_hbox->pack_start (*manage (new Label (_("Azimuth:"))), false, false); + current_speaker_hbox->pack_start (azimuth_spinner, true, true); + current_speaker_hbox->pack_start (remove_speaker_button, true, true); + + VBox* vbox = manage (new VBox); + vbox->pack_start (hbox); + vbox->pack_start (*current_speaker_hbox, true, true); + vbox->show_all (); + add (*vbox); darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); @@ -68,25 +79,37 @@ SpeakerDialog::SpeakerDialog () darea.signal_motion_notify_event().connect (sigc::mem_fun (*this, &SpeakerDialog::darea_motion_notify_event)); add_speaker_button.signal_clicked().connect (sigc::mem_fun (*this, &SpeakerDialog::add_speaker)); + remove_speaker_button.signal_clicked().connect (sigc::mem_fun (*this, &SpeakerDialog::remove_speaker)); + azimuth_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SpeakerDialog::azimuth_changed)); drag_index = -1; + + /* selected index initialised to 0 above; this will set `no selection' and + sensitize widgets accordingly. + */ + set_selected (-1); } void -SpeakerDialog::set_speakers (boost::shared_ptr s) +SpeakerDialog::set_speakers (boost::shared_ptr s) { - speakers = *s; + _speakers = s; } -Speakers +boost::shared_ptr SpeakerDialog::get_speakers () const { - return speakers; + return _speakers.lock (); } bool SpeakerDialog::darea_expose_event (GdkEventExpose* event) { + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return false; + } + gint x, y; cairo_t* cr; @@ -109,7 +132,7 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event) 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_stroke (cr); @@ -120,9 +143,9 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event) cairo_stroke (cr); 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; @@ -131,28 +154,42 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event) arc_radius = 4.0; } - uint32_t n = 0; - for (vector::iterator i = speakers.speakers().begin(); i != speakers.speakers().end(); ++i) { - + int n = 0; + for (vector::iterator i = speakers->speakers().begin(); i != speakers->speakers().end(); ++i) { + Speaker& s (*i); CartesianVector c (s.coords()); - + cart_to_gtk (c); - + + /* We have already moved our plotting origin to x_origin, y_origin, + so compensate for that. + */ + c.x -= x_origin; + c.y -= y_origin; + x = (gint) floor (c.x); y = (gint) floor (c.y); - + /* XXX need to shift circles so that they are centered on the circle */ - + cairo_arc (cr, x, y, arc_radius, 0, 2.0 * M_PI); - cairo_set_source_rgb (cr, 0.8, 0.2, 0.1); + if (selected_index == n) { + cairo_set_source_rgb (cr, 0.8, 0.8, 0.2); + } else { + 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), "%d:%d", n+1, (int) lrint (s.angles().azi)); + if (n == selected_index) { + snprintf (buf, sizeof (buf), "%d:%d", n+1, (int) lrint (s.angles().azi)); + } else { + snprintf (buf, sizeof (buf), "%d", n + 1); + } cairo_show_text (cr, buf); ++n; } @@ -160,14 +197,14 @@ SpeakerDialog::darea_expose_event (GdkEventExpose* event) cairo_destroy (cr); return true; - + } void SpeakerDialog::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 @@ -180,8 +217,8 @@ SpeakerDialog::cart_to_gtk (CartesianVector& c) const 0,height */ - c.x = (width / 2) * (c.x + 1); - c.y = (height / 2) * (1 - c.y); + c.x = (width / 2) * (c.x + 1) + x_origin; + c.y = (height / 2) * (1 - c.y) + y_origin; /* XXX z-axis not handled - 2D for now */ } @@ -189,8 +226,8 @@ SpeakerDialog::cart_to_gtk (CartesianVector& c) const void SpeakerDialog::gtk_to_cart (CartesianVector& c) const { - c.x = (c.x / (width / 2.0)) - 1.0; - c.y = -((c.y / (height / 2.0)) - 1.0); + c.x = ((c.x - x_origin) / (width / 2.0)) - 1.0; + c.y = -(((c.y - y_origin) / (height / 2.0)) - 1.0); /* XXX z-axis not handled - 2D for now */ } @@ -212,18 +249,30 @@ SpeakerDialog::darea_size_allocate (Gtk::Allocation& alloc) width = alloc.get_width(); height = alloc.get_height(); + /* The allocation will (should) be rectangualar, but make the basic + drawing square; space to the right of the square is for over-hanging + text labels. + */ + width = height; + if (height > 100) { width -= 20; height -= 20; } - x_origin = (alloc.get_width() - width) / 2; + /* Put the x origin to the left of the rectangular allocation */ + x_origin = (alloc.get_width() - width) / 3; y_origin = (alloc.get_height() - height) / 2; } bool SpeakerDialog::darea_button_press_event (GdkEventButton *ev) { + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return false; + } + GdkModifierType state; if (ev->type == GDK_2BUTTON_PRESS && ev->button == 1) { @@ -236,14 +285,17 @@ SpeakerDialog::darea_button_press_event (GdkEventButton *ev) case 1: case 2: { - drag_index = find_closest_object (ev->x, ev->y); + int const index = find_closest_object (ev->x, ev->y); + set_selected (index); + + drag_index = index; int const drag_x = (int) floor (ev->x); int const drag_y = (int) floor (ev->y); state = (GdkModifierType) ev->state; if (drag_index >= 0) { CartesianVector c; - speakers.speakers()[drag_index].angles().cartesian (c); + speakers->speakers()[drag_index].angles().cartesian (c); cart_to_gtk (c); drag_offset_x = drag_x - x_origin - c.x; drag_offset_y = drag_y - y_origin - c.y; @@ -263,6 +315,11 @@ SpeakerDialog::darea_button_press_event (GdkEventButton *ev) bool SpeakerDialog::darea_button_release_event (GdkEventButton *ev) { + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return false; + } + gint x, y; GdkModifierType state; bool ret = false; @@ -274,8 +331,8 @@ SpeakerDialog::darea_button_release_event (GdkEventButton *ev) state = (GdkModifierType) ev->state; if (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier)) { - - for (vector::iterator i = speakers.speakers().begin(); i != speakers.speakers().end(); ++i) { + + for (vector::iterator i = speakers->speakers().begin(); i != speakers->speakers().end(); ++i) { /* XXX DO SOMETHING TO SET SPEAKER BACK TO "normal" */ } @@ -300,25 +357,30 @@ SpeakerDialog::darea_button_release_event (GdkEventButton *ev) break; } - + drag_index = -1; return ret; } int -SpeakerDialog::find_closest_object (gdouble x, gdouble y) +SpeakerDialog::find_closest_object (gdouble x, gdouble y) { + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return -1; + } + float distance; float best_distance = FLT_MAX; int n = 0; int which = -1; - for (vector::iterator i = speakers.speakers().begin(); i != speakers.speakers().end(); ++i, ++n) { + for (vector::iterator i = speakers->speakers().begin(); i != speakers->speakers().end(); ++i, ++n) { Speaker& candidate (*i); CartesianVector c; - + candidate.angles().cartesian (c); cart_to_gtk (c); @@ -332,7 +394,7 @@ SpeakerDialog::find_closest_object (gdouble x, gdouble y) } } - if (best_distance > 20) { // arbitrary + if (best_distance > 20) { // arbitrary return -1; } @@ -359,6 +421,11 @@ SpeakerDialog::darea_motion_notify_event (GdkEventMotion *ev) bool SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) { + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return false; + } + if (drag_index < 0) { return false; } @@ -382,7 +449,7 @@ SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) { CartesianVector c; bool need_move = false; - Speaker& moving (speakers.speakers()[drag_index]); + Speaker& moving (speakers->speakers()[drag_index]); moving.angles().cartesian (c); cart_to_gtk (c); @@ -401,7 +468,7 @@ SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) /* position actual signal on circle */ clamp_to_circle (cp.x, cp.y); - + /* generate an angular representation and set drag target (GUI) position */ AngularVector a; @@ -412,7 +479,7 @@ SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) queue_draw (); } - } + } return true; } @@ -420,6 +487,99 @@ SpeakerDialog::handle_motion (gint evx, gint evy, GdkModifierType state) void SpeakerDialog::add_speaker () { - speakers.add_speaker (PBD::AngularVector (0, 0, 0)); + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return; + } + + speakers->add_speaker (PBD::AngularVector (0, 0, 0)); + queue_draw (); +} + +void +SpeakerDialog::set_selected (int i) +{ + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return; + } + + if (i == selected_index) { + return; + } + + selected_index = i; + queue_draw (); + + selected_speaker_connection.disconnect (); + + azimuth_spinner.set_sensitive (selected_index != -1); + remove_speaker_button.set_sensitive (selected_index != -1); + + if (selected_index != -1) { + azimuth_adjustment.set_value (speakers->speakers()[selected_index].angles().azi); + speakers->speakers()[selected_index].PositionChanged.connect ( + selected_speaker_connection, MISSING_INVALIDATOR, + boost::bind (&SpeakerDialog::speaker_position_changed, this), + gui_context () + ); + } +} + +void +SpeakerDialog::azimuth_changed () +{ + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return; + } + + assert (selected_index != -1); + + if (ignore_azimuth_change) { + return; + } + + ignore_speaker_position_change = true; + speakers->move_speaker (speakers->speakers()[selected_index].id, PBD::AngularVector (azimuth_adjustment.get_value (), 0, 0)); + ignore_speaker_position_change = false; + + queue_draw (); +} + +void +SpeakerDialog::speaker_position_changed () +{ + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return; + } + + assert (selected_index != -1); + + if (ignore_speaker_position_change) { + return; + } + + ignore_azimuth_change = true; + azimuth_adjustment.set_value (speakers->speakers()[selected_index].angles().azi); + ignore_azimuth_change = false; + + queue_draw (); +} + +void +SpeakerDialog::remove_speaker () +{ + boost::shared_ptr speakers = _speakers.lock (); + if (!speakers) { + return; + } + + assert (selected_index != -1); + + speakers->remove_speaker (speakers->speakers()[selected_index].id); + set_selected (-1); + queue_draw (); }