Merge branch 'expvis' of https://github.com/mojofunk/ardour into exportvis

6 files changed, 10 insertions, 55 deletions

diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h
index 1da4688950..cdfd4971c8 100644
--- a/libs/ardour/ardour/audio_backend.h
+++ b/libs/ardour/ardour/audio_backend.h
@@ -32,14 +32,13 @@
 #include "ardour/types.h"
 #include "ardour/audioengine.h"
 #include "ardour/port_engine.h"
-#include "ardour/visibility.h"
 
 #ifdef ARDOURBACKEND_DLL_EXPORTS // defined if we are building the ARDOUR Panners DLLs (instead of using them)
-    #define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_EXPORT
+    #define ARDOURBACKEND_API LIBARDOUR_DLL_EXPORT
 #else
-    #define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_IMPORT
+    #define ARDOURBACKEND_API LIBARDOUR_DLL_IMPORT
 #endif 
-#define ARDOURBACKEND_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
+#define ARDOURBACKEND_LOCAL LIBARDOUR_DLL_LOCAL
 
 namespace ARDOUR {
 
diff --git a/libs/ardour/ardour/libardour_visibility.h b/libs/ardour/ardour/libardour_visibility.h
index a41afca14d..917307732c 100644
--- a/libs/ardour/ardour/libardour_visibility.h
+++ b/libs/ardour/ardour/libardour_visibility.h
@@ -20,12 +20,7 @@
 #ifndef __libardour_libardour_visibility_h__
 #define __libardour_libardour_visibility_h__
 
-/* _WIN32 is defined by most compilers targetting Windows, but within the
- * ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
- * on how a Windows build is built.
- */
-
-#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
+#if defined(COMPILER_MSVC)
   #define LIBARDOUR_DLL_IMPORT __declspec(dllimport)
   #define LIBARDOUR_DLL_EXPORT __declspec(dllexport)
   #define LIBARDOUR_DLL_LOCAL
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index ade8fa7904..01a2cc9054 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -36,7 +36,7 @@
 
 #include <glibmm/threads.h>
 
-#include <ltc/ltc.h>
+#include <ltc.h>
 
 #include "pbd/error.h"
 #include "pbd/event_loop.h"
@@ -141,7 +141,7 @@ class WindowsVSTPlugin;
 
 extern void setup_enum_writer ();
 
-class LIBARDOUR_API LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager
+class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager
 {
   public:
 	enum RecordState {
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 8c50aea5d3..cb1e3650c5 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -25,7 +25,7 @@
 #include <glibmm/threads.h>
 
 #include <jack/jack.h>
-#include <ltc/ltc.h>
+#include <ltc.h>
 
 #include "pbd/signals.h"
 
diff --git a/libs/ardour/ardour/visibility.h b/libs/ardour/ardour/visibility.h
deleted file mode 100644
index 5b3e5d8996..0000000000
--- a/libs/ardour/ardour/visibility.h
+++ /dev/null
@@ -1,38 +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 __libardour_visibility_h__
-#define __libardour_visibility_h__
-
-/* _WIN32 is defined by most compilers targetting Windows, but within the
- * ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
- * on how a Windows build is built.
- */
-
-#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
-    #define LIBARDOUR_HELPER_DLL_IMPORT __declspec(dllimport)
-    #define LIBARDOUR_HELPER_DLL_EXPORT __declspec(dllexport)
-    #define LIBARDOUR_HELPER_DLL_LOCAL
-#else
-    #define LIBARDOUR_HELPER_DLL_IMPORT __attribute__ ((visibility ("default")))
-    #define LIBARDOUR_HELPER_DLL_EXPORT __attribute__ ((visibility ("default")))
-    #define LIBARDOUR_HELPER_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
-#endif
-
-#endif /* __libardour_visibility_h__ */
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 435213b5f9..336274dcef 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -341,15 +341,14 @@ def build(bld):
                         'OSX','BOOST','CURL','DL']
     obj.use          = ['libpbd','libmidipp','libevoral', 'libvampplugin',
                         'libaudiographer', 
-                        'libltc_includes',
-                        'libltc',
                         'libtimecode_includes',
                         ]
     if bld.is_defined('USE_EXTERNAL_LIBS'):
-        obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK',
+        obj.uselib.extend(['RUBBERBAND', 'TAGLIB', 'VAMPSDK', 'LIBLTC',
                            'VAMPHOSTSDK'])
     else:
-        obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'])
+        obj.use.extend(['librubberband', 'libtaglib', 'libvamphost'
+                        'libltc_includes', 'libltc'])
 
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')