[Slim-Checkins] r9451 - in /trunk/server/Slim/Web: HTTP.pm Setup.pm

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Sep  6 14:20:04 2006
New Revision: 9451

URL: http://svn.slimdevices.com?rev=9451&view=rev
Log:
Actually, this can stay enabled in trunk, only wanted to disable it for 6.5

Modified:
    trunk/server/Slim/Web/HTTP.pm
    trunk/server/Slim/Web/Setup.pm

Modified: trunk/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/HTTP.pm?rev=9451&r1=9450&r2=9451&view=diff
==============================================================================
--- trunk/server/Slim/Web/HTTP.pm (original)
+++ trunk/server/Slim/Web/HTTP.pm Wed Sep  6 14:20:04 2006
@@ -826,8 +826,7 @@
 		$metaDataBytes{$httpClient} = - length($headers);
 		
 		# fork for streaming
-		# XXX: May revisit this post-6.5, for now it's not quite stable
-		if ( 0 && $^O !~ /Win32/ && Slim::Utils::Prefs::get('forkedStreaming') ) {
+		if ( $^O !~ /Win32/ && Slim::Utils::Prefs::get('forkedStreaming') ) {
 			
 			# This doesn't support synced players at the moment
 			if ( !Slim::Player::Sync::isSynced($client) ) {

Modified: trunk/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Setup.pm?rev=9451&r1=9450&r2=9451&view=diff
==============================================================================
--- trunk/server/Slim/Web/Setup.pm (original)
+++ trunk/server/Slim/Web/Setup.pm Wed Sep  6 14:20:04 2006
@@ -2134,14 +2134,13 @@
 				},
 			},
 			
-			# XXX: May revisit this post-6.5, for now it's not quite stable
-			#'forkedStreaming' => {
-			#	'validate' => \&Slim::Utils::Validate::trueFalse,
-			#	'options'  => {
-			#		'1' => 'SETUP_FORKEDSTREAMING_ENABLE',
-			#		'0' => 'SETUP_FORKEDSTREAMING_DISABLE',
-			#	},
-			#},
+			'forkedStreaming' => {
+				'validate' => \&Slim::Utils::Validate::trueFalse,
+				'options'  => {
+					'1' => 'SETUP_FORKEDSTREAMING_ENABLE',
+					'0' => 'SETUP_FORKEDSTREAMING_DISABLE',
+				},
+			},
 
 			'serverPriority' => {
 				'validate' => \&Slim::Utils::Validate::inList,
@@ -2316,8 +2315,8 @@
 	# Add forking performance options for non-Windows
 	if ( $^O !~ /Win32/ ) {
 		push @{ $setup{'PERFORMANCE_SETTINGS'}->{'Groups'}->{'Default'}->{'PrefOrder'} },
-			'forkedWeb';
-			#'forkedStreaming';
+			'forkedWeb',
+			'forkedStreaming';
 	}
 
 	# This hack pulls the --d_* debug keys from the main package and sets