diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-17 19:47:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-17 19:47:53 +0000 |
| commit | 1b8e8303b25b6b013367741f2b47be3585b22cb3 (patch) | |
| tree | 9a91c56bbf6ded80dd0bd8a04f00405f13178980 /gtk2_ardour/panner2d.cc | |
| parent | 96cc6c3410c927ca14f50a52487e304967efdbf3 (diff) | |
draw speaker positions in 2d panner
git-svn-id: svn://localhost/ardour2/branches/3.0@8891 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/panner2d.cc')
| -rw-r--r-- | gtk2_ardour/panner2d.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 40618a2210..5054a9ee37 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -29,6 +29,7 @@ #include "pbd/error.h" #include "pbd/cartesian.h" #include "ardour/panner.h" +#include "ardour/speakers.h" #include "panner2d.h" #include "keyboard.h" @@ -139,15 +140,15 @@ Panner2d::reset (uint32_t n_inputs) (*x)->visible = false; } + vector<Speaker>& speakers (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); -#ifdef PANNER_HACKS - targets[n]->position = panner->output(n).position; + targets[n]->position = speakers[n].angles(); targets[n]->visible = true; -#endif } queue_draw (); @@ -590,7 +591,8 @@ Panner2d::toggle_bypass () } Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs) - : widget (p, h) + : ArdourDialog (_("Panner (2D)")) + , widget (p, h) , reset_button (_("Reset")) , bypass_button (_("Bypass")) , mute_button (_("Mute")) @@ -624,7 +626,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> 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 (); } |