use new method in MidiPatchManager to use MIDNAM data when setting a MidiTimeAxisView

[ardour.git] / gtk2_ardour / control_slave_ui.h

diff --git a/gtk2_ardour/control_slave_ui.h b/gtk2_ardour/control_slave_ui.h
index 3443e1a79a8d57aee7af30e7ae66b84a814dab70..67c1dd31eb536452cf92857d85669b8e02b5b809 100644 (file)
--- a/gtk2_ardour/control_slave_ui.h
+++ b/gtk2_ardour/control_slave_ui.h
@@ -1,20 +1,21 @@
 /*
-  Copyright (C) 2016 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) 2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2017 Robin Gareus <robin@gareus.org>
+ *
+ * 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 __gtk2_ardour_control_slave_ui_h__
 #define __gtk2_ardour_control_slave_ui_h__
@@ -31,7 +32,7 @@
 
 #include "ardour/session_handle.h"
 
-#include "ardour_button.h"
+#include "widgets/ardour_button.h"
 
 namespace ARDOUR {
        class VCA;
@@ -41,15 +42,16 @@ namespace ARDOUR {
 
 class ControlSlaveUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-   public:
+public:
        ControlSlaveUI (ARDOUR::Session*);
+       ~ControlSlaveUI ();
        void set_stripable (boost::shared_ptr<ARDOUR::Stripable>);
 
-   private:
+private:
        boost::shared_ptr<ARDOUR::Stripable> stripable;
-       PBD::ScopedConnectionList connections;
-       PBD::ScopedConnectionList master_connections;
-       ArdourButton  initial_button;
+       PBD::ScopedConnectionList   connections;
+       PBD::ScopedConnectionList   master_connections;
+       ArdourWidgets::ArdourButton initial_button;
 
        void master_property_changed (PBD::PropertyChange const &);
        void update_vca_display ();
@@ -59,6 +61,8 @@ class ControlSlaveUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        bool vca_button_release (GdkEventButton* ev, uint32_t n);
        void add_vca_button (boost::shared_ptr<ARDOUR::VCA>);
        void unassign_all ();
+
+       Gtk::Menu* context_menu;
 };
 
 #endif /* __gtk2_ardour_control_slave_ui_h__ */