[Slim-Checkins] r12371 - in /trunk/server: CPAN/Compress/ CPAN/arch/5.8/MSWin32-x86-multi-thread/auto/Compress/LZF/ CPAN/arch/5.8/darwin-thread-multi-2level/auto/Compress/LZF/ CPAN/arch/5.8/i386-linux-thread-multi/auto/Compress/LZF/ Slim/Player/

[andy at svn.slimdevices.com]

Author: andy
Date: Tue Jul 10 14:40:41 2007
New Revision: 12371

URL: http://svn.slimdevices.com?rev=12371&view=rev
Log:
Remove Compress::LZF

Removed:
    trunk/server/CPAN/Compress/LZF.pm
    trunk/server/CPAN/arch/5.8/MSWin32-x86-multi-thread/auto/Compress/LZF/
    trunk/server/CPAN/arch/5.8/darwin-thread-multi-2level/auto/Compress/LZF/
    trunk/server/CPAN/arch/5.8/i386-linux-thread-multi/auto/Compress/LZF/
Modified:
    trunk/server/Slim/Player/Client.pm
    trunk/server/Slim/Player/SoftSqueeze.pm
    trunk/server/Slim/Player/Squeezebox.pm
    trunk/server/Slim/Player/Squeezebox2.pm

Modified: trunk/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Client.pm?rev=12371&r1=12370&r2=12371&view=diff
==============================================================================
--- trunk/server/Slim/Player/Client.pm (original)
+++ trunk/server/Slim/Player/Client.pm Tue Jul 10 14:40:41 2007
@@ -531,7 +531,6 @@
 sub hasPowerControl() { return 0; }
 sub hasDisableDac() { return 0; }
 sub hasPolarityInversion() { return 0; }
-sub hasCompression() { return 0; }
 
 sub maxBrightness() { return undef; }
 

Modified: trunk/server/Slim/Player/SoftSqueeze.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/SoftSqueeze.pm?rev=12371&r1=12370&r2=12371&view=diff
==============================================================================
--- trunk/server/Slim/Player/SoftSqueeze.pm (original)
+++ trunk/server/Slim/Player/SoftSqueeze.pm Tue Jul 10 14:40:41 2007
@@ -88,10 +88,6 @@
 	return 0;
 }
 
-sub hasCompression() {
-	return 0;
-}
-
 sub canDirectStream {
 	my $client = shift;
 	my $url = shift;

Modified: trunk/server/Slim/Player/Squeezebox.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox.pm?rev=12371&r1=12370&r2=12371&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox.pm (original)
+++ trunk/server/Slim/Player/Squeezebox.pm Tue Jul 10 14:40:41 2007
@@ -1108,35 +1108,7 @@
 
 	assert(length($type) == 4);
 	
-	my $frame;
-	
-	if ( $type eq 'grfe' && $client->hasCompression ) {
-		# Compress only graphic frames, other frames are very small
-		# or don't compress well.
-		my $compressed = Compress::LZF::compress($$dataRef);
-		
-		# XXX: This should be fixed in a future version of Compress::LZF
-		# Replace Perl header with C header so we can decompress
-		# properly in the firmware
-		if ( ord( substr $compressed, 0, 1 ) == 0 ) {
-			# The data wasn't able to be compressed
-			my $c_header = "ZV\0" . pack('n', $len);
-			substr $compressed, 0, 1, $c_header;
-		}
-		else {
-			my $csize = length($compressed) - 2;
-			my $c_header = "ZV\1" . pack('n', $csize) . pack('n', $len);
-			substr $compressed, 0, 2, $c_header;
-		}
-		
-		$frame
-			= pack( 'n', length($compressed) + 4 ) 
-			. ( $type | pack( 'N', 0x80000000 ) )
-			. $compressed;
-	}
-	else {
-		$frame = pack('n', $len + 4) . $type . $$dataRef;
-	}
+	my $frame = pack('n', $len + 4) . $type . $$dataRef;
 
 	logger('network.protocol.slimproto')->debug("sending squeezebox frame: $type, length: $len");
 

Modified: trunk/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Squeezebox2.pm?rev=12371&r1=12370&r2=12371&view=diff
==============================================================================
--- trunk/server/Slim/Player/Squeezebox2.pm (original)
+++ trunk/server/Slim/Player/Squeezebox2.pm Tue Jul 10 14:40:41 2007
@@ -722,11 +722,6 @@
 
 sub hasDisableDac() {
 	return 1;
-}
-
-sub hasCompression() {
-	# XXX: This will be enabled when the next firmware is checked in
-	return 0;
 }
 
 sub audio_outputs_enable {