From 8a44aa9aba635ea43429dc929ebcd0d3d57da23c Mon Sep 17 00:00:00 2001 From: John Emmas Date: Mon, 10 Mar 2014 14:42:45 +0000 Subject: Transfer 'lv2_bundled_search_path()' into 'libs/ardour/search_paths.cc' --- libs/ardour/ardour/lv2_bundled_search_path.h | 35 ------------------------ libs/ardour/ardour/search_paths.h | 6 ++++ libs/ardour/lv2_bundled_search_path.cc | 41 ---------------------------- libs/ardour/lv2_plugin.cc | 2 +- libs/ardour/search_paths.cc | 9 ++++++ 5 files changed, 16 insertions(+), 77 deletions(-) delete mode 100644 libs/ardour/ardour/lv2_bundled_search_path.h delete mode 100644 libs/ardour/lv2_bundled_search_path.cc (limited to 'libs') diff --git a/libs/ardour/ardour/lv2_bundled_search_path.h b/libs/ardour/ardour/lv2_bundled_search_path.h deleted file mode 100644 index 9314ee27d4..0000000000 --- a/libs/ardour/ardour/lv2_bundled_search_path.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Copyright (C) 2013 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_LV2_BUNDLED_SEARCH_PATH_INCLUDED -#define ARDOUR_LV2_BUNDLED_SEARCH_PATH_INCLUDED - -#include "pbd/search_path.h" - -namespace ARDOUR { - - /** - * return a Searchpath containing directories in which to look for - * lv2 plugins. - */ - PBD::Searchpath lv2_bundled_search_path (); - -} // namespace ARDOUR - -#endif diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h index 83f730c35f..9deaecddff 100644 --- a/libs/ardour/ardour/search_paths.h +++ b/libs/ardour/ardour/search_paths.h @@ -63,6 +63,12 @@ namespace ARDOUR { */ LIBARDOUR_API PBD::Searchpath ladspa_search_path (); + /** + * return a Searchpath containing directories in which to look for + * lv2 plugins. + */ + LIBARDOUR_API PBD::Searchpath lv2_bundled_search_path (); + } // namespace ARDOUR #endif /* __libardour_search_paths_h__ */ diff --git a/libs/ardour/lv2_bundled_search_path.cc b/libs/ardour/lv2_bundled_search_path.cc deleted file mode 100644 index 2454ea2ae1..0000000000 --- a/libs/ardour/lv2_bundled_search_path.cc +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright (C) 2013 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 - -#include - -#include "ardour/lv2_bundled_search_path.h" -#include "ardour/directory_names.h" -#include "ardour/filesystem_paths.h" - -using namespace PBD; - -namespace ARDOUR { - -Searchpath -lv2_bundled_search_path () -{ - Searchpath spath( ardour_dll_directory () ); - spath.add_subdirectory_to_paths ("LV2"); - - return spath; -} - -} // namespace ARDOUR diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 345c1a47dd..5c12524d78 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -48,7 +48,7 @@ #include "ardour/types.h" #include "ardour/utils.h" #include "ardour/worker.h" -#include "ardour/lv2_bundled_search_path.h" +#include "ardour/search_paths.h" #include "i18n.h" #include diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index 45a2e13974..0fc9f0c4f5 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -100,4 +100,13 @@ ladspa_search_path () return spath_env + spath; } +Searchpath +lv2_bundled_search_path () +{ + Searchpath spath( ardour_dll_directory () ); + spath.add_subdirectory_to_paths ("LV2"); + + return spath; +} + } // namespace ARDOUR -- cgit v1.2.3