[Slim-Checkins] r9450 - in /branches/6.5/server: Slim/Web/HTTP.pm Slim/Web/Setup.pm strings.txt

[andy at svn.slimdevices.com]

Author: andy
Date: Wed Sep  6 14:19:18 2006
New Revision: 9450

URL: http://svn.slimdevices.com?rev=9450&view=rev
Log:
Disable forked streaming preference, will look at this again post-6.5.  Removed experimental text for the forkedWeb pref (please update translations)

Modified:
    branches/6.5/server/Slim/Web/HTTP.pm
    branches/6.5/server/Slim/Web/Setup.pm
    branches/6.5/server/strings.txt

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

Modified: branches/6.5/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/Setup.pm?rev=9450&r1=9449&r2=9450&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/Setup.pm (original)
+++ branches/6.5/server/Slim/Web/Setup.pm Wed Sep  6 14:19:18 2006
@@ -2134,13 +2134,14 @@
 				},
 			},
 			
-			'forkedStreaming' => {
-				'validate' => \&Slim::Utils::Validate::trueFalse,
-				'options'  => {
-					'1' => 'SETUP_FORKEDSTREAMING_ENABLE',
-					'0' => 'SETUP_FORKEDSTREAMING_DISABLE',
-				},
-			},
+			# 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',
+			#	},
+			#},
 
 			'serverPriority' => {
 				'validate' => \&Slim::Utils::Validate::inList,
@@ -2315,8 +2316,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

Modified: branches/6.5/server/strings.txt
URL: http://svn.slimdevices.com/branches/6.5/server/strings.txt?rev=9450&r1=9449&r2=9450&view=diff
==============================================================================
--- branches/6.5/server/strings.txt (original)
+++ branches/6.5/server/strings.txt Wed Sep  6 14:19:18 2006
@@ -5816,7 +5816,7 @@
 
 SETUP_FORKEDWEB_DESC
 	DE	Um den Hauptprozess nicht zu blockieren, können einige Webseiten in Unterprozessen verarbeitet werden. Dies kommt vor allem bei Verwendung von Playern mit kleinen Puffern wie der Squeezebox1 zu Gute, da hier sonst Aussetzer bei der Musikwiedergabe auftreten können. Zudem wird das Scrollen auf dem Display und die Reaktionszeit auf die Fernbedienung verbessert. <b>Warnung:</b> Diese Funktion ist derzeit experimentell. Bei Problemen diese bitte im Beta Forum diskutieren.
-	EN	To avoid stalling the main process, certain web pages can be handled by a child process.  This will most benefit players will small buffers such as Squeezebox1 which can experience audio dropouts while using the web interface.  It will also provide smoother scrolling and IR response while accessing the web interface. <b>Warning:</b> This is currently an experimental feature, and some things may not work properly with this option enabled.  <b>Please do not report bugs experienced when this option is enabled to Bugzilla; use the Beta forum instead.</b>
+	EN	To avoid stalling the main process, certain web pages can be handled by a child process.  This will most benefit players will small buffers such as Squeezebox1 which can experience audio dropouts while using the web interface.  It will also provide smoother scrolling and IR response while accessing the web interface.
 	ES	Para evitar recargar el proceso principal, ciertas páginas pueden ser servidas por un proceso hijo. Esto beneficiará principalmente a los reproductores con buffer pequeño, tales como el Squeezebox1, que puede experimentar cortes mientras se utiliza la interface. Tambíen suaviza el desplazamiento de texto y la respuesta del control remoto mientras se accede a la interface web. <b>Advertencia:</b> Esta es una característica experimental por el momento, y algunas cosas pueden no funcionar apropiadamanete cuando se habilita esta opción.  <b>Por favor, no reportar bugs en Bugzilla cuando se habilita esta opción; utilizar para esto el foro Beta.</b>
 	NL	Om het ophouden van het hoofdproces tegen te gaan kunnen sommige webpagina's door een separaat proces afgehandeld worden. Dit levert het meeste voordeel op voor spelers met een kleine buffer zoals Squeezebox1 die drop-outs kan geven terwijl je de webinterface gebruikt.<BR> Het geeft ook soepel bladeren met de IR afstandsbediening terwijl je de webinterface gebruikt. B>Waarschuwing:</B> Dit is nu een experimentele optie. Sommige dingen kunnen anders werken dan bedoeld bij het aanzetten van deze optie. <B>Open geen foutrapporten in Bugzilla. Gebruik het Beta forum daarvoor.</B>