merged with 2.0-ongoing changes 2582-2605 (not thoroughly tested but it compiles...

[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 de177d0e3d91c115e2a2854b94f3e6c0a7a9a337..11c18175d13460288ca4e851643bc1f8b3539d16 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/file_utils.h>
 #include <pbd/error.h>
-#include <pbd/pathscanner.h>
 
 #include <control_protocol/control_protocol.h>
 
 #include <ardour/session.h>
 #include <ardour/control_protocol_manager.h>
+#include <ardour/control_protocol_search_path.h>
 
 using namespace ARDOUR;
 using namespace std;
@@ -43,7 +63,6 @@ ControlProtocolManager::~ControlProtocolManager()
        }
 
        control_protocol_info.clear();
-               
 }
 
 void
@@ -75,12 +94,14 @@ ControlProtocolManager::drop_session ()
                        delete *p;
                }
                control_protocols.clear ();
-
+               
                for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
-                       delete *p;
+                       // otherwise the ControlProtocol instances are not recreated in set_session
+                       if ((*p)->protocol) {
+                               (*p)->requested = true;
+                               (*p)->protocol = 0;
+                       }
                }
-
-               control_protocol_info.clear();
        }
 }
 
@@ -106,10 +127,6 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
        Glib::Mutex::Lock lm (protocols_lock);
        control_protocols.push_back (cpi.protocol);
 
-       if (cpi.state) {
-               cpi.protocol->set_state (*cpi.state);
-       }
-
        return cpi.protocol;
 }
 
@@ -152,15 +169,6 @@ ControlProtocolManager::teardown (ControlProtocolInfo& cpi)
        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 ()
 {
@@ -177,21 +185,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);
+
+       info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()) << endmsg;
 
-       delete found;
+       for (vector<sys::path>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) {
+               control_protocol_discover ((*i).to_string());
+       }
 }
 
 int
@@ -297,7 +308,6 @@ ControlProtocolManager::set_state (const XMLNode& node)
                                if ((prop = (*citer)->property (X_("name"))) != 0) {
                                        ControlProtocolInfo* cpi = cpi_by_name (prop->value());
                                        if (cpi) {
-
                                                if (!(*citer)->children().empty()) {
                                                        cpi->state = (*citer)->children().front ();
                                                } else {
@@ -324,10 +334,25 @@ ControlProtocolManager::get_state (void)
        Glib::Mutex::Lock lm (protocols_lock);
 
        for (list<ControlProtocolInfo*>::iterator i = control_protocol_info.begin(); i != control_protocol_info.end(); ++i) {
-               XMLNode* child = new XMLNode (X_("Protocol"));
-               child->add_property (X_("name"), (*i)->name);
-               child->add_property (X_("active"), (*i)->protocol ? "yes" : "no");
-               root->add_child_nocopy (*child);
+
+               XMLNode * child;
+
+               if ((*i)->protocol) {
+                       child = &((*i)->protocol->get_state());
+                       child->add_property (X_("active"), "yes");
+                       // should we update (*i)->state here?  probably.
+                       root->add_child_nocopy (*child);
+               }
+               else if ((*i)->state) {
+                       // keep ownership clear
+                       root->add_child_copy (*(*i)->state);
+               }
+               else {
+                       child = new XMLNode (X_("Protocol"));
+                       child->add_property (X_("name"), (*i)->name);
+                       child->add_property (X_("active"), "no");
+                       root->add_child_nocopy (*child);
+               }
        }
 
        return *root;