diff options
| -rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/panner2d.cc | 19 | ||||
| -rw-r--r-- | gtk2_ardour/panner2d.h | 4 |
3 files changed, 17 insertions, 8 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index f43d3739cc..c516985671 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -225,6 +225,8 @@ AudioTimeAxisView::ensure_pan_views (bool show) set<Evoral::Parameter> params = _route->panner()->what_can_be_automated(); set<Evoral::Parameter>::iterator p; + cerr << _route->name() << " the panner has " << params.size() << " params that can be automated\n"; + for (p = params.begin(); p != params.end(); ++p) { boost::shared_ptr<ARDOUR::AutomationControl> pan_control = _route->pannable()->automation_control(*p); diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index f662463aed..a953105c1a 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -590,19 +590,17 @@ Panner2d::toggle_bypass () Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs) : ArdourDialog (_("Panner (2D)")) , widget (p, h) - , reset_button (_("Reset")) , 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); @@ -610,9 +608,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> 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 (); @@ -648,3 +644,14 @@ 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); + } +} diff --git a/gtk2_ardour/panner2d.h b/gtk2_ardour/panner2d.h index 9ace95cb50..5b2c936b6a 100644 --- a/gtk2_ardour/panner2d.h +++ b/gtk2_ardour/panner2d.h @@ -150,13 +150,13 @@ class Panner2dWindow : public ArdourDialog Gtk::HBox hpacker; Gtk::VBox button_box; - Gtk::Button reset_button; Gtk::ToggleButton bypass_button; - Gtk::ToggleButton mute_button; Gtk::VBox spinner_box; Gtk::VBox left_side; std::vector<Gtk::SpinButton*> spinners; + + void bypass_toggled (); }; #endif /* __ardour_panner_2d_h__ */ |