Merge in minor branch, now minor is our next development target

This commit is contained in:
Bart van Strien
2011-05-07 14:12:41 +02:00
70 changed files with 3883 additions and 3571 deletions
+2 -2
View File
@@ -163,12 +163,12 @@ namespace lullaby
bool Mpg123Decoder::seek(float s)
{
off_t offset = mpg123_timeframe(handle, s);
off_t offset = s * sampleRate;
if(offset < 0)
return false;
if(mpg123_feedseek(handle, 0, SEEK_SET, &offset) >= 0)
if(mpg123_feedseek(handle, offset, SEEK_SET, &offset) >= 0)
{
data_offset = offset;
eof = false;