MCP: loading device info files basically operational

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

1 files changed, 2 insertions, 5 deletions

diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 177a8f2ef2..8834e7a365 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -112,9 +112,8 @@ class MackieControlProtocol
 	virtual ~MackieControlProtocol();
 
 	static MackieControlProtocol* instance() { return _instance; }
-
-	const std::string& device_name() const { return _device_name; }
-	static std::vector<std::string> get_possible_devices ();
+	
+	const Mackie::DeviceInfo& device_info() const { return _device_info; }
 
 	int set_active (bool yn);
 
@@ -238,7 +237,6 @@ class MackieControlProtocol
 
 	static MackieControlProtocol* _instance;
 	
-	std::string              _device_name;
 	Mackie::DeviceInfo       _device_info;
 	sigc::connection          periodic_connection;
 	uint32_t                 _current_initial_bank;
@@ -268,7 +266,6 @@ class MackieControlProtocol
 	std::vector<std::string> _f_actions;
 	ButtonMap                 button_map;
 
-	std::string find_device_info_file (const std::string& name);
 	void load_device_info (const std::string&);
 	void create_surfaces ();
 	void port_connected_or_disconnected (std::string, std::string, bool);