fix up marshall/unmarshall of note data for MidiModel::DiffCommand

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

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 5f91f12bb6151e636216d05909aa417840dad5a8..b921a80e6d8529c34ffe923e29d91c389086f5d1 100644 (file)
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -29,28 +29,25 @@ typedef smf_track_struct smf_track_t;
 
 namespace Evoral {
        
-template<typename Time> class Event;
-template<typename Time> class EventRingBuffer;
+#define THROW_FILE_ERROR throw(FileError)
 
-#define THROW_FILE_ERROR throw(typename SMF<Time>::FileError)
-
-/** Standard Midi File (Type 0)
+/** Standard Midi File.
+ * Currently only tempo-based time of a given PPQN is supported.
  */
-template<typename Time>
 class SMF {
 public:
        class FileError : public std::exception {
                const char* what() const throw() { return "Unknown SMF error"; }
        };
 
-       SMF() : _last_ev_time(0), _smf(0), _smf_track(0), _empty(true) {};
+       SMF() : _smf(0), _smf_track(0), _empty(true) {};
        virtual ~SMF();
        
        int  open(const std::string& path, int track=1) THROW_FILE_ERROR;
-       int  create(const std::string& path, int track=1, int ppqn=19200) THROW_FILE_ERROR;
+       int  create(const std::string& path, int track=1, uint16_t ppqn=19200) THROW_FILE_ERROR;
        void close() THROW_FILE_ERROR;
        
-       const std::string& path() const { return _path; };
+       const std::string& file_path() const { return _file_path; };
 
        void seek_to_start() const;
        int  seek_to_track(int track);
@@ -60,25 +57,19 @@ public:
        uint16_t num_tracks() const;
        uint16_t ppqn()       const;
        bool     is_empty()   const { return _empty; }
-       bool     eof()        const { assert(false); return true; }
-       
-       Time last_event_time() const { return _last_ev_time; }
        
        void begin_write();
-       void append_event_delta(uint32_t delta_t, const Event<Time>& ev);
+       void append_event_delta(uint32_t delta_t, uint32_t size, const uint8_t* buf);
        void end_write() THROW_FILE_ERROR;
        
        void flush() {};
 
+        double round_to_file_precision (double val) const;
+
 private:
-       static const uint16_t _ppqn = 19200;
-       
-       Time _last_ev_time; ///< last frame time written, relative to source start
-       
-       std::string  _path;
+       std::string  _file_path;
        smf_t*       _smf;
        smf_track_t* _smf_track;
-
        bool         _empty; ///< true iff file contains(non-empty) events
 };