diff options
author | David Robillard <d@drobilla.net> | 2013-01-21 02:35:53 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2013-01-21 02:35:53 +0000 |
commit | 76547b5c4b7fb2d4fbb7db9f12427b439da34a43 (patch) | |
tree | 9037a407c4fbe5079a42e43e71d22791042369c2 /libs/ardour/smf_source.cc | |
parent | b40464e67c431f073e6f755a62e92b930b07c18e (diff) |
More style-only changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@13939 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/smf_source.cc')
-rw-r--r-- | libs/ardour/smf_source.cc | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 626676ea83..2b4c7ef7c9 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -65,7 +65,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) throw failed_constructor (); } - /* file is not opened until write */ + /* file is not opened until write */ } /** Constructor used for existing internal-to-session files. */ @@ -90,7 +90,7 @@ SMFSource::SMFSource (Session& s, const XMLNode& node, bool must_exist) throw failed_constructor (); } - _open = true; + _open = true; } SMFSource::~SMFSource () @@ -104,25 +104,27 @@ int SMFSource::open_for_write () { if (create (_path)) { - return -1; - } - _open = true; - return 0; + return -1; + } + _open = true; + return 0; } /** All stamps in audio frames */ framecnt_t -SMFSource::read_unlocked (Evoral::EventSink<framepos_t>& destination, framepos_t const source_start, - framepos_t start, framecnt_t duration, - MidiStateTracker* tracker) const +SMFSource::read_unlocked (Evoral::EventSink<framepos_t>& destination, + framepos_t const source_start, + framepos_t start, + framecnt_t duration, + MidiStateTracker* tracker) const { int ret = 0; uint64_t time = 0; // in SMF ticks, 1 tick per _ppqn - if (writable() && !_open) { - /* nothing to read since nothing has ben written */ - return duration; - } + if (writable() && !_open) { + /* nothing to read since nothing has ben written */ + return duration; + } DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: start %1 duration %2\n", start, duration)); @@ -214,11 +216,13 @@ SMFSource::read_unlocked (Evoral::EventSink<framepos_t>& destination, framepos_t * @param position This source's start position in session frames. */ framecnt_t -SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, framepos_t position, framecnt_t duration) +SMFSource::write_unlocked (MidiRingBuffer<framepos_t>& source, + framepos_t position, + framecnt_t duration) { - if (!_writing) { - mark_streaming_write_started (); - } + if (!_writing) { + mark_streaming_write_started (); + } framepos_t time; Evoral::EventType type; @@ -405,13 +409,13 @@ SMFSource::set_state (const XMLNode& node, int version) void SMFSource::mark_streaming_midi_write_started (NoteMode mode) { - /* CALLER MUST HOLD LOCK */ + /* CALLER MUST HOLD LOCK */ - if (!_open && open_for_write()) { - error << string_compose (_("cannot open MIDI file %1 for write"), _path) << endmsg; - /* XXX should probably throw or return something */ - return; - } + if (!_open && open_for_write()) { + error << string_compose (_("cannot open MIDI file %1 for write"), _path) << endmsg; + /* XXX should probably throw or return something */ + return; + } MidiSource::mark_streaming_midi_write_started (mode); Evoral::SMF::begin_write (); @@ -489,9 +493,9 @@ SMFSource::load_model (bool lock, bool force_reload) _model->clear(); } - if (writable() && !_open) { - return; - } + if (writable() && !_open) { + return; + } _model->start_write(); Evoral::SMF::seek_to_start(); |