smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

remove some useless buttons from vbap panner gui, make bypass button work

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8926 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-02-22 20:49:04 +00:00
parent 2bee25b447
commit 13bf1fff6f
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/audio_time_axis.cc
View file

@ -225,6 +225,8 @@ AudioTimeAxisView::ensure_pan_views (bool show)
set<Evoral::Parameter> params = _route->panner()->what_can_be_automated(); set<Evoral::Parameter> params = _route->panner()->what_can_be_automated();
set<Evoral::Parameter>::iterator p; 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) { for (p = params.begin(); p != params.end(); ++p) {
boost::shared_ptr<ARDOUR::AutomationControl> pan_control = _route->pannable()->automation_control(*p); boost::shared_ptr<ARDOUR::AutomationControl> pan_control = _route->pannable()->automation_control(*p);

19
gtk2_ardour/panner2d.cc
View file

@ -590,19 +590,17 @@ Panner2d::toggle_bypass ()
Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs) Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs)
: ArdourDialog (_("Panner (2D)")) : ArdourDialog (_("Panner (2D)"))
, widget (p, h) , widget (p, h)
, reset_button (_("Reset"))
, bypass_button (_("Bypass")) , bypass_button (_("Bypass"))
, mute_button (_("Mute"))
{ {
widget.set_name ("MixerPanZone"); widget.set_name ("MixerPanZone");
set_title (_("Panner")); set_title (_("Panner"));
widget.set_size_request (h, h); 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.set_spacing (6);
button_box.pack_start (reset_button, false, false);
button_box.pack_start (bypass_button, false, false); button_box.pack_start (bypass_button, false, false);
button_box.pack_start (mute_button, false, false);
spinner_box.set_spacing (6); spinner_box.set_spacing (6);
left_side.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 (button_box, false, false);
left_side.pack_start (spinner_box, false, false); left_side.pack_start (spinner_box, false, false);
reset_button.show ();
bypass_button.show (); bypass_button.show ();
mute_button.show ();
button_box.show (); button_box.show ();
spinner_box.show (); spinner_box.show ();
left_side.show (); left_side.show ();
@ -648,3 +644,14 @@ Panner2dWindow::reset (uint32_t n_inputs)
} }
#endif #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);
}
}

4
gtk2_ardour/panner2d.h
View file

@ -150,13 +150,13 @@ class Panner2dWindow : public ArdourDialog
Gtk::HBox hpacker; Gtk::HBox hpacker;
Gtk::VBox button_box; Gtk::VBox button_box;
Gtk::Button reset_button;
Gtk::ToggleButton bypass_button; Gtk::ToggleButton bypass_button;
Gtk::ToggleButton mute_button;
Gtk::VBox spinner_box; Gtk::VBox spinner_box;
Gtk::VBox left_side; Gtk::VBox left_side;
std::vector<Gtk::SpinButton*> spinners; std::vector<Gtk::SpinButton*> spinners;
void bypass_toggled ();
}; };
#endif /* __ardour_panner_2d_h__ */ #endif /* __ardour_panner_2d_h__ */