[Slim-Checkins] r10656 - in /trunk/server/Slim/Web: Settings.pm Settings/Server/Basic.pm Settings/Server/Network.pm

[kdf at svn.slimdevices.com]

Author: kdf
Date: Fri Nov 10 18:47:40 2006
New Revision: 10656

URL: http://svn.slimdevices.com?rev=10656&view=rev
Log:
Bug: n/a
Description: feed out playername where available, move static options out of code. present prefs in a hash for basic settings page.  this allows the tempaltes to use an exists test to include sections


Modified:
    trunk/server/Slim/Web/Settings.pm
    trunk/server/Slim/Web/Settings/Server/Basic.pm
    trunk/server/Slim/Web/Settings/Server/Network.pm

Modified: trunk/server/Slim/Web/Settings.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings.pm?rev=10656&r1=10655&r2=10656&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings.pm (original)
+++ trunk/server/Slim/Web/Settings.pm Fri Nov 10 18:47:40 2006
@@ -25,7 +25,11 @@
 
 	if ($class->can('page') && $class->can('name')) {
 
-		Slim::Web::Pages->addPageLinks('setup', { $class->name => $class->page });
+		if ($class->needsClient) {
+			Slim::Web::Pages->addPageLinks('playersetup', { $class->name => $class->page });
+		} else {
+			Slim::Web::Pages->addPageLinks('setup', { $class->name => $class->page });
+		}
 	}
 }
 
@@ -41,6 +45,12 @@
 	return '';
 }
 
+sub needsClient {
+	my $class = shift;
+	
+	return 0;
+}
+
 sub handler {
 	my ($class, $client, $paramRef, $pageSetup) = @_;
 
@@ -48,6 +58,10 @@
 
 	# Needed to generate the drop down settings chooser list.
 	$paramRef->{'additionalLinks'} = \%Slim::Web::Pages::additionalLinks;
+	
+	if (defined $client) {
+		$paramRef->{'playername'} = $client->name();
+	}
 
 	return Slim::Web::HTTP::filltemplatefile($class->page, $paramRef);
 }

Modified: trunk/server/Slim/Web/Settings/Server/Basic.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Basic.pm?rev=10656&r1=10655&r2=10656&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Basic.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Basic.pm Fri Nov 10 18:47:40 2006
@@ -25,19 +25,11 @@
 
 	my @prefs = qw(language audiodir playlistdir rescantype rescan);
 
-	if (grep {$_ =~ 'iTunes'} keys %Slim::Music::Import::Importers) {
-		push @prefs, 'itunes';
-		$paramRef->{'itunesavailable'} = 1;
-	}
-	
-	if (grep {$_ =~ 'MusicMagic'} keys %Slim::Music::Import::Importers) {
-		push @prefs, 'musicmagic';
-		$paramRef->{'musicmagicavailable'} = 1;
-	}
-	
-	if (grep {$_ =~ 'MoodLogic'} keys %Slim::Music::Import::Importers) {
-		push @prefs, 'moodlogic';
-		$paramRef->{'moodlogicavailable'} = 1;
+	for my $importer ('iTunes', 'MusicMagic', 'MoodLogic') {
+		
+		if (grep {$_ =~ $importer} keys %Slim::Music::Import::Importers) {
+			push @prefs, lc($importer);
+		}
 	}
 
 	if ($paramRef->{'rescan'}) {
@@ -97,7 +89,7 @@
 	$paramRef->{'languageoptions'} = {Slim::Utils::Strings::hash_of_languages()};
 
 	for my $pref (@prefs) {
-		$paramRef->{$pref} = Slim::Utils::Prefs::get($pref);
+		$paramRef->{'prefs'}->{$pref} = Slim::Utils::Prefs::get($pref);
 	}
 	
 	return $class->SUPER::handler($client, $paramRef);

Modified: trunk/server/Slim/Web/Settings/Server/Network.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Server/Network.pm?rev=10656&r1=10655&r2=10656&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Server/Network.pm (original)
+++ trunk/server/Slim/Web/Settings/Server/Network.pm Fri Nov 10 18:47:40 2006
@@ -115,18 +115,6 @@
 	}
 
 	$paramRef->{'HomeURL'} = $homeURL;
-
-	$paramRef->{'wmaoptions'} =  {
-		'9999' => string('NO_LIMIT'),
-		'320'  => '320 ' . string('KBPS'),
-		'256'  => '256 ' . string('KBPS'),
-		'192'  => '192 ' . string('KBPS'),
-		'160'  => '160 ' . string('KBPS'),
-		'128'  => '128 ' . string('KBPS'),
-		'96'   => '96 ' . string('KBPS'),
-		'64'   => '64 ' . string('KBPS'),
-		'32'   => '32 ' . string('KBPS'),
-	};
 	
 	return $class->SUPER::handler($client, $paramRef, $pageSetup);
 }