diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-25 01:07:35 +0100 |
| commit | 996b0c06e23bcb6b300d7b8799df94993692e07d (patch) | |
| tree | 615ff0c372dac97321489e3cb7f316cb4cb9eeec /src/lib/player.cc | |
| parent | 4f03da3aa12525cb8389ddefee629f5d0b2ac0aa (diff) | |
| parent | 907735ee6ca162583c7c9d20f5603a6db83a149f (diff) | |
Merge master and multifarious hackery.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 032b3d49b..ff13f95db 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -107,6 +107,10 @@ Player::pass () if (((*i)->decoder->next() + (*i)->content->start()) >= (*i)->content->end()) { continue; } + + if (!_audio && dynamic_pointer_cast<SndfileContent> ((*i)->content)) { + continue; + } Time const t = (*i)->content->start() + (*i)->decoder->next(); if (t < earliest_t) { @@ -188,7 +192,7 @@ Player::process_audio (weak_ptr<Content> weak_content, shared_ptr<const AudioBuf /* Now accumulate the new audio into our buffers */ _audio_buffers.ensure_size (_audio_buffers.frames() + audio->frames()); - _audio_buffers.accumulate_frames (audio, 0, 0, audio->frames ()); + _audio_buffers.accumulate_frames (audio.get(), 0, 0, audio->frames ()); } /** @return true on error */ |