Unconditionally save instant.xml on session-close

[ardour.git] / gtk2_ardour / speaker_dialog.h

diff --git a/gtk2_ardour/speaker_dialog.h b/gtk2_ardour/speaker_dialog.h
index 62bcc277f273a4832e11d05c385e732be3f932d5..6b01d622dc8e312cd34f23d093b7d86f7bb8b2d1 100644 (file)
--- a/gtk2_ardour/speaker_dialog.h
+++ b/gtk2_ardour/speaker_dialog.h
@@ -1,21 +1,22 @@
 /*
-    Copyright (C) 2011 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2011-2014 David Robillard <d@drobilla.net>
+ * Copyright (C) 2011-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2011 Carl Hetherington <carl@carlh.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #ifndef __ardour_gtk_speaker_dialog_h__
 #define __ardour_gtk_speaker_dialog_h__
@@ -28,16 +29,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<ARDOUR::Speakers> get_speakers() const;
        void set_speakers (boost::shared_ptr<ARDOUR::Speakers>);
-       
+
 private:
        boost::weak_ptr<ARDOUR::Speakers> _speakers;
        Gtk::HBox        hbox;
@@ -48,7 +49,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 +63,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;