merge with master and fix 4 conflicts by hand

[ardour.git] / libs / evoral / evoral / SMF.hpp

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 02d0710409b048f0298f3a4ae0480dd474ce87a4..fe81b8f0441e8efd348830da98e678b6b1d4557a 100644 (file)
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -21,6 +21,8 @@
 #define EVORAL_SMF_HPP
 
 #include <cassert>
+
+#include "evoral/visibility.h"
 #include "evoral/types.hpp"
 
 struct smf_struct;
@@ -35,7 +37,7 @@ namespace Evoral {
 /** Standard Midi File.
  * Currently only tempo-based time of a given PPQN is supported.
  */
-class SMF {
+class LIBEVORAL_API SMF {
 public:
        class FileError : public std::exception {
        public: