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

4 files changed, 12 insertions, 9 deletions

diff --git a/libs/ardour/ardour/backend_search_path.h b/libs/ardour/ardour/search_paths.h
index e8a5082c71..4f1bf13796 100644
--- a/libs/ardour/ardour/backend_search_path.h
+++ b/libs/ardour/ardour/search_paths.h
@@ -1,5 +1,6 @@
 /*
-    Copyright (C) 2011 Paul Davis
+    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
@@ -14,10 +15,11 @@
     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__
+#ifndef __libardour_search_paths_h__
+#define __libardour_search_paths_h__
 
 #include "pbd/search_path.h"
 
@@ -32,8 +34,8 @@ namespace ARDOUR {
 	 * contain the user and system directories which may contain audio/MIDI
 	 * backends.
 	 */
-	PBD::Searchpath backend_search_path ();
+	LIBARDOUR_API PBD::Searchpath backend_search_path ();
 
 } // namespace ARDOUR
 
-#endif /* __ardour_backend_search_path_h__ */
+#endif /* __libardour_search_paths_h__ */
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 0cb1a1e112..d6a511fdad 100644
--- 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/search_paths.cc
index 4c5ff40e7d..243e520776 100644
--- a/libs/ardour/backend_search_path.cc
+++ b/libs/ardour/search_paths.cc
@@ -1,5 +1,6 @@
 /*
-    Copyright (C) 2013 Paul Davis
+    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
@@ -19,7 +20,7 @@
 
 #include <glibmm/miscutils.h>
 
-#include "ardour/backend_search_path.h"
+#include "ardour/search_paths.h"
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 
diff --git a/libs/ardour/test/audio_engine_test.cc b/libs/ardour/test/audio_engine_test.cc
index b992caf73e..0bed81f8a6 100644
--- 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"