[Slim-Checkins] r10581 - in /trunk/server: Slim/Player/Source.pm Slim/Utils/Misc.pm slimserver.pl

[dsully at svn.slimdevices.com]

Author: dsully
Date: Fri Nov  3 16:03:55 2006
New Revision: 10581

URL: http://svn.slimdevices.com?rev=10581&view=rev
Log:
Bug: 4318
Description: Work around for gapless playback with flac cue sheets when running as a service.

Modified:
    trunk/server/Slim/Player/Source.pm
    trunk/server/Slim/Utils/Misc.pm
    trunk/server/slimserver.pl

Modified: trunk/server/Slim/Player/Source.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Source.pm?rev=10581&r1=10580&r2=10581&view=diff
==============================================================================
--- trunk/server/Slim/Player/Source.pm (original)
+++ trunk/server/Slim/Player/Source.pm Fri Nov  3 16:03:55 2006
@@ -1720,7 +1720,7 @@
 			#
 			# Use pipeline with a undef $sock (writer) to avoid
 			# that, since it calls Win32::Process::Create()
-			if (Slim::Utils::OSDetect::OS() eq 'win') {
+			if (Slim::Utils::OSDetect::OS() eq 'win' && Slim::Utils::Misc::runningAsService()) {
 
 				my $pipeline = Slim::Player::Pipeline->new(undef, $command);
 

Modified: trunk/server/Slim/Utils/Misc.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Utils/Misc.pm?rev=10581&r1=10580&r2=10581&view=diff
==============================================================================
--- trunk/server/Slim/Utils/Misc.pm (original)
+++ trunk/server/Slim/Utils/Misc.pm Fri Nov  3 16:03:55 2006
@@ -1250,6 +1250,21 @@
 	return 1;
 }
 
+=head2 runningAsService ( )
+
+Returns true if running as a Windows service.
+
+=cut
+
+sub runningAsService {
+
+	if (defined(&PerlSvc::RunningAsService) && PerlSvc::RunningAsService()) {
+		return 1;
+	}
+
+	return 0;
+}
+
 =head1 SEE ALSO
 
 L<Slim::Music::Info>

Modified: trunk/server/slimserver.pl
URL: http://svn.slimdevices.com/trunk/server/slimserver.pl?rev=10581&r1=10580&r2=10581&view=diff
==============================================================================
--- trunk/server/slimserver.pl (original)
+++ trunk/server/slimserver.pl Fri Nov  3 16:03:55 2006
@@ -260,7 +260,7 @@
 		$SIG{'HUP'} = \&initSettings;
 	}		
 
-	if (defined(&PerlSvc::RunningAsService) && PerlSvc::RunningAsService()) {
+	if (Slim::Utils::Misc::runningAsService()) {
 		$SIG{'QUIT'} = \&Slim::bootstrap::ignoresigquit; 
 	} else {
 		$SIG{'QUIT'} = \&Slim::bootstrap::sigquit;