From 5f7215e5e7c7036568686f41e4a7ce5e317f272b Mon Sep 17 00:00:00 2001 From: vspader Date: Tue, 22 May 2007 23:37:22 +0000 Subject: [PATCH] Fixed overflow error. --- Audio/Chain/OutputNode.h | 2 +- Audio/Chain/OutputNode.m | 2 -- Plugins/MAD/MADDecoder.m | 8 +++++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Audio/Chain/OutputNode.h b/Audio/Chain/OutputNode.h index 6d0308c08..a66c57992 100644 --- a/Audio/Chain/OutputNode.h +++ b/Audio/Chain/OutputNode.h @@ -18,7 +18,7 @@ @interface OutputNode : Node { AudioStreamBasicDescription format; - int amountPlayed; + unsigned long amountPlayed; OutputCoreAudio *output; } diff --git a/Audio/Chain/OutputNode.m b/Audio/Chain/OutputNode.m index ea9ac657e..0de442b67 100644 --- a/Audio/Chain/OutputNode.m +++ b/Audio/Chain/OutputNode.m @@ -25,7 +25,6 @@ - (void)seek:(double)time { amountPlayed = time*format.mBytesPerFrame*(format.mSampleRate/1000.0); - } - (void)process @@ -72,7 +71,6 @@ - (double)amountPlayed { - return (amountPlayed/format.mBytesPerFrame)/(format.mSampleRate/1000.0); } diff --git a/Plugins/MAD/MADDecoder.m b/Plugins/MAD/MADDecoder.m index eb7b66d60..311c49f38 100644 --- a/Plugins/MAD/MADDecoder.m +++ b/Plugins/MAD/MADDecoder.m @@ -557,9 +557,9 @@ static inline signed int scale (mad_fixed_t sample) - (double)seekToTime:(double)milliseconds { - int new_position; - int seconds = milliseconds/1000.0; - int total_seconds = mad_timer_count(_duration, MAD_UNITS_SECONDS); + unsigned long new_position; + unsigned long seconds = milliseconds/1000.0; + unsigned long total_seconds = mad_timer_count(_duration, MAD_UNITS_SECONDS); if (seconds > total_seconds) seconds = total_seconds; @@ -578,6 +578,8 @@ static inline signed int scale (mad_fixed_t sample) _seekSkip = YES; + NSLog(@"Seeking: %lf", seconds*1000.0); + return seconds*1000.0; }