X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fspeaker_dialog.h;h=95217003802168da9626e5326f64872fd2787378;hb=e79b2e376f87bb0c3f5f5337fcb4ed9cba28a2c0;hp=62bcc277f273a4832e11d05c385e732be3f932d5;hpb=cbf530b6b57e391e28f148e8805da817c97c9d1d;p=ardour.git diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h index 62bcc277f2..9521700380 100644 --- a/gtk2_ardour/speaker_dialog.h +++ b/gtk2_ardour/speaker_dialog.h @@ -28,16 +28,16 @@ #include "ardour/speakers.h" -#include "ardour_dialog.h" +#include "ardour_window.h" -class SpeakerDialog : public ArdourDialog +class SpeakerDialog : public ArdourWindow { public: SpeakerDialog (); - + boost::shared_ptr get_speakers() const; void set_speakers (boost::shared_ptr); - + private: boost::weak_ptr _speakers; Gtk::HBox hbox; @@ -48,7 +48,6 @@ private: Gtk::SpinButton azimuth_spinner; Gtk::Button add_speaker_button; Gtk::Button remove_speaker_button; - int32_t selected_speaker; int width; ///< width of the circle int height; ///< height of the circle int x_origin; ///< x origin of our stuff within the drawing area @@ -63,14 +62,14 @@ private: PBD::ScopedConnection selected_speaker_connection; bool ignore_speaker_position_change; bool ignore_azimuth_change; - + bool darea_expose_event (GdkEventExpose*); void darea_size_allocate (Gtk::Allocation& alloc); bool darea_motion_notify_event (GdkEventMotion *ev); bool handle_motion (gint evx, gint evy, GdkModifierType state); bool darea_button_press_event (GdkEventButton *ev); bool darea_button_release_event (GdkEventButton *ev); - + void clamp_to_circle (double& x, double& y); void gtk_to_cart (PBD::CartesianVector& c) const; void cart_to_gtk (PBD::CartesianVector& c) const;