globally remove all trailing whitespace from ardour code base.

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

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 91bc928d9abb81560a427b17a17a280ad03021d8..fd7263b5c44f0009d5885b48b78c29b28fd661b9 100644 (file)
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -20,7 +20,7 @@
 #ifndef EVORAL_SMF_HPP
 #define EVORAL_SMF_HPP
 
-#include <cassert>
+#include <glibmm/threads.h>
 
 #include "evoral/visibility.h"
 #include "evoral/types.hpp"
@@ -52,12 +52,12 @@ public:
        SMF() : _smf(0), _smf_track(0), _empty(true) {};
        virtual ~SMF();
 
+       static bool test(const std::string& path);
        int  open(const std::string& path, int track=1) THROW_FILE_ERROR;
+       // XXX 19200 = 10 * Timecode::BBT_Time::ticks_per_beat
        int  create(const std::string& path, int track=1, uint16_t ppqn=19200) THROW_FILE_ERROR;
        void close() THROW_FILE_ERROR;
 
-       const std::string& file_path() const { return _file_path; };
-
        void seek_to_start() const;
        int  seek_to_track(int track);
 
@@ -69,20 +69,17 @@ public:
 
        void begin_write();
        void append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf, event_id_t note_id);
-       void end_write() THROW_FILE_ERROR;
+       void end_write(std::string const &) THROW_FILE_ERROR;
 
        void flush() {};
 
        double round_to_file_precision (double val) const;
 
-protected:
-       void set_path (const std::string& p);
-
 private:
-       std::string  _file_path;
        smf_t*       _smf;
        smf_track_t* _smf_track;
        bool         _empty; ///< true iff file contains(non-empty) events
+       mutable Glib::Threads::Mutex _smf_lock;
 };
 
 }; /* namespace Evoral */