Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.

[ardour.git] / libs / ardour / control_protocol_manager.cc

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 899790dddc75f8156d0f908791b98ed66cafeadc..8546a41e6652cfda426bd1a10c24dcd32f3bcbaa 100644 (file)
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -1,13 +1,33 @@
+/*
+    Copyright (C) 2000-2007 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.
+
+*/
+
 #include <dlfcn.h>
 
-#include <pbd/compose.h>
-#include <pbd/error.h>
-#include <pbd/pathscanner.h>
+#include "pbd/compose.h"
+#include "pbd/file_utils.h"
+#include "pbd/error.h"
 
-#include <control_protocol/control_protocol.h>
+#include "control_protocol/control_protocol.h"
 
-#include <ardour/session.h>
-#include <ardour/control_protocol_manager.h>
+#include "ardour/session.h"
+#include "ardour/control_protocol_manager.h"
+#include "ardour/control_protocol_search_path.h"
 
 using namespace ARDOUR;
 using namespace std;
@@ -19,12 +39,9 @@ ControlProtocolManager* ControlProtocolManager::_instance = 0;
 const string ControlProtocolManager::state_node_name = X_("ControlProtocols");
 
 ControlProtocolManager::ControlProtocolManager ()
+       : _session (0)
 {
-       if (_instance == 0) {
-               _instance = this;
-       }
 
-       _session = 0;
 }
 
 ControlProtocolManager::~ControlProtocolManager()
@@ -37,7 +54,7 @@ ControlProtocolManager::~ControlProtocolManager()
 
        control_protocols.clear ();
 
-       
+
        for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
                delete (*p);
        }
@@ -74,10 +91,13 @@ ControlProtocolManager::drop_session ()
                        delete *p;
                }
                control_protocols.clear ();
-               
+
                for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
                        // otherwise the ControlProtocol instances are not recreated in set_session
-                       (*p)->requested = true;
+                       if ((*p)->protocol) {
+                               (*p)->requested = true;
+                               (*p)->protocol = 0;
+                       }
                }
        }
 }
@@ -123,7 +143,7 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
        }
 
        cpi.descriptor->destroy (cpi.descriptor, cpi.protocol);
-       
+
        {
                Glib::Mutex::Lock lm (protocols_lock);
                list<ControlProtocol*>::iterator p = find (control_protocols.begin(), control_protocols.end(), cpi.protocol);
@@ -140,21 +160,12 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
                        cerr << "Programming error: ControlProtocolManager::teardown() called for " << cpi.name << ", but it was not found in control_protocol_info" << endl;
                }
        }
-       
+
        cpi.protocol = 0;
        dlclose (cpi.descriptor->module);
        return 0;
 }
 
-static bool protocol_filter (const string& str, void *arg)
-{
-       /* Not a dotfile, has a prefix before a period, suffix is "so", or "dylib" */
-       
-       return str[0] != '.' 
-         && ((str.length() > 3 && str.find (".so") == (str.length() - 3))
-             || (str.length() > 6 && str.find (".dylib") == (str.length() - 6)));
-}
-
 void
 ControlProtocolManager::load_mandatory_protocols ()
 {
@@ -171,21 +182,24 @@ ControlProtocolManager::load_mandatory_protocols ()
 }
 
 void
-ControlProtocolManager::discover_control_protocols (string path)
+ControlProtocolManager::discover_control_protocols ()
 {
-       vector<string *> *found;
-       PathScanner scanner;
+       vector<sys::path> cp_modules;
 
-       info << string_compose (_("looking for control protocols in %1"), path) << endmsg;
+       Glib::PatternSpec so_extension_pattern("*.so");
+       Glib::PatternSpec dylib_extension_pattern("*.dylib");
 
-       found = scanner (path, protocol_filter, 0, false, true);
+       find_matching_files_in_search_path (control_protocol_search_path (),
+                       so_extension_pattern, cp_modules);
 
-       for (vector<string*>::iterator i = found->begin(); i != found->end(); ++i) {
-               control_protocol_discover (**i);
-               delete *i;
-       }
+       find_matching_files_in_search_path (control_protocol_search_path (),
+                       dylib_extension_pattern, cp_modules);
 
-       delete found;
+       info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()) << endmsg;
+
+       for (vector<sys::path>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) {
+               control_protocol_discover ((*i).to_string());
+       }
 }
 
 int
@@ -209,9 +223,9 @@ ControlProtocolManager::control_protocol_discover (string path)
                        cpi->mandatory = descriptor->mandatory;
                        cpi->supports_feedback = descriptor->supports_feedback;
                        cpi->state = 0;
-                       
+
                        control_protocol_info.push_back (cpi);
-                       
+
                        info << string_compose(_("Control surface protocol discovered: \"%1\""), cpi->name) << endmsg;
                }
 
@@ -274,7 +288,7 @@ ControlProtocolManager::cpi_by_name (string name)
 }
 
 int
-ControlProtocolManager::set_state (const XMLNode& node)
+ControlProtocolManager::set_state (const XMLNode& node, int version)
 {
        XMLNodeList clist;
        XMLNodeConstIterator citer;
@@ -287,7 +301,7 @@ ControlProtocolManager::set_state (const XMLNode& node)
 
                        prop = (*citer)->property (X_("active"));
 
-                       if (prop && prop->value() == X_("yes")) {
+                       if (prop && string_is_affirmative (prop->value())) {
                                if ((prop = (*citer)->property (X_("name"))) != 0) {
                                        ControlProtocolInfo* cpi = cpi_by_name (prop->value());
                                        if (cpi) {
@@ -296,7 +310,7 @@ ControlProtocolManager::set_state (const XMLNode& node)
                                                } else {
                                                        cpi->state = 0;
                                                }
-                                               
+
                                                if (_session) {
                                                        instantiate (*cpi);
                                                } else {
@@ -305,7 +319,7 @@ ControlProtocolManager::set_state (const XMLNode& node)
                                        }
                                }
                        }
-               }    
+               }
        }
        return 0;
 }
@@ -371,3 +385,13 @@ ControlProtocolManager::set_protocol_states (const XMLNode& node)
                cpi->state = new XMLNode (*child);
        }
 }
+
+ControlProtocolManager&
+ControlProtocolManager::instance ()
+{
+       if (_instance == 0) {
+               _instance = new ControlProtocolManager ();
+       }
+
+       return *_instance;
+}