mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-02-23 00:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug introduced by recent buffer changes that broke low-level seek behavior.

Browse Source
This commit is contained in:
casey 2016-06-17 22:01:06 -07:00
parent 050736b339
commit 9aa1a0081c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/audio/Stream.cpp
View File

@ -48,6 +48,7 @@ Stream::Stream(unsigned int options)
: preferedBufferSampleSize(2048)
, options(options)
, decoderSampleRate(0)
, decoderChannels(0)
, decoderSamplePosition(0)
{
if ((this->options & NoDSP) == 0) {
@ -70,7 +71,9 @@ double Stream::SetPosition(double requestedSeconds) {
if (actualSeconds != -1) {
double rate = (double) this->decoderSampleRate;
this->decoderSamplePosition = (uint64)(actualSeconds * rate);
this->decoderSamplePosition =
(uint64)(actualSeconds * rate) * this->decoderChannels;
}
return actualSeconds;
@ -138,8 +141,9 @@ BufferPtr Stream::GetNextBufferFromDecoder() {
}
/* remember the sample rate so we can calculate the current time-position */
if (!this->decoderSampleRate) {
if (!this->decoderSampleRate || !this->decoderChannels) {
this->decoderSampleRate = buffer->SampleRate();
this->decoderChannels = buffer->Channels();
}
/* offset, in samples */

1
src/core/audio/Stream.h
View File

@ -87,6 +87,7 @@ namespace musik { namespace core { namespace audio {
double maxCacheLength;
unsigned int options;
long decoderSampleRate;
long decoderChannels;
uint64 decoderSamplePosition;
std::string uri;
musik::core::io::DataStreamFactory::DataStreamPtr dataStream;