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

[andy at svn.slimdevices.com]

Author: andy
Date: Mon Nov 13 20:26:21 2006
New Revision: 10679

URL: http://svn.slimdevices.com?rev=10679&view=rev
Log:
Removing the rebuffering code, is too much overhead for displaying a message

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=10679&r1=10678&r2=10679&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Source.pm (original)
+++ branches/6.5/server/Slim/Player/Source.pm Mon Nov 13 20:26:21 2006
@@ -56,7 +56,6 @@
 	Slim::Networking::Slimproto::setEventCallback('STMu', \&underrun);
 	Slim::Networking::Slimproto::setEventCallback('STMd', \&decoderUnderrun);
 	Slim::Networking::Slimproto::setEventCallback('STMs', \&trackStartEvent);
-	Slim::Networking::Slimproto::setEventCallback('STMt', \&checkFullness);
 	Slim::Networking::Slimproto::setEventCallback('STMn', \&notSupported);
 }
 
@@ -624,45 +623,6 @@
 		# use execute callback...
 #		Slim::Control::Command::executeCallback($client, ['stop']);
 		Slim::Control::Request::notifyFromArray($client, ['stop']);
-	}
-}
-
-sub checkFullness {
-	my $client = shift || return;
-	
-	# Softsqueeze doesn't report buffer fullness the same as hardware
-	# SB1 doesn't report output buffer fullness
-	if ( $client->isa('Slim::Player::SoftSqueeze') || $client->model() eq 'squeezebox' ) {
-		return;
-	}
-	
-	# Only do this for remote streams
-	my $url = Slim::Player::Playlist::url($client);
-	if ( !$url || !Slim::Music::Info::isRemoteURL($url) ) {
-		return;
-	}
-	
-	my $fullness = $client->outputBufferFullness();
-
-	# If the buffer is empty, rebuffer	
-	if ( !$fullness ) {
-		$::d_source && msg("Output buffer empty, player waiting for more data\n");
-		
-		# We can only survive a short time without data, display "Rebuffering" while we wait
-		# The player will restart automatically when it gets some data
-		my ( $line1, $line2 );
-		
-		my $string = 'REBUFFERING';
-		$line1 = $client->string('NOW_PLAYING') . ' (' . $client->string($string) . ')';
-		if ( $client->linesPerScreen() == 1 ) {
-			$line2 = $client->string($string);
-		}
-		else {
-			my $url = Slim::Player::Playlist::url( $client, Slim::Player::Source::streamingSongIndex($client) );
-			$line2  = Slim::Music::Info::title( $url );
-		}
-		
-		$client->showBriefly( $line1, $line2, 2 ) unless $client->display->sbName();
 	}
 }