|
@@ -255,10 +255,7 @@ bool Source::update()
|
|
|
|
|
|
alGetSourcef(source, AL_SAMPLE_OFFSET, &curOffsetSamples);
|
|
|
|
|
|
- ALint b;
|
|
|
- alGetSourcei(source, AL_BUFFER, &b);
|
|
|
- int freq;
|
|
|
- alGetBufferi(b, AL_FREQUENCY, &freq);
|
|
|
+ int freq = decoder->getSampleRate();
|
|
|
curOffsetSecs = curOffsetSamples / freq;
|
|
|
|
|
|
// Get a free buffer.
|
|
@@ -334,11 +331,7 @@ void Source::seekAtomic(float offset, void *unit)
|
|
|
if (type == TYPE_STREAM)
|
|
|
{
|
|
|
offsetSamples = offset;
|
|
|
- ALint buffer;
|
|
|
- alGetSourcei(source, AL_BUFFER, &buffer);
|
|
|
- int freq;
|
|
|
- alGetBufferi(buffer, AL_FREQUENCY, &freq);
|
|
|
- offset /= freq;
|
|
|
+ offset /= decoder->getSampleRate();
|
|
|
offsetSeconds = offset;
|
|
|
decoder->seek(offset);
|
|
|
}
|
|
@@ -353,11 +346,7 @@ void Source::seekAtomic(float offset, void *unit)
|
|
|
{
|
|
|
offsetSeconds = offset;
|
|
|
decoder->seek(offset);
|
|
|
- ALint buffer;
|
|
|
- alGetSourcei(source, AL_BUFFER, &buffer);
|
|
|
- int freq;
|
|
|
- alGetBufferi(buffer, AL_FREQUENCY, &freq);
|
|
|
- offsetSamples = offset*freq;
|
|
|
+ offsetSamples = offset * decoder->getSampleRate();
|
|
|
}
|
|
|
else
|
|
|
{
|
|
@@ -399,11 +388,7 @@ float Source::tellAtomic(void *unit) const
|
|
|
default:
|
|
|
{
|
|
|
alGetSourcef(source, AL_SAMPLE_OFFSET, &offset);
|
|
|
- ALint buffer;
|
|
|
- alGetSourcei(source, AL_BUFFER, &buffer);
|
|
|
- int freq;
|
|
|
- alGetBufferi(buffer, AL_FREQUENCY, &freq);
|
|
|
- offset /= freq;
|
|
|
+ offset /= decoder->getSampleRate();
|
|
|
if (type == TYPE_STREAM) offset += offsetSeconds;
|
|
|
}
|
|
|
break;
|