Transfer 'lv2_bundled_search_path()' into 'libs/ardour/search_paths.cc'

diff --git a/libs/ardour/ardour/lv2_bundled_search_path.h b/libs/ardour/ardour/lv2_bundled_search_path.h
deleted file mode 100644 (file)
index 9314ee2..0000000
--- 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 83f730c35f407838bb672949c4f53a54498e8546..9deaecddffe69371dab0fc602ff8de899fcaf798 100644 (file)
--- 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 (file)
index 2454ea2..0000000
--- 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 <iostream>
-
-#include <glibmm/miscutils.h>
-
-#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 345c1a47ddf937744295c3d77adff96c3e921457..5c12524d78f4a0c4b4a427b7729435a5441a44f0 100644 (file)
--- 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 <locale.h>

diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
index 45a2e13974ef115d56b0ab011944923674104202..0fc9f0c4f5fe29d9da64fcb3351c6e4970063d09 100644 (file)
--- 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