more progress on speakers/vbap etc. etc (still a work in progress)

[ardour.git] / gtk2_ardour / speaker_dialog.h

diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h
index 9a04896e7f47372a14e0de6e8a2f181e4062baf6..0ce99ac8d7f320b55bb51005bcdaed9ce56f18f9 100644 (file)
--- a/gtk2_ardour/speaker_dialog.h
+++ b/gtk2_ardour/speaker_dialog.h
@@ -24,6 +24,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/box.h>
 #include <gtkmm/adjustment.h>
+#include <gtkmm/aspectframe.h>
 
 #include "ardour/speakers.h"
 
@@ -35,12 +36,13 @@ class SpeakerDialog  : public ArdourDialog
     SpeakerDialog ();
     
     ARDOUR::Speakers get_speakers() const;
-    void set_speakers (const ARDOUR::Speakers&);
+    void set_speakers (boost::shared_ptr<ARDOUR::Speakers>);
 
   private:
     ARDOUR::Speakers speakers;
     Gtk::HBox        hbox;
     Gtk::VBox        side_vbox;
+    Gtk::AspectFrame aspect_frame;
     Gtk::DrawingArea darea;
     Gtk::Adjustment  azimuth_adjustment;
     Gtk::SpinButton  azimuth_spinner;
@@ -63,7 +65,7 @@ class SpeakerDialog  : public ArdourDialog
     void clamp_to_circle (double& x, double& y);
     void gtk_to_cart (PBD::CartesianVector& c) const;
     void cart_to_gtk (PBD::CartesianVector& c) const;
-    int find_closest_object (gdouble x, gdouble y, int& which);
+    int find_closest_object (gdouble x, gdouble y);
 };
 
 #endif /* __ardour_gtk_speaker_dialog_h__ */