diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
| commit | e60bb3e51bd1508b149e6b8f6608f09b5196ae26 (patch) | |
| tree | a7a5b937c9ae138d4eebca8d5130d308bf9ae420 /src/lib/audio_decoder_stream.cc | |
| parent | f07d5125a7b609320682689abe40781f096ca25e (diff) | |
No-op: remove all trailing whitespace.
Diffstat (limited to 'src/lib/audio_decoder_stream.cc')
| -rw-r--r-- | src/lib/audio_decoder_stream.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc index f1d9839f8..8c521f94d 100644 --- a/src/lib/audio_decoder_stream.cc +++ b/src/lib/audio_decoder_stream.cc @@ -59,7 +59,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) shared_ptr<ContentAudio> dec; Frame const end = frame + length - 1; - + if (frame < _decoded.frame || end > (_decoded.frame + length * 4)) { /* Either we have no decoded data, or what we do have is a long way from what we want: seek */ seek (ContentTime::from_frames (frame, _content->resampled_audio_frame_rate()), accurate); @@ -69,7 +69,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) (to be set up shortly) */ Frame decoded_offset = 0; - + /* Now enough pass() calls will either: * (a) give us what we want, or * (b) hit the end of the decoder. @@ -84,7 +84,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) !_decoder->pass () ) {} - + decoded_offset = frame - _decoded.frame; } else { while ( @@ -92,7 +92,7 @@ AudioDecoderStream::get (Frame frame, Frame length, bool accurate) !_decoder->pass () ) {} - + /* Use decoded_offset of 0, as we don't really care what frames we return */ } @@ -183,7 +183,7 @@ AudioDecoderStream::add (shared_ptr<const AudioBuffers> data) */ return; } - + /* Resize _decoded to fit the new data */ int new_size = 0; if (_decoded.audio->frames() == 0) { @@ -194,7 +194,7 @@ AudioDecoderStream::add (shared_ptr<const AudioBuffers> data) /* Otherwise we need to extend _decoded to include the new stuff */ new_size = _position.get() + data->frames() - _decoded.frame; } - + _decoded.audio->ensure_size (new_size); _decoded.audio->set_frames (new_size); |
