[Slim-Checkins] r10702 - in /trunk/server/Slim/Web/Settings/Player:
Alarm.pm Audio.pm Basic.pm Display.pm Menu.pm Remote.pm
dsully at svn.slimdevices.com
dsully at svn.slimdevices.com
Thu Nov 16 09:53:44 PST 2006
Author: dsully
Date: Thu Nov 16 09:53:43 2006
New Revision: 10702
URL: http://svn.slimdevices.com?rev=10702&view=rev
Log:
Bug: N/A
Description: Whitespace & logic cleanup.
Modified:
trunk/server/Slim/Web/Settings/Player/Alarm.pm
trunk/server/Slim/Web/Settings/Player/Audio.pm
trunk/server/Slim/Web/Settings/Player/Basic.pm
trunk/server/Slim/Web/Settings/Player/Display.pm
trunk/server/Slim/Web/Settings/Player/Menu.pm
trunk/server/Slim/Web/Settings/Player/Remote.pm
Modified: trunk/server/Slim/Web/Settings/Player/Alarm.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Alarm.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Alarm.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Alarm.pm Thu Nov 16 09:53:43 2006
@@ -28,33 +28,40 @@
my ($class, $client, $paramRef) = @_;
my @prefs = qw(alarmfadeseconds alarm alarmtime alarmvolume alarmplaylist);
-
# If this is a settings update
if ($paramRef->{'submit'}) {
my @changed = ();
+
for my $pref (@prefs) {
if ($pref eq 'alarmfadeseconds') {
# parse indexed array prefs.
if ($paramRef->{$pref} ne $client->prefGet($pref)) {
+
push @changed, $pref;
}
- $client->prefSet($pref, $paramRef->{$pref} ) if defined $paramRef->{$pref};
+ if (defined $paramRef->{$pref}) {
+
+ $client->prefSet($pref, $paramRef->{$pref});
+ }
+
} else {
for my $i (0..7) {
# parse indexed array prefs.
if ($pref ne 'alarmtime' && $paramRef->{$pref.$i} ne $client->prefGet($pref, $i)) {
+
push @changed, $pref.$i;
}
if ($pref eq 'alarmtime') {
- my $time = $paramRef->{'alarmtime'.$i};
+
+ my $time = $paramRef->{'alarmtime'.$i};
my $newtime = 0;
$time =~ s{
@@ -67,14 +74,19 @@
}
}iegsx;
- if ($newtime != $client->prefGet('alarmtime',$i)) {
+ if ($newtime != $client->prefGet('alarmtime', $i)) {
+
push @changed, 'alarmtime'.$i;
}
- $client->prefSet('alarmtime',$newtime,$i);
+ $client->prefSet('alarmtime', $newtime, $i);
+
} else {
- $client->prefSet($pref.$i, $paramRef->{$pref.$i} ) if defined $paramRef->{$pref.$i};
+ if (defined $paramRef->{$pref.$i}) {
+
+ $client->prefSet($pref.$i, $paramRef->{$pref.$i});
+ }
}
}
}
@@ -91,6 +103,7 @@
my $specialPlaylists = \%Slim::Buttons::AlarmClock::specialPlaylists;
for my $key (keys %{$specialPlaylists}) {
+
$playlistRef->{$key} = $key;
}
@@ -103,17 +116,34 @@
if ($pref eq 'alarmfadeseconds') {
$paramRef->{'prefs'}->{$pref} = $client->prefGet($pref);
+
} else {
@{$paramRef->{'prefs'}->{$pref}} = $client->prefGetArray($pref);
}
if ($pref eq 'alarmtime') {
+
for my $i (0..7) {
+
my $time = $client->prefGet('alarmtime',$i);
my ($h0, $h1, $m0, $m1, $p) = Slim::Buttons::Input::Time::timeDigits($client,$time);
+
my $timestring = ((defined($p) && $h0 == 0) ? ' ' : $h0) . $h1 . ":" . $m0 . $m1 . " " . (defined($p) ? $p : '');
+
+ my $timestring = ' ';
+
+ if (!defined $p || $h0 != 0) {
+
+ $timestring = $h0;
+ }
+
+ $timestring .= "$h1:$m0$m1 ";
+
+ if (defined $p) {
+ $timestring .= $p;
+ }
${$paramRef->{'prefs'}->{'alarmtime'}}[$i] = $timestring;
}
Modified: trunk/server/Slim/Web/Settings/Player/Audio.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Audio.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Audio.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Audio.pm Thu Nov 16 09:53:43 2006
@@ -78,10 +78,12 @@
if ($paramRef->{'submit'}) {
my @changed = ();
+
for my $pref (@prefs) {
# parse indexed array prefs.
if ($paramRef->{$pref} ne $client->prefGet($pref)) {
+
push @changed, $pref;
}
@@ -92,11 +94,14 @@
}
# Load any option lists for dynamic options.
- $paramRef->{'syncGroups'} = { %{Slim::Web::Setup::syncGroups($client)} };
- $paramRef->{'lamefound'} = Slim::Utils::Misc::findbin('lame');
+ $paramRef->{'syncGroups'} = { %{Slim::Web::Setup::syncGroups($client)} };
+ $paramRef->{'lamefound'} = Slim::Utils::Misc::findbin('lame');
my @formats = $client->formats();
- if ($formats[0] ne 'mp3') { $paramRef->{'allowNoLimit'} = 1; }
+
+ if ($formats[0] ne 'mp3') {
+ $paramRef->{'allowNoLimit'} = 1;
+ }
# Set current values for prefs
# load into prefs hash so that web template can detect exists/!exists
@@ -105,19 +110,24 @@
if ($pref eq 'synchronize') {
$paramRef->{'prefs'}->{$pref} = -1;
+
if (Slim::Player::Sync::isSynced($client)) {
+
$paramRef->{'prefs'}->{$pref} = $client->id();
+
} elsif ( my $syncgroupid = $client->prefGet('syncgroupid') ) {
# Bug 3284, we want to show powered off players that will resync when turned on
my @players = Slim::Player::Client::clients();
foreach my $other (@players) {
+
next if $other eq $client;
my $othersyncgroupid = Slim::Utils::Prefs::clientGet($other,'syncgroupid');
if ( $syncgroupid == $othersyncgroupid ) {
+
$paramRef->{'prefs'}->{$pref} = $other->id;
}
}
@@ -129,8 +139,9 @@
} elsif ($pref eq 'powerOnResume') {
- $paramRef->{'prefs'}->{$pref} = Slim::Player::Sync::syncGroupPref($client,'powerOnResume') ||
- $client->prefGet('powerOnResume');
+ $paramRef->{'prefs'}->{$pref} = Slim::Player::Sync::syncGroupPref($client,'powerOnResume') ||
+ $client->prefGet('powerOnResume');
+
} else {
$paramRef->{'prefs'}->{$pref} = $client->prefGet($pref);
Modified: trunk/server/Slim/Web/Settings/Player/Basic.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Basic.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Basic.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Basic.pm Thu Nov 16 09:53:43 2006
@@ -29,15 +29,20 @@
my @prefs = qw(playername titleFormat titleFormatCurr);
+ # isPlayer means not a HTTP client.
if ($client->isPlayer()) {
+
push @prefs, qw(playingDisplayMode playingDisplayModes);
if ($client->display->isa('Slim::Display::Transporter')) {
+
push @prefs, qw(visualMode visualModes);
}
my $savers = Slim::Buttons::Common::hash_of_savers();
+
if (scalar(keys %{$savers}) > 0) {
+
push @prefs, qw(screensaver idlesaver offsaver screensavertimeout);
}
}
@@ -45,10 +50,12 @@
# If this is a settings update
if ($paramRef->{'submit'}) {
- my @changed;
+ my @changed = ();
my $vismodeChange = 0;
+
if (${$paramRef->{'visualModes'}}[$paramRef->{'visualMode'}] ne $client->prefGet('visualModes',$paramRef->{'visualMode'})) {
+
$vismodeChange = 1;
}
@@ -66,22 +73,27 @@
last;
}
- $client->prefPush($pref,$paramRef->{$pref.$i});
+ $client->prefPush($pref, $paramRef->{$pref.$i});
$i++;
}
+
} else {
if ($paramRef->{$pref} ne $client->prefGet($pref)) {
push @changed, $pref;
}
- $client->prefSet($pref, $paramRef->{$pref} ) if defined $paramRef->{$pref};
+ if (defined $paramRef->{$pref}) {
+
+ $client->prefSet($pref, $paramRef->{$pref});
+ }
}
}
if ($vismodeChange) {
- Slim::Buttons::Common::updateScreen2Mode;
+
+ Slim::Buttons::Common::updateScreen2Mode();
}
$class->_handleChanges($client, \@changed, $paramRef);
@@ -97,9 +109,9 @@
if ($pref eq 'visualModes' || $pref eq 'playingDisplayModes' || $pref eq 'titleFormat') {
- $paramRef->{'prefs'}->{$pref} = [$client->prefGetArray($pref)];
+ $paramRef->{'prefs'}->{$pref} = [ $client->prefGetArray($pref) ];
- push @{$paramRef->{'prefs'}->{$pref}},"-1";
+ push @{$paramRef->{'prefs'}->{$pref}}, "-1";
} else {
@@ -107,8 +119,13 @@
}
}
- if (defined($client->revision)) {
- $paramRef->{'versionInfo'} = Slim::Utils::Strings::string("PLAYER_VERSION") . Slim::Utils::Strings::string("COLON") . $client->revision;
+ if (defined $client->revision) {
+
+ $paramRef->{'versionInfo'} = sprintf("%s%s%s",
+ Slim::Utils::Strings::string("PLAYER_VERSION"),
+ Slim::Utils::Strings::string("COLON"),
+ $client->revision,
+ );
}
$paramRef->{'ipaddress'} = $client->ipport();
@@ -116,7 +133,6 @@
$paramRef->{'signalstrength'} = $client->signalStrength;
$paramRef->{'voltage'} = $client->voltage();
-
return $class->SUPER::handler($client, $paramRef);
}
Modified: trunk/server/Slim/Web/Settings/Player/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Display.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Display.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Display.pm Thu Nov 16 09:53:43 2006
@@ -29,11 +29,13 @@
my @prefs = ();
- #$ set up prefs array for all conditions.
+ # set up prefs array for all conditions.
if ($client->isPlayer()) {
+
push @prefs, qw(powerOnBrightness powerOffBrightness idleBrightness autobrightness);
if ($client->display->isa("Slim::Display::Graphics")) {
+
push @prefs, qw(
activeFont activeFont_curr
idleFont idleFont_curr
@@ -42,7 +44,9 @@
scrollRate scrollRateDouble
scrollPixels scrollPixelsDouble
);
+
} else {
+
push @prefs, qw(
doublesize offDisplaySize
largeTextFont
@@ -74,17 +78,16 @@
$i++;
}
- } else {
-
- $client->prefSet($pref, $paramRef->{$pref} ) if defined $paramRef->{$pref};
+
+ } elsif (defined $paramRef->{$pref}) {
+
+ $client->prefSet($pref, $paramRef->{$pref});
}
if ($pref eq 'doublesize') {
$client->textSize($paramRef->{'doublesize'});
}
}
-
-
}
# Load any option lists for dynamic options.
@@ -113,9 +116,9 @@
}
} else {
+
# non-SD player, so no applicable display settings
$paramRef->{'warning'} = Slim::Utils::Strings::string('SETUP_NO_PREFS');
-
}
return $class->SUPER::handler($client, $paramRef);
Modified: trunk/server/Slim/Web/Settings/Player/Menu.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Menu.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Menu.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Menu.pm Thu Nov 16 09:53:43 2006
@@ -32,37 +32,45 @@
my @prefs = ('menuItem');
# If this is a settings update
- my $i;
- for ($i = $client->prefGetArrayMax('menuItem'); $i >= 0; $i--) {
+ for (my $i = $client->prefGetArrayMax('menuItem'); $i >= 0; $i--) {
+
if (exists $paramRef->{'Action' . $i}) {
- my $newval = $paramRef->{'Action' . $i};
- my $tempItem = $client->prefGet('menuItem',$i);
+ my $newval = $paramRef->{'Action' . $i};
+ my $tempItem = $client->prefGet('menuItem', $i);
+
if (defined $newval) {
+
if ($newval eq 'Remove') {
- $client->prefDelete('menuItem',$i);
+ $client->prefDelete('menuItem', $i);
+
} elsif ($newval eq 'Up' && $i > 0) {
- $client->prefSet('menuItem',$client->prefGet('menuItem',$i - 1),$i);
- $client->prefSet('menuItem',$tempItem,$i - 1);
+ $client->prefSet('menuItem', $client->prefGet('menuItem', $i - 1), $i);
+ $client->prefSet('menuItem', $tempItem, $i - 1);
+
} elsif ($newval eq 'Down' && $i < $client->prefGetArrayMax('menuItem')) {
- $client->prefSet('menuItem',$client->prefGet('menuItem',$i + 1),$i);
- $client->prefSet('menuItem',$tempItem,$i + 1);
+ $client->prefSet('menuItem', $client->prefGet('menuItem', $i + 1), $i);
+ $client->prefSet('menuItem', $tempItem, $i + 1);
}
}
}
}
if ($client->prefGetArrayMax('menuItem') < 0) {
+
$client->prefSet('menuItem','NOW_PLAYING',0);
}
if ($paramRef->{'removeItems'}) {
- for ($i = $client->prefGetArrayMax('menuItem'); $i >= 0; $i--) {
+
+ for (my $i = $client->prefGetArrayMax('menuItem'); $i >= 0; $i--) {
+
if ($paramRef->{'menuItemRemove' . $i}) {
- $client->prefDelete('menuItem',$i);
+
+ $client->prefDelete('menuItem', $i);
}
}
}
@@ -70,15 +78,18 @@
if ($paramRef->{'addItems'}) {
for my $i (0..$paramRef->{'nonMenuItems'}) {
+
if ($paramRef->{'nonMenuItemAdd' . $i}) {
- $client->prefPush('menuItem',$paramRef->{'nonMenuItemAdd' . $i});
+
+ $client->prefPush('menuItem', $paramRef->{'nonMenuItemAdd' . $i});
}
}
for my $i (0..$paramRef->{'pluginItems'}) {
if (exists $paramRef->{'pluginItemAdd' . $i}) {
- $client->prefPush('menuItem',$paramRef->{'pluginItemAdd' . $i});
+
+ $client->prefPush('menuItem', $paramRef->{'pluginItemAdd' . $i});
}
}
@@ -92,10 +103,10 @@
$paramRef->{'pluginItems'} = { map {$_ => Slim::Web::Setup::menuItemName($client, $_)} Slim::Utils::PluginManager::unusedPluginOptions($client) };
} else {
+
# non-SD player, so no applicable display settings
$paramRef->{'warning'} = Slim::Utils::Strings::string('SETUP_NO_PREFS');
}
-
return $class->SUPER::handler($client, $paramRef);
}
Modified: trunk/server/Slim/Web/Settings/Player/Remote.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Web/Settings/Player/Remote.pm?rev=10702&r1=10701&r2=10702&view=diff
==============================================================================
--- trunk/server/Slim/Web/Settings/Player/Remote.pm (original)
+++ trunk/server/Slim/Web/Settings/Player/Remote.pm Thu Nov 16 09:53:43 2006
@@ -30,34 +30,42 @@
my @prefs = ();
if ($client->isPlayer()) {
+
if (scalar(keys %{Slim::Hardware::IR::mapfiles()}) > 1) {
+
push @prefs, 'irmap';
}
-
# If this is a settings update
if ($paramRef->{'submit'}) {
my @changed = ();
+
for my $pref (@prefs) {
# parse indexed array prefs.
if ($paramRef->{$pref} ne $client->prefGet($pref)) {
+
push @changed, $pref;
}
- $client->prefSet($pref, $paramRef->{$pref} ) if defined $paramRef->{$pref};
-
+ if (defined $paramRef->{$pref}) {
+
+ $client->prefSet($pref, $paramRef->{$pref});
+ }
}
$client->prefDelete('disabledirsets');
my @irsets = keys %{Slim::Hardware::IR::irfiles($client)};
+
for my $i (0 .. (scalar(@irsets)-1)) {
if ($paramRef->{'irsetlist'.$i}) {
+
$client->prefPush('disabledirsets',$paramRef->{'irsetlist'.$i});
}
+
Slim::Hardware::IR::loadIRFile($irsets[$i]);
}
@@ -76,6 +84,7 @@
}
} else {
+
# non-SD player, so no applicable display settings
$paramRef->{'warning'} = Slim::Utils::Strings::string('SETUP_NO_PREFS');
}
More information about the checkins
mailing list