X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fevoral%2Fevoral%2FSMF.hpp;h=e9c4a0fc49450368eca7a5e749a3512f70495b03;hb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;hp=14046ab8f3ee214d75eb4668591b4cc3d9d6aee1;hpb=d0cc3120ae1d2f58942a6cdd1120dd0de1510aba;p=ardour.git

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 14046ab8f3..e9c4a0fc49 100644
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -2,16 +2,16 @@
  * Copyright(C) 2008 Dave Robillard <http://drobilla.net>
  * Copyright(C) 2000-2008 Paul Davis
  * Author: Hans Baier
- * 
+ *
  * Evoral is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or(at your option) any later
  * version.
- * 
+ *
  * Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -28,16 +28,12 @@ typedef smf_struct smf_t;
 typedef smf_track_struct smf_track_t;
 
 namespace Evoral {
-	
-template<typename Time> class Event;
-template<typename Time> class EventRingBuffer;
 
-#define THROW_FILE_ERROR throw(typename SMF<Time>::FileError)
+#define THROW_FILE_ERROR throw(FileError)
 
 /** 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 {
@@ -46,34 +42,34 @@ public:
 
 	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, 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);
-	
+
 	int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const;
-	
+
 	uint16_t num_tracks() const;
 	uint16_t ppqn()       const;
 	bool     is_empty()   const { return _empty; }
-	bool     eof()        const { assert(false); return true; }
-	
+
 	void begin_write();
 	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:
-	std::string  _path;
+	std::string  _file_path;
 	smf_t*       _smf;
 	smf_track_t* _smf_track;
-
 	bool         _empty; ///< true iff file contains(non-empty) events
 };