diff options
| -rw-r--r-- | libs/ardour/ardour/panner_search_path.h | 39 | ||||
| -rw-r--r-- | libs/ardour/ardour/search_paths.h | 11 | ||||
| -rw-r--r-- | libs/ardour/panner_manager.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/panner_search_path.cc | 46 | ||||
| -rw-r--r-- | libs/ardour/search_paths.cc | 13 |
5 files changed, 25 insertions, 86 deletions
diff --git a/libs/ardour/ardour/panner_search_path.h b/libs/ardour/ardour/panner_search_path.h deleted file mode 100644 index 23004223b4..0000000000 --- a/libs/ardour/ardour/panner_search_path.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 2011 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. -*/ - -#ifndef __ardour_panner_search_path_h__ -#define __ardour_panner_search_path_h__ - -#include "pbd/search_path.h" - -namespace ARDOUR { - - /** - * return a Searchpath containing directories in which to look for - * panner plugins. - * - * If ARDOUR_PANNER_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 panner_search_path (); - -} // namespace ARDOUR - -#endif /* __ardour_panner_search_path_h__ */ diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h index 808d33ae2a..6de5db3ef0 100644 --- a/libs/ardour/ardour/search_paths.h +++ b/libs/ardour/ardour/search_paths.h @@ -80,6 +80,17 @@ namespace ARDOUR { */ LIBARDOUR_API PBD::Searchpath midi_patch_search_path (); + /** + * return a Searchpath containing directories in which to look for + * panner plugins. + * + * If ARDOUR_PANNER_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 panner_search_path (); + } // namespace ARDOUR #endif /* __libardour_search_paths_h__ */ diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc index 0084a62285..00329c7bbe 100644 --- a/libs/ardour/panner_manager.cc +++ b/libs/ardour/panner_manager.cc @@ -30,7 +30,7 @@ #include "ardour/debug.h" #include "ardour/panner_manager.h" -#include "ardour/panner_search_path.h" +#include "ardour/search_paths.h" #include "i18n.h" diff --git a/libs/ardour/panner_search_path.cc b/libs/ardour/panner_search_path.cc deleted file mode 100644 index c400aa6c3b..0000000000 --- a/libs/ardour/panner_search_path.cc +++ /dev/null @@ -1,46 +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 <glibmm/miscutils.h> - -#include "ardour/panner_search_path.h" -#include "ardour/directory_names.h" -#include "ardour/filesystem_paths.h" - -namespace { - const char * const panner_env_variable_name = "ARDOUR_PANNER_PATH"; -} // anonymous - -using namespace PBD; - -namespace ARDOUR { - -Searchpath -panner_search_path () -{ - Searchpath spath(user_config_directory ()); - - spath += ardour_dll_directory (); - spath.add_subdirectory_to_paths(panner_dir_name); - spath += Searchpath(Glib::getenv(panner_env_variable_name)); - - return spath; -} - -} // namespace ARDOUR diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index ca489063d3..825a6c52b8 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -32,6 +32,7 @@ namespace { const char * const export_env_variable_name = "ARDOUR_EXPORT_FORMATS_PATH"; const char * const ladspa_env_variable_name = "LADSPA_PATH"; const char * const midi_patch_env_variable_name = "ARDOUR_MIDI_PATCH_PATH"; + const char * const panner_env_variable_name = "ARDOUR_PANNER_PATH"; } // anonymous using namespace PBD; @@ -126,4 +127,16 @@ midi_patch_search_path () return spath; } +Searchpath +panner_search_path () +{ + Searchpath spath(user_config_directory ()); + + spath += ardour_dll_directory (); + spath.add_subdirectory_to_paths(panner_dir_name); + spath += Searchpath(Glib::getenv(panner_env_variable_name)); + + return spath; +} + } // namespace ARDOUR |