[Slim-Checkins] r10650 - /branches/6.5/server/Slim/Player/Source.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Fri Nov 10 08:51:16 2006
New Revision: 10650

URL: http://svn.slimdevices.com?rev=10650&view=rev
Log:
Switch to using the output buffer instead of decode buffer for triggering rebuffering

Modified:
    branches/6.5/server/Slim/Player/Source.pm

Modified: branches/6.5/server/Slim/Player/Source.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Source.pm?rev=10650&r1=10649&r2=10650&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Source.pm (original)
+++ branches/6.5/server/Slim/Player/Source.pm Fri Nov 10 08:51:16 2006
@@ -641,19 +641,10 @@
 		return;
 	}
 	
-	my $fullness = $client->bufferFullness();
-	my $songTime = songTime($client);
-	
-	# If we're near the end of a song, don't rebuffer, this can break crossfade mode
-	my $song = playingSong($client);
-	if ( my $duration = $song->{duration} ) {
-		if ( $duration - $songTime <= 10 ) {
-			return;
-		}
-	}
-	
+	my $fullness = $client->outputBufferFullness();
+
 	# If the buffer is empty, rebuffer	
-	if ( !$fullness && $songTime > 30 ) {
+	if ( !$fullness ) {
 		$::d_source && msg("Buffered audio dropped to $fullness bytes, pausing to rebuffer\n");
 		
 		$client->pause();