merge with master and fix 4 conflicts by hand

[ardour.git] / libs / ardour / ardour / smf_source.h

diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index a068a3e3853b648849bc20ed987a2e87105f6a13..44d965a4f6dc44f784c9eae62a76da9aaca8a22e 100644 (file)
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -34,7 +34,7 @@ namespace ARDOUR {
 template<typename T> class MidiRingBuffer;
 
 /** Standard Midi File (Type 0) Source */
-class SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
+class LIBARDOUR_API SMFSource : public MidiSource, public FileSource, public Evoral::SMF {
 public:
        /** Constructor for new internal-to-session files */
        SMFSource (Session& session, const std::string& path, Source::Flag flags);
@@ -81,6 +81,8 @@ public:
 
        void prevent_deletion ();
 
+       void prevent_deletion ();
+
   protected:
        void set_path (const std::string& newpath);