Remove unused (and weirdly typed) time parameter from begin_write.

Fix append_event_unlocked shadowing.

git-svn-id: svn://localhost/ardour2/branches/3.0@4535 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index f4dd5e15349c5fe292c65a5036e5b5fbd21571ab..92ef0b89aabc68b412cb85033d679bea185e1692 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -299,7 +299,7 @@ SMFSource::append_event_unlocked(EventTimeUnit unit, const Evoral::Event<double>
                delta_time = (uint32_t)((ev.time() - last_event_time()) * ppqn());
        }
 
-       Evoral::SMF<double>::append_event_unlocked(delta_time, ev);
+       Evoral::SMF<double>::append_event_delta(delta_time, ev);
 
        _write_data_count += ev.size();
 }
@@ -354,7 +354,7 @@ void
 SMFSource::mark_streaming_midi_write_started (NoteMode mode, nframes_t start_frame)
 {
        MidiSource::mark_streaming_midi_write_started (mode, start_frame);
-       Evoral::SMF<double>::begin_write (start_frame);
+       Evoral::SMF<double>::begin_write ();
 }
 
 void

diff --git a/libs/evoral/evoral/LibSMF.hpp b/libs/evoral/evoral/LibSMF.hpp
index da90814bf3cc07d66e17ab11bf0cbe511efb8706..aa339e2e2491298d73f61fbbe73c319d65d76cf3 100644 (file)
--- a/libs/evoral/evoral/LibSMF.hpp
+++ b/libs/evoral/evoral/LibSMF.hpp
@@ -49,8 +49,8 @@ public:
        
        Time last_event_time() const { return _last_ev_time; }
        
-       void begin_write(FrameTime start_time);
-       void append_event_unlocked(uint32_t delta_t, const Event<Time>& ev);
+       void begin_write();
+       void append_event_delta(uint32_t delta_t, const Event<Time>& ev);
        void end_write() THROW_FILE_ERROR;
        
        void flush() {};

diff --git a/libs/evoral/evoral/MIDIFile.hpp b/libs/evoral/evoral/MIDIFile.hpp
index 093267041bc31c82f2a4e7d12c08513080570335..b605b8af6070f575658e2cb6a59fb1595f2f98c5 100644 (file)
--- a/libs/evoral/evoral/MIDIFile.hpp
+++ b/libs/evoral/evoral/MIDIFile.hpp
@@ -47,8 +47,8 @@ public:
        
        virtual Time last_event_time() const = 0;
        
-       virtual void begin_write(FrameTime start_time) = 0;
-       virtual void append_event_unlocked(uint32_t delta_t, const Event<Time>& ev) = 0;
+       virtual void begin_write() = 0;
+       virtual void append_event_delta(uint32_t delta_t, const Event<Time>& ev) = 0;
        virtual void end_write() throw(FileError) = 0;
        
        virtual void flush() = 0;
@@ -60,7 +60,6 @@ protected:
        virtual void close() throw(FileError) = 0;
        
        virtual int read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const = 0;
-
 };
 
 }; /* namespace Evoral */

diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.hpp
index 23a317bb2867003a55ce99e63af61f6e8ae8fa93..e9f2f47bfebb14a1e54b57dac9fe3909f3c92875 100644 (file)
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/SMF.hpp
@@ -43,8 +43,8 @@ public:
        
        Time last_event_time() const { return _last_ev_time; }
        
-       void begin_write(FrameTime start_time);
-       void append_event_unlocked(uint32_t delta_t, const Event<Time>& ev);
+       void begin_write();
+       void append_event_delta(uint32_t delta_t, const Event<Time>& ev);
        void end_write() THROW_FILE_ERROR;
        
        void flush();

diff --git a/libs/evoral/src/LibSMF.cpp b/libs/evoral/src/LibSMF.cpp
index 127aa9699c4dc665cc8c2bb684ba4638c1fa7d79..832d5f322575a0eb6831214c5b11caf2ffe9b40f 100644 (file)
--- a/libs/evoral/src/LibSMF.cpp
+++ b/libs/evoral/src/LibSMF.cpp
@@ -144,7 +144,7 @@ LibSMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
 
 template<typename Time>
 void
-LibSMF<Time>::append_event_unlocked(uint32_t delta_t, const Event<Time>& ev)
+LibSMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
 {
        assert(ev.size() > 0);
        
@@ -166,7 +166,7 @@ LibSMF<Time>::append_event_unlocked(uint32_t delta_t, const Event<Time>& ev)
 
 template<typename Time>
 void
-LibSMF<Time>::begin_write(FrameTime start_frame)
+LibSMF<Time>::begin_write()
 {
        assert(_smf_track);
        smf_track_delete(_smf_track);

diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cpp
index fa62ab8eeb4d22f46086b489c646060e4a98fcaf..223f91e42383033278f63b5a5aa0cb5ae520bdd3 100644 (file)
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/SMF.cpp
@@ -281,7 +281,7 @@ SMF<Time>::read_event(uint32_t* delta_t, uint32_t* size, uint8_t** buf) const
 
 template<typename Time>
 void
-SMF<Time>::append_event_unlocked(uint32_t delta_t, const Event<Time>& ev)
+SMF<Time>::append_event_delta(uint32_t delta_t, const Event<Time>& ev)
 {
        if (ev.size() == 0)
                return;
@@ -304,7 +304,7 @@ SMF<Time>::append_event_unlocked(uint32_t delta_t, const Event<Time>& ev)
 
 template<typename Time>
 void
-SMF<Time>::begin_write(FrameTime start_frame)
+SMF<Time>::begin_write()
 {
        _last_ev_time = 0;
        fseek(_fd, _header_size, SEEK_SET);