Merge remote-tracking branch 'remotes/origin/exportvis' into windows+cc

Conflicts (hopefully resolved):
	gtk2_ardour/wscript
	libs/ardour/ardour/audioregion.h
	libs/ardour/ardour/debug.h
	libs/ardour/ardour/directory_names.h
	libs/ardour/ardour/filesystem_paths.h
	libs/ardour/ardour/session_event.h
	libs/gtkmm2ext/gtkmm2ext/utils.h
	libs/panners/1in2out/wscript
	libs/panners/2in2out/wscript
	libs/panners/vbap/wscript
	libs/pbd/pbd/debug.h
	libs/pbd/pbd/file_utils.h
	libs/pbd/pbd/pathexpand.h
	libs/pbd/pbd/ringbuffer.h
	libs/pbd/pbd/ringbufferNPT.h
	libs/pbd/pbd/search_path.h
	libs/pbd/pbd/stacktrace.h
	libs/pbd/pbd/uuid.h
	libs/pbd/pbd/uuid_boost.h
	libs/surfaces/control_protocol/control_protocol/basic_ui.h
	libs/surfaces/control_protocol/control_protocol/control_protocol.h

1 files changed, 10 insertions, 9 deletions

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index a0b7b878e4..faeb3be357 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -31,6 +31,7 @@
 #include "timecode/time.h"
 #include "ltc/ltc.h"
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "midi++/parser.h"
 #include "midi++/types.h"
@@ -59,7 +60,7 @@ class MidiPort;
  * Therefore it is rather that class, that makes ARDOUR a slave by connecting it
  * to its external time master.
  */
-class Slave {
+class LIBARDOUR_API Slave {
   public:
 	Slave() { }
 	virtual ~Slave() {}
@@ -180,7 +181,7 @@ class Slave {
 };
 
 /// We need this wrapper for testability, it's just too hard to mock up a session class
-class ISlaveSessionProxy {
+class LIBARDOUR_API ISlaveSessionProxy {
   public:
 	virtual ~ISlaveSessionProxy() {}
 	virtual TempoMap&  tempo_map()                 const   { return *((TempoMap *) 0); }
@@ -198,7 +199,7 @@ class ISlaveSessionProxy {
 
 
 /// The Session Proxy for use in real Ardour
-class SlaveSessionProxy : public ISlaveSessionProxy {
+class LIBARDOUR_API SlaveSessionProxy : public ISlaveSessionProxy {
 	Session&    session;
 
   public:
@@ -215,7 +216,7 @@ class SlaveSessionProxy : public ISlaveSessionProxy {
 	void request_transport_speed (double speed);
 };
 
-struct SafeTime {
+struct LIBARDOUR_API SafeTime {
 	volatile int guard1;
 	framepos_t   position;
 	framepos_t   timestamp;
@@ -231,7 +232,7 @@ struct SafeTime {
 	}
 };
 
-class TimecodeSlave : public Slave {
+class LIBARDOUR_API TimecodeSlave : public Slave {
   public:
     TimecodeSlave () {}
 
@@ -248,7 +249,7 @@ class TimecodeSlave : public Slave {
     bool              timecode_negative_offset;
 };
 
-class MTC_Slave : public TimecodeSlave {
+class LIBARDOUR_API MTC_Slave : public TimecodeSlave {
   public:
 	MTC_Slave (Session&, MidiPort&);
 	~MTC_Slave ();
@@ -332,7 +333,7 @@ class MTC_Slave : public TimecodeSlave {
 	void parameter_changed(std::string const & p);
 };
 
-class LTC_Slave : public TimecodeSlave {
+class LIBARDOUR_API LTC_Slave : public TimecodeSlave {
 public:
 	LTC_Slave (Session&);
 	~LTC_Slave ();
@@ -400,7 +401,7 @@ public:
 	double b, c; ///< DLL filter coefficients
 };
 
-class MIDIClock_Slave : public Slave {
+class LIBARDOUR_API MIDIClock_Slave : public Slave {
   public:
 	MIDIClock_Slave (Session&, MidiPort&, int ppqn = 24);
 
@@ -486,7 +487,7 @@ class MIDIClock_Slave : public Slave {
 	bool _starting;
 };
 
-class Engine_Slave : public Slave
+class LIBARDOUR_API Engine_Slave : public Slave
 {
   public:
 	Engine_Slave (AudioEngine&);