allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
Fix append_event_unlocked shadowing.


git-svn-id: svn://localhost/ardour2/branches/3.0@4535 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard
2009-02-11 20:37:22 +00:00
parent 43c9e2a121
commit 3d1b648130
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/smf_source.cc
View File

@@ -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

4
libs/evoral/evoral/LibSMF.hpp
View File

@@ -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() {};

5
libs/evoral/evoral/MIDIFile.hpp
View File

@@ -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 */

4
libs/evoral/evoral/SMF.hpp
View File

@@ -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();

4
libs/evoral/src/LibSMF.cpp
View File

@@ -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);

4
libs/evoral/src/SMF.cpp
View File

@@ -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);