MCP: various work on the button binding GUI

git-svn-id: svn://localhost/ardour2/branches/3.0@11997 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 30 insertions, 22 deletions

diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h
index 16a4c426ff..1c248fcbfb 100644
--- a/libs/surfaces/mackie/gui.h
+++ b/libs/surfaces/mackie/gui.h
@@ -1,19 +1,19 @@
 /*
-	Copyright (C) 2010 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) 2010-2012 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.
 */
 
 
@@ -32,18 +32,19 @@ namespace Gtk {
 
 class MackieControlProtocol;
 
+#include "button.h"
+
 #include "i18n.h"
 
 class MackieControlProtocolGUI : public Gtk::Notebook
 {
   public:
-    MackieControlProtocolGUI (MackieControlProtocol &);
-    
+	MackieControlProtocolGUI (MackieControlProtocol &);
+	
   private:
-    void surface_combo_changed ();
-    
     MackieControlProtocol& _cp;
     Gtk::ComboBoxText _surface_combo;
+    Gtk::ComboBoxText _profile_combo;
 
     struct AvailableActionColumns : public Gtk::TreeModel::ColumnRecord {
 	    AvailableActionColumns() {
@@ -57,7 +58,7 @@ class MackieControlProtocolGUI : public Gtk::Notebook
     struct FunctionKeyColumns : public Gtk::TreeModel::ColumnRecord {
 	FunctionKeyColumns() {
 		add (name);
-		add (number);
+		add (id);
 		add (plain);
 		add (shift);
 		add (control);
@@ -66,7 +67,7 @@ class MackieControlProtocolGUI : public Gtk::Notebook
 		add (shiftcontrol);
 	};
 	Gtk::TreeModelColumn<std::string> name;
-	Gtk::TreeModelColumn<uint32_t>    number;
+	Gtk::TreeModelColumn<Mackie::Button::ID>  id;
 	Gtk::TreeModelColumn<std::string> plain;
 	Gtk::TreeModelColumn<std::string> shift;
 	Gtk::TreeModelColumn<std::string> control;
@@ -83,8 +84,15 @@ class MackieControlProtocolGUI : public Gtk::Notebook
     Glib::RefPtr<Gtk::ListStore> function_key_model;
     Glib::RefPtr<Gtk::TreeStore> available_action_model;
 
-    void rebuild_function_key_editor ();
+    void build_available_action_menu ();
+    void refresh_function_key_editor ();
+    void build_function_key_editor ();
     void action_changed (const Glib::ustring &sPath, const Glib::ustring &text, Gtk::TreeModelColumnBase);
     Gtk::CellRendererCombo* make_action_renderer (Glib::RefPtr<Gtk::TreeStore> model, Gtk::TreeModelColumnBase);
+
+    void surface_combo_changed ();
+    void profile_combo_changed ();
+
+    std::map<std::string,std::string> action_map; // map from action names to paths
 };