diff options
| -rw-r--r-- | libs/ardour/ardour/control_protocol_search_path.h | 40 | ||||
| -rw-r--r-- | libs/ardour/ardour/search_paths.h | 11 | ||||
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/control_protocol_search_path.cc | 47 | ||||
| -rw-r--r-- | libs/ardour/search_paths.cc | 12 |
5 files changed, 24 insertions, 88 deletions
diff --git a/libs/ardour/ardour/control_protocol_search_path.h b/libs/ardour/ardour/control_protocol_search_path.h deleted file mode 100644 index 4fe790ef80..0000000000 --- a/libs/ardour/ardour/control_protocol_search_path.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - Copyright (C) 2007 Tim Mayberry - - 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. - -*/ - -#ifndef ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED -#define ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED - -#include "pbd/search_path.h" - -namespace ARDOUR { - - /** - * return a Searchpath containing directories in which to look for - * control surface plugins. - * - * If ARDOUR_SURFACES_PATH is defined then the Searchpath returned - * will contain only those directories specified in it, otherwise it will - * contain the user and system directories which may contain control - * surface plugins. - */ - PBD::Searchpath control_protocol_search_path (); - -} // namespace ARDOUR - -#endif diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h index 4f1bf13796..8367da80ff 100644 --- a/libs/ardour/ardour/search_paths.h +++ b/libs/ardour/ardour/search_paths.h @@ -36,6 +36,17 @@ namespace ARDOUR { */ LIBARDOUR_API PBD::Searchpath backend_search_path (); + /** + * return a Searchpath containing directories in which to look for + * control surface plugins. + * + * If ARDOUR_SURFACES_PATH is defined then the Searchpath returned + * will contain only those directories specified in it, otherwise it will + * contain the user and system directories which may contain control + * surface plugins. + */ + LIBARDOUR_API PBD::Searchpath control_protocol_search_path (); + } // namespace ARDOUR #endif /* __libardour_search_paths_h__ */ diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index d9cefb44f2..f3dc4f8c17 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -30,7 +30,7 @@ #include "ardour/debug.h" #include "ardour/control_protocol_manager.h" -#include "ardour/control_protocol_search_path.h" +#include "ardour/search_paths.h" using namespace ARDOUR; diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc deleted file mode 100644 index c5c5d0ba00..0000000000 --- a/libs/ardour/control_protocol_search_path.cc +++ /dev/null @@ -1,47 +0,0 @@ -/* - Copyright (C) 2007 Tim Mayberry - - 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 <iostream> - -#include <glibmm/miscutils.h> - -#include "ardour/control_protocol_search_path.h" -#include "ardour/directory_names.h" -#include "ardour/filesystem_paths.h" - -namespace { - const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH"; -} // anonymous - -using namespace PBD; - -namespace ARDOUR { - -Searchpath -control_protocol_search_path () -{ - Searchpath spath(user_config_directory ()); - spath += ardour_dll_directory (); - spath.add_subdirectory_to_paths (surfaces_dir_name); - - spath += Searchpath(Glib::getenv(surfaces_env_variable_name)); - return spath; -} - -} // namespace ARDOUR diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index 243e520776..d162706719 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -26,6 +26,7 @@ namespace { const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH"; + const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH"; } // anonymous using namespace PBD; @@ -43,4 +44,15 @@ backend_search_path () return spath; } +Searchpath +control_protocol_search_path () +{ + Searchpath spath(user_config_directory ()); + spath += ardour_dll_directory (); + spath.add_subdirectory_to_paths (surfaces_dir_name); + + spath += Searchpath(Glib::getenv(surfaces_env_variable_name)); + return spath; +} + } // namespace ARDOUR |