From f3300ec03ce82628aa4eb57565b1c05acb2915e9 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 5 Mar 2014 08:47:54 +0100
Subject: move vst detection code into ARDOUR namespace

---
 libs/ardour/ardour/vst_info_file.h | 8 ++++++++
 libs/ardour/vst_info_file.cc       | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/libs/ardour/ardour/vst_info_file.h b/libs/ardour/ardour/vst_info_file.h
index 4e646194f0..5e613801a6 100644
--- a/libs/ardour/ardour/vst_info_file.h
+++ b/libs/ardour/ardour/vst_info_file.h
@@ -25,6 +25,10 @@
 #include "ardour/vst_types.h"
 #include <vector>
 
+#ifndef VST_SCANNER_APP
+namespace ARDOUR {
+#endif
+
 enum VSTScanMode {
 	VST_SCAN_CACHE_ONLY,
 	VST_SCAN_USE_APP,
@@ -43,5 +47,9 @@ LIBARDOUR_API extern std::vector<VSTInfo*> * vstfx_get_info_lx (char *, enum VST
 LIBARDOUR_API extern std::vector<VSTInfo*> * vstfx_get_info_fst (char *, enum VSTScanMode mode = VST_SCAN_USE_APP);
 #endif
 
+#ifndef VST_SCANNER_APP
+} // namespace
+#endif
+
 #endif /* __vstfx_h__ */
 
diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc
index 34e1b0ed0c..acb2d66579 100644
--- a/libs/ardour/vst_info_file.cc
+++ b/libs/ardour/vst_info_file.cc
@@ -65,6 +65,9 @@
 
 
 using namespace std;
+#ifndef VST_SCANNER_APP
+namespace ARDOUR {
+#endif
 
 /* prototypes */
 #ifdef WINDOWS_VST_SUPPORT
@@ -1010,3 +1013,7 @@ vstfx_get_info_fst (char* dllpath, enum VSTScanMode mode)
 	return vstfx_get_info(dllpath, ARDOUR::Windows_VST, mode);
 }
 #endif
+
+#ifndef VST_SCANNER_APP
+} // namespace
+#endif
-- 
cgit v1.2.3