Create 'libs/ardour/search_paths.cc/.h' and transfer backend_search_path() to it

diff --git a/libs/ardour/ardour/backend_search_path.h b/libs/ardour/ardour/backend_search_path.h
deleted file mode 100644 (file)
index e8a5082..0000000
--- a/libs/ardour/ardour/backend_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_backend_search_path_h__
-#define __ardour_backend_search_path_h__
-
-#include "pbd/search_path.h"
-
-namespace ARDOUR {
-
-       /**
-        * return a SearchPath containing directories in which to look for
-        * backend plugins.
-        *
-        * If ARDOUR_BACKEND_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 audio/MIDI
-        * backends.
-        */
-       PBD::Searchpath backend_search_path ();
-
-} // namespace ARDOUR
-
-#endif /* __ardour_backend_search_path_h__ */

diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h
new file mode 100644 (file)
index 0000000..4f1bf13
--- /dev/null
+++ b/libs/ardour/ardour/search_paths.h
@@ -0,0 +1,41 @@
+/*
+    Copyright (C) 2011 Tim Mayberry 
+    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 __libardour_search_paths_h__
+#define __libardour_search_paths_h__
+
+#include "pbd/search_path.h"
+
+namespace ARDOUR {
+
+       /**
+        * return a SearchPath containing directories in which to look for
+        * backend plugins.
+        *
+        * If ARDOUR_BACKEND_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 audio/MIDI
+        * backends.
+        */
+       LIBARDOUR_API PBD::Searchpath backend_search_path ();
+
+} // namespace ARDOUR
+
+#endif /* __libardour_search_paths_h__ */

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 0cb1a1e112e871f821a24a8af0ce9d70109a3c02..d6a511fdadab71bed5bcd0e31a0f3fb67e39dd9f 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -41,7 +41,7 @@
 #include "ardour/audio_port.h"
 #include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
-#include "ardour/backend_search_path.h"
+#include "ardour/search_paths.h"
 #include "ardour/buffer.h"
 #include "ardour/cycle_timer.h"
 #include "ardour/internal_send.h"

diff --git a/libs/ardour/backend_search_path.cc b/libs/ardour/backend_search_path.cc
deleted file mode 100644 (file)
index 4c5ff40..0000000
--- a/libs/ardour/backend_search_path.cc
+++ /dev/null
@@ -1,45 +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 <glibmm/miscutils.h>
-
-#include "ardour/backend_search_path.h"
-#include "ardour/directory_names.h"
-#include "ardour/filesystem_paths.h"
-
-namespace {
-       const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH";
-} // anonymous
-
-using namespace PBD;
-
-namespace ARDOUR {
-
-Searchpath
-backend_search_path ()
-{
-       Searchpath spath(user_config_directory ());
-       spath += ardour_dll_directory ();
-       spath.add_subdirectory_to_paths(backend_dir_name);
-
-       spath += Searchpath(Glib::getenv(backend_env_variable_name));
-       return spath;
-}
-
-} // namespace ARDOUR

diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc
new file mode 100644 (file)
index 0000000..243e520
--- /dev/null
+++ b/libs/ardour/search_paths.cc
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2011 Tim Mayberry 
+    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 <glibmm/miscutils.h>
+
+#include "ardour/search_paths.h"
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
+
+namespace {
+       const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH";
+} // anonymous
+
+using namespace PBD;
+
+namespace ARDOUR {
+
+Searchpath
+backend_search_path ()
+{
+       Searchpath spath(user_config_directory ());
+       spath += ardour_dll_directory ();
+       spath.add_subdirectory_to_paths(backend_dir_name);
+
+       spath += Searchpath(Glib::getenv(backend_env_variable_name));
+       return spath;
+}
+
+} // namespace ARDOUR

diff --git a/libs/ardour/test/audio_engine_test.cc b/libs/ardour/test/audio_engine_test.cc
index b992caf73ebf3f8dffbd8589ed2facd49edcac45..0bed81f8a6cccbaafef1607e01a8151a065493a4 100644 (file)
--- a/libs/ardour/test/audio_engine_test.cc
+++ b/libs/ardour/test/audio_engine_test.cc
@@ -2,7 +2,7 @@
 
 #include "ardour/audioengine.h"
 #include "ardour/audio_backend.h"
-#include "ardour/backend_search_path.h"
+#include "ardour/search_paths.h"
 
 #include "audio_engine_test.h"
 #include "test_common.h"