summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2014-03-10 14:10:04 +0000
committerJohn Emmas <johne53@tiscali.co.uk>2014-03-10 16:24:05 +0000
commit75c55b0aa0534b702ec6167f5b1aae6e637fdd69 (patch)
tree0327df7cbf41d369f487fe826845012bbc063c58 /libs/ardour/ardour
parent06fe0a51723aa7970347e0e2d478344ebefb084f (diff)
Transfer 'control_protocol_search_path()' into 'libs/ardour/search_paths.cc'
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/control_protocol_search_path.h40
-rw-r--r--libs/ardour/ardour/search_paths.h11
2 files changed, 11 insertions, 40 deletions
diff --git a/libs/ardour/ardour/control_protocol_search_path.h b/libs/ardour/ardour/control_protocol_search_path.h
deleted file mode 100644
index 4fe790ef80..0000000000
--- a/libs/ardour/ardour/control_protocol_search_path.h
+++ /dev/null
@@ -1,40 +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.
-
-*/
-
-#ifndef ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED
-#define ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED
-
-#include "pbd/search_path.h"
-
-namespace ARDOUR {
-
- /**
- * return a Searchpath containing directories in which to look for
- * control surface plugins.
- *
- * If ARDOUR_SURFACES_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 control_protocol_search_path ();
-
-} // namespace ARDOUR
-
-#endif
diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h
index 4f1bf13796..8367da80ff 100644
--- a/libs/ardour/ardour/search_paths.h
+++ b/libs/ardour/ardour/search_paths.h
@@ -36,6 +36,17 @@ namespace ARDOUR {
*/
LIBARDOUR_API PBD::Searchpath backend_search_path ();
+ /**
+ * return a Searchpath containing directories in which to look for
+ * control surface plugins.
+ *
+ * If ARDOUR_SURFACES_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 control_protocol_search_path ();
+
} // namespace ARDOUR
#endif /* __libardour_search_paths_h__ */