[Slim-Checkins] r11071 - in /trunk/server: HTML/EN/html/docs/
Plugins/DigitalInput/
Plugins/Live365/ Plugins/MusicMagic/ Plugins/Picks/ Plugins/Podcast/
Plugins/RSSNews/ Plugins/RandomPlay/ Plugins/Rescan/ Plugins/SavePlaylist/
Plugins/SlimTris/ Slim/Buttons/ Slim/Buttons/Input/ Slim/Display/
Slim/Display/Lib/
adrian at svn.slimdevices.com
adrian at svn.slimdevices.com
Mon Jan 1 07:48:00 PST 2007
Author: adrian
Date: Mon Jan 1 07:47:59 2007
New Revision: 11071
URL: http://svn.slimdevices.com?rev=11071&view=rev
Log:
Bug: N/A
Description: migrate from Slim::Display::Display:symbol to
$client->symbols. Slim::Display::Display::symbol no longer supported
Modified:
trunk/server/HTML/EN/html/docs/display.html
trunk/server/Plugins/DigitalInput/Plugin.pm
trunk/server/Plugins/Live365/Plugin.pm
trunk/server/Plugins/MusicMagic/PlayerSettings.pm
trunk/server/Plugins/MusicMagic/Plugin.pm
trunk/server/Plugins/Picks/Plugin.pm
trunk/server/Plugins/Podcast/Plugin.pm
trunk/server/Plugins/RSSNews/Plugin.pm
trunk/server/Plugins/RandomPlay/Plugin.pm
trunk/server/Plugins/Rescan/Plugin.pm
trunk/server/Plugins/SavePlaylist/Plugin.pm
trunk/server/Plugins/SlimTris/Plugin.pm
trunk/server/Slim/Buttons/AlarmClock.pm
trunk/server/Slim/Buttons/BrowseDB.pm
trunk/server/Slim/Buttons/BrowseTree.pm
trunk/server/Slim/Buttons/BrowseUPnPMediaServer.pm
trunk/server/Slim/Buttons/Common.pm
trunk/server/Slim/Buttons/Favorites.pm
trunk/server/Slim/Buttons/Home.pm
trunk/server/Slim/Buttons/Information.pm
trunk/server/Slim/Buttons/Input/Bar.pm
trunk/server/Slim/Buttons/Input/Choice.pm
trunk/server/Slim/Buttons/Input/List.pm
trunk/server/Slim/Buttons/Input/Time.pm
trunk/server/Slim/Buttons/Search.pm
trunk/server/Slim/Buttons/Settings.pm
trunk/server/Slim/Buttons/Synchronize.pm
trunk/server/Slim/Buttons/TrackInfo.pm
trunk/server/Slim/Buttons/XMLBrowser.pm
trunk/server/Slim/Display/Display.pm
trunk/server/Slim/Display/Lib/TextVFD.pm
trunk/server/Slim/Display/Text.pm
Modified: trunk/server/HTML/EN/html/docs/display.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/docs/display.html?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/docs/display.html (original)
+++ trunk/server/HTML/EN/html/docs/display.html Mon Jan 1 07:47:59 2007
@@ -451,12 +451,8 @@
<h5>$client->symbols()</h5>
<p>$client->symbols() is used to convert the names of symbols to the
-graphic character representing the symbol itself. As of 6.2 the
-preferred use of $client->symbols() is as a replacement for
-Slim::Display::Display:symbol to specify individual symbols. However
-it can also be used to parse a complete text line and convert symbol
-tokens (created by Slim::Display::Display::symbol) into the symbol
-character.</p>
+graphic character representing the symbol itself. As of 7.0
+Slim::Display::Display:symbol is no longer supported.</p>
<p>Preferred use:</p>
Modified: trunk/server/Plugins/DigitalInput/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/DigitalInput/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/DigitalInput/Plugin.pm (original)
+++ trunk/server/Plugins/DigitalInput/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -149,10 +149,7 @@
'listRef' => \@digital_inputs,
'modeName' => 'Digital Input Plugin',
'onPlay' => \&updateDigitalInput,
- 'overlayRef' => [
- undef,
- Slim::Display::Display::symbol('notesymbol')
- ],
+ 'overlayRef' => sub { return [ undef, shift->symbols('notesymbol') ] },
);
Slim::Buttons::Common::pushMode($client, 'INPUT.Choice', \%params);
Modified: trunk/server/Plugins/Live365/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Live365/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/Live365/Plugin.pm (original)
+++ trunk/server/Plugins/Live365/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -157,7 +157,8 @@
'stringHeader' => 1,
'headerAddCount' => 1,
'callback' => \&mainExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
});
}
@@ -415,7 +416,8 @@
'stringHeader' => 1,
'headerAddCount' => 1,
'callback' => \&genreExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'isSorted' => 'L',
'lookupRef' => sub {
my $index = shift;
@@ -603,7 +605,8 @@
'onChangeArgs' => 'CV',
'callback' => \&channelExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('notesymbol')) },
+ 'overlayRef' => sub { return (undef, shift->symbols('notesymbol')) },
+ 'overlayRefArgs' => 'C',
});
}
@@ -794,8 +797,8 @@
'stringHeader' => 1,
'headerAddCount' => 1,
'callback' => \&searchExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
});
}
@@ -831,7 +834,7 @@
my $client = shift;
my $exitType = shift;
- my $arrow = Slim::Display::Display::symbol('rightarrow');
+ my $arrow = $client->symbols('rightarrow');
$searchString{$client} =~ s/$arrow//;
Modified: trunk/server/Plugins/MusicMagic/PlayerSettings.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/PlayerSettings.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/PlayerSettings.pm (original)
+++ trunk/server/Plugins/MusicMagic/PlayerSettings.pm Mon Jan 1 07:47:59 2007
@@ -48,9 +48,7 @@
'stringHeader' => 1,
'headerAddCount' => 1,
'callback' => \&settingsExitHandler,
- 'overlayRef' => sub {
- return (undef,Slim::Display::Display::symbol('rightarrow'));
- },
+ 'overlayRef' => sub { return (undef,shift->symbols('rightarrow')) },
'overlayRefArgs' => 'C',
},
Modified: trunk/server/Plugins/MusicMagic/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/MusicMagic/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/MusicMagic/Plugin.pm (original)
+++ trunk/server/Plugins/MusicMagic/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -508,8 +508,8 @@
'headerAddCount' => 1,
'stringHeader' => 1,
'callback' => \&mixExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'parentMode' => 'musicmagic_mix',
);
Modified: trunk/server/Plugins/Picks/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Picks/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/Picks/Plugin.pm (original)
+++ trunk/server/Plugins/Picks/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -52,12 +52,6 @@
modeName => 'Picks Plugin',
url => $FEED,
title => $client->string(getDisplayName()),
-
- overlayRef => sub {
- my $client = shift;
-
- return (undef, Slim::Display::Display::symbol('notesymbol'));
- },
);
Slim::Buttons::Common::pushMode($client, 'xmlbrowser', \%params);
Modified: trunk/server/Plugins/Podcast/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Podcast/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/Podcast/Plugin.pm (original)
+++ trunk/server/Plugins/Podcast/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -176,11 +176,10 @@
$client->execute(['playlist', 'add', $item->{'value'}, $item->{'name'}]);
},
- overlayRef => [
- undef,
- Slim::Display::Display::symbol('notesymbol') .
- Slim::Display::Display::symbol('rightarrow')
- ],
+ overlayRef => sub {
+ my $client = shift;
+ return [ undef, $client->symbols('notesymbol') . $client->symbols('rightarrow') ];
+ },
);
Slim::Buttons::Common::pushMode($client, 'INPUT.Choice', \%params);
Modified: trunk/server/Plugins/RSSNews/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/RSSNews/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/RSSNews/Plugin.pm (original)
+++ trunk/server/Plugins/RSSNews/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -210,10 +210,7 @@
Slim::Buttons::Common::pushMode($client, 'xmlbrowser', \%params);
},
- overlayRef => [
- undef,
- Slim::Display::Display::symbol('rightarrow')
- ],
+ overlayRef => sub { return [ undef, shift->symbols('rightarrow') ] },
);
Slim::Buttons::Common::pushMode($client, 'INPUT.Choice', \%params);
Modified: trunk/server/Plugins/RandomPlay/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/RandomPlay/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/RandomPlay/Plugin.pm (original)
+++ trunk/server/Plugins/RandomPlay/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -510,10 +510,10 @@
# Put the right arrow by genre filter and notesymbol by mixes
if ($item eq 'genreFilter') {
- return [undef, Slim::Display::Display::symbol('rightarrow')];
+ return [undef, $client->symbols('rightarrow')];
} elsif ($item ne 'disable') {
- return [undef, Slim::Display::Display::symbol('notesymbol')];
+ return [undef, $client->symbols('notesymbol')];
} else {
return [undef, undef];
Modified: trunk/server/Plugins/Rescan/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/Rescan/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/Rescan/Plugin.pm (original)
+++ trunk/server/Plugins/Rescan/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -87,11 +87,11 @@
'stringHeader' => 1,
'callback' => \&rescanExitHandler,
'overlayRef' => sub {
- if ($_[0] ne 'PLUGIN_RESCAN_PRESS_PLAY') {
- return (undef, Slim::Display::Display::symbol('rightarrow'))
+ if ($_[1] ne 'PLUGIN_RESCAN_PRESS_PLAY') {
+ return (undef, $_[0]->symbols('rightarrow'))
}
},
- 'overlayRefArgs' => 'V',
+ 'overlayRefArgs' => 'CV',
'externRef' => sub {
my $client = shift;
my $value = shift;
Modified: trunk/server/Plugins/SavePlaylist/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/SavePlaylist/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/SavePlaylist/Plugin.pm (original)
+++ trunk/server/Plugins/SavePlaylist/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -15,10 +15,8 @@
our %context = ();
-my $rightarrow = Slim::Display::Display::symbol('rightarrow');
-
our @LegalChars = (
- Slim::Display::Display::symbol('rightarrow'),
+ undef, # placeholder for rightarrrow
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
@@ -160,8 +158,6 @@
if ($type eq 'nextChar') {
- $context{$client} =~ s/$rightarrow//;
-
# re-enter plugin with the new playlist title to get the confirmation screen for saving the playlist.
Slim::Buttons::Common::pushModeLeft($client,'PLUGIN.SavePlaylist', {
'playlist' => $context{$client},
Modified: trunk/server/Plugins/SlimTris/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/SlimTris/Plugin.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Plugins/SlimTris/Plugin.pm (original)
+++ trunk/server/Plugins/SlimTris/Plugin.pm Mon Jan 1 07:47:59 2007
@@ -414,8 +414,8 @@
my ($line1, $line2);
for (my $x = 1; $x < $width+2; $x++)
{
- $line1 .= grid2char($dispgrid[$x][1] * 2 + $dispgrid[$x][2]);
- $line2 .= grid2char($dispgrid[$x][3] * 2 + $dispgrid[$x][4]);
+ $line1 .= grid2char($client, $dispgrid[$x][1] * 2 + $dispgrid[$x][2]);
+ $line2 .= grid2char($client, $dispgrid[$x][3] * 2 + $dispgrid[$x][4]);
}
$parts = {
'line1' => $line1,
@@ -429,13 +429,14 @@
# convert numbers into characters. should use custom characters.
#
sub grid2char {
+ my $client = shift;
my $val = shift;
if ($customchar) {
return " " if ($val == 0);
- return Slim::Display::Display::symbol('slimtristop') if ($val == 1);
- return Slim::Display::Display::symbol('slimtrisbottom') if ($val == 2);
- return Slim::Display::Display::symbol('slimtrisboth') if ($val == 3);
+ return $client->symbols('slimtristop') if ($val == 1);
+ return $client->symbols('slimtrisbottom') if ($val == 2);
+ return $client->symbols('slimtrisboth') if ($val == 3);
} else {
return " " if ($val == 0);
return "o" if ($val == 1);
Modified: trunk/server/Slim/Buttons/AlarmClock.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/AlarmClock.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/AlarmClock.pm (original)
+++ trunk/server/Slim/Buttons/AlarmClock.pm Mon Jan 1 07:47:59 2007
@@ -231,7 +231,7 @@
'stringHeader' => 1,
'callback' => \&weekdayExitHandler,
'overlayRef' => \&weekdayOverlay,
- 'overlayRefArgs' => 'I',
+ 'overlayRefArgs' => 'CI',
},
);
}
@@ -305,10 +305,11 @@
}
sub weekdayOverlay {
- my $index = shift;
+ my $client = shift;
+ my $index = shift;
if ($index) {
- return (undef,Slim::Display::Display::symbol('rightarrow'));
+ return (undef,$client->symbols('rightarrow'));
} else {
return;
}
@@ -584,7 +585,7 @@
}
}
- return (undef,Slim::Display::Display::symbol('rightarrow'));
+ return (undef,$client->symbols('rightarrow'));
}
sub alarmHeader {
Modified: trunk/server/Slim/Buttons/BrowseDB.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/BrowseDB.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/BrowseDB.pm (original)
+++ trunk/server/Slim/Buttons/BrowseDB.pm Mon Jan 1 07:47:59 2007
@@ -283,8 +283,8 @@
'headerAddCount' => 1,
'stringHeader' => 1,
'callback' => \&mixerExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'valueRef' => \$mixer,
};
@@ -612,13 +612,13 @@
if ($levels[$level] ne 'track') {
return (undef, join('',
- Slim::Display::Display::symbol('notesymbol'),
- Slim::Display::Display::symbol('rightarrow')
+ $client->symbols('notesymbol'),
+ $client->symbols('rightarrow')
));
} else {
- return (undef, Slim::Display::Display::symbol('notesymbol'));
+ return (undef, $client->symbols('notesymbol'));
}
} else {
@@ -628,15 +628,15 @@
for my $import (keys %{$Imports}) {
if ($import->can('mixable') && $import->mixable($item)) {
- $overlay1 = Slim::Display::Display::symbol('mixable');
+ $overlay1 = $client->symbols('mixable');
}
}
}
if ($client->modeParam('descend')) {
- $overlay2 = Slim::Display::Display::symbol('rightarrow');
+ $overlay2 = $client->symbols('rightarrow');
} else {
- $overlay2 = Slim::Display::Display::symbol('notesymbol');
+ $overlay2 = $client->symbols('notesymbol');
}
return ($overlay1, $overlay2);
Modified: trunk/server/Slim/Buttons/BrowseTree.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/BrowseTree.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/BrowseTree.pm (original)
+++ trunk/server/Slim/Buttons/BrowseTree.pm Mon Jan 1 07:47:59 2007
@@ -206,8 +206,8 @@
'headerAddCount' => 1,
'stringHeader' => 1,
'callback' => \&mixerExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'valueRef' => \$mixer,
};
@@ -342,13 +342,13 @@
# A text item generally means ALL_, so overlay an arrow
if (!ref $item) {
- return (undef, Slim::Display::Display::symbol('rightarrow'));
+ return (undef, $client->symbols('rightarrow'));
}
if (Slim::Music::Info::isSong($item)) {
- $overlay2 = Slim::Display::Display::symbol('notesymbol');
+ $overlay2 = $client->symbols('notesymbol');
} else {
- $overlay2 = Slim::Display::Display::symbol('rightarrow');
+ $overlay2 = $client->symbols('rightarrow');
}
return ($overlay1, $overlay2);
Modified: trunk/server/Slim/Buttons/BrowseUPnPMediaServer.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/BrowseUPnPMediaServer.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/BrowseUPnPMediaServer.pm (original)
+++ trunk/server/Slim/Buttons/BrowseUPnPMediaServer.pm Mon Jan 1 07:47:59 2007
@@ -21,7 +21,6 @@
use Slim::Utils::UPnPMediaServer;
use Slim::Buttons::Common;
use Slim::Utils::Misc;
-use Slim::Display::Display;
sub init {
Slim::Buttons::Common::addMode( 'upnpmediaserver', getFunctions(), \&setMode );
@@ -192,10 +191,10 @@
return [ undef, undef ] unless defined($item);
if ($item->{'childCount'}) {
- $overlay = Slim::Display::Display::symbol('rightarrow');
+ $overlay = $client->symbols('rightarrow');
}
elsif ($item->{'url'}) {
- $overlay = Slim::Display::Display::symbol('notesymbol');
+ $overlay = $client->symbols('notesymbol');
}
return [ undef, $overlay ];
@@ -209,4 +208,4 @@
=cut
-1;
+1;
Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Mon Jan 1 07:47:59 2007
@@ -43,12 +43,10 @@
use Slim::Buttons::SqueezeNetwork;
use Slim::Buttons::Volume;
use Slim::Buttons::XMLBrowser;
-use Slim::Display::Display;
use Slim::Player::Client;
use Slim::Utils::DateTime;
use Slim::Utils::Log;
use Slim::Utils::Misc;
-use Slim::Display::Display;
use Slim::Buttons::Block;
use Slim::Buttons::Favorites;
use Slim::Buttons::SqueezeNetwork;
Modified: trunk/server/Slim/Buttons/Favorites.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Favorites.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Favorites.pm (original)
+++ trunk/server/Slim/Buttons/Favorites.pm Mon Jan 1 07:47:59 2007
@@ -135,11 +135,12 @@
'parentMode' => Slim::Buttons::Common::mode($client),
'overlayRef' => sub {
if (scalar @urls) {
- return (undef,Slim::Display::Display::symbol('notesymbol'));
+ return (undef,shift->symbols('notesymbol'));
} else {
return undef;
}
},
+ 'overlayRefArgs' => 'C',
);
Slim::Buttons::Common::pushMode($client, 'INPUT.List', \%params);
Modified: trunk/server/Slim/Buttons/Home.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Home.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Home.pm (original)
+++ trunk/server/Slim/Buttons/Home.pm Mon Jan 1 07:47:59 2007
@@ -83,9 +83,9 @@
'headerAddCount' => 1,
'callback' => \&homeExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
-
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+
+ 'overlayRefArgs' => 'C',
'valueRef' => undef,
);
Modified: trunk/server/Slim/Buttons/Information.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Information.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Information.pm (original)
+++ trunk/server/Slim/Buttons/Information.pm Mon Jan 1 07:47:59 2007
@@ -46,7 +46,6 @@
use File::Spec::Functions qw(catdir);
use Slim::Buttons::Common;
-use Slim::Display::Display;
use Slim::Music::Info;
use Slim::Utils::Misc;
use Slim::Utils::Network;
@@ -99,8 +98,8 @@
'externRef' => sub { return $_[0]->string('INFORMATION_MENU_' . uc($_[1])) },
'externRefArgs' => 'CV',
'listRef' => ['library','player','server','module'],
- 'overlayRef' => sub { return (undef,Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef,shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'callback' => \&mainExitHandler,
},
Modified: trunk/server/Slim/Buttons/Input/Bar.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/Bar.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/Bar.pm (original)
+++ trunk/server/Slim/Buttons/Input/Bar.pm Mon Jan 1 07:47:59 2007
@@ -56,7 +56,6 @@
use strict;
use Slim::Buttons::Common;
-use Slim::Display::Display;
use Slim::Utils::Log;
use Slim::Utils::Misc;
@@ -354,7 +353,7 @@
sub lines {
my $client = shift;
- # These parameters are used when calling this function from Slim::Display::Display
+ # These parameters are used when calling this function from Slim::Player::Player::mixerDisplay
my $value = shift;
my $header = shift;
my $args = shift;
@@ -480,8 +479,6 @@
L<Slim::Buttons::Settings>
-L<Slim::Display::Display>
-
=cut
1;
Modified: trunk/server/Slim/Buttons/Input/Choice.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/Choice.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/Choice.pm (original)
+++ trunk/server/Slim/Buttons/Input/Choice.pm Mon Jan 1 07:47:59 2007
@@ -53,7 +53,6 @@
use warnings;
use Slim::Buttons::Common;
-use Slim::Display::Display;
use Slim::Utils::Log;
use Slim::Utils::Misc;
Modified: trunk/server/Slim/Buttons/Input/List.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/List.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/List.pm (original)
+++ trunk/server/Slim/Buttons/Input/List.pm Mon Jan 1 07:47:59 2007
@@ -24,11 +24,13 @@
'urls' => \@urls,
'parentMode' => Slim::Buttons::Common::mode($client),
'overlayRef' => sub {
+ my $client = shift;
if (scalar @urls) {
- return (undef,Slim::Display::Display::symbol('notesymbol'));
+ return (undef, $client->symbols('notesymbol'));
} else {
return undef;
}
+ 'overlayRefArgs' => 'C',
},
);
@@ -46,7 +48,6 @@
use warnings;
use Slim::Buttons::Common;
-use Slim::Display::Display;
use Slim::Utils::Log;
use Slim::Utils::Misc;
Modified: trunk/server/Slim/Buttons/Input/Time.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Input/Time.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Input/Time.pm (original)
+++ trunk/server/Slim/Buttons/Input/Time.pm Mon Jan 1 07:47:59 2007
@@ -41,7 +41,6 @@
use strict;
use Slim::Buttons::Common;
-use Slim::Display::Display;
use Slim::Utils::DateTime;
use Slim::Utils::Misc;
Modified: trunk/server/Slim/Buttons/Search.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Search.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Search.pm (original)
+++ trunk/server/Slim/Buttons/Search.pm Mon Jan 1 07:47:59 2007
@@ -24,11 +24,9 @@
use File::Spec::Functions qw(:ALL);
use File::Spec::Functions qw(updir);
use Slim::Buttons::Common;
-use Slim::Display::Display;
# button functions for search directory
my @defaultSearchChoices = qw(ARTISTS ALBUMS SONGS);
-my $rightarrow = Slim::Display::Display::symbol('rightarrow');
our %current = ();
our %context = ();
@@ -59,8 +57,8 @@
'stringHeader' => 1,
'headerAddCount' => 1,
'callback' => \&searchExitHandler,
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'submenus' => {
'ARTISTS' => {
@@ -153,7 +151,6 @@
if ($exitType eq 'BACKSPACE') {
Slim::Buttons::Common::popModeRight($client);
} else {
- $context{$client} =~ s/$rightarrow//;
startSearch($client);
}
}
@@ -210,7 +207,7 @@
for my $a (@{$client->searchTerm}) {
- if (defined($a) && ($a ne $rightarrow)) {
+ if (defined($a)) {
$term .= $a;
}
}
Modified: trunk/server/Slim/Buttons/Settings.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Settings.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Settings.pm (original)
+++ trunk/server/Slim/Buttons/Settings.pm Mon Jan 1 07:47:59 2007
@@ -33,10 +33,6 @@
our %current = ();
our %menuParams = ();
our %functions = ();
-
-sub arrowFunc {
- return (undef,Slim::Display::Display::symbol('rightarrow'));
-};
sub init {
#Slim::Buttons::Common::addMode('settings',Slim::Buttons::Settings::getFunctions(),\&Slim::Buttons::Settings::setMode);
@@ -63,8 +59,8 @@
'header' => 'SETTINGS',
'stringHeader' => 1,
'headerAddCount' => 1,
- 'overlayRef' => \&arrowFunc,
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'init' => \&settingsMenu,
'submenus' => {
@@ -330,8 +326,8 @@
'header' => 'SCREENSAVERS',
'stringHeader' => 1,
'headerAddCount' => 1,
- 'overlayRef' => \&arrowFunc,
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'submenus' => {
'SETUP_SCREENSAVER' => {
Modified: trunk/server/Slim/Buttons/Synchronize.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Synchronize.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Synchronize.pm (original)
+++ trunk/server/Slim/Buttons/Synchronize.pm Mon Jan 1 07:47:59 2007
@@ -21,7 +21,6 @@
use strict;
use File::Spec::Functions qw(:ALL);
use File::Spec::Functions qw(updir);
-use Slim::Display::Display;
our %functions = ();
@@ -119,8 +118,8 @@
return buddies($_[0], undef);
},
'externRefArgs' => 'CV',
- 'overlayRef' => sub { return (undef, Slim::Display::Display::symbol('rightarrow')) },
- 'overlayRefArgs' => '',
+ 'overlayRef' => sub { return (undef, shift->symbols('rightarrow')) },
+ 'overlayRefArgs' => 'C',
'callback' => \&syncExitHandler,
'onChange' => sub { $_[0]->syncSelection($_[1]); },
'onChangeArgs' => 'CI'
Modified: trunk/server/Slim/Buttons/TrackInfo.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/TrackInfo.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/TrackInfo.pm (original)
+++ trunk/server/Slim/Buttons/TrackInfo.pm Mon Jan 1 07:47:59 2007
@@ -519,10 +519,10 @@
my $overlay1 = ' (' . ($index+1) . ' ' . $client->string('OF') .' ' . scalar(@{$client->trackInfoLines}) . ')';
# add note symbol
- $overlay1 .= Slim::Display::Display::symbol('notesymbol');
+ $overlay1 .= $client->symbols('notesymbol');
# add right arrow symbol if current line can point to more info e.g. artist, album, year etc
- my $overlay2 = defined($client->trackInfoContent->[$index]) ? Slim::Display::Display::symbol('rightarrow') : undef;
+ my $overlay2 = defined($client->trackInfoContent->[$index]) ? $client->symbols('rightarrow') : undef;
return ($overlay1, $overlay2);
}
Modified: trunk/server/Slim/Buttons/XMLBrowser.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/XMLBrowser.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/XMLBrowser.pm (original)
+++ trunk/server/Slim/Buttons/XMLBrowser.pm Mon Jan 1 07:47:59 2007
@@ -249,7 +249,7 @@
] );
},
- 'overlayRef' => [ undef, Slim::Display::Display::symbol('rightarrow') ],
+ 'overlayRef' => [ undef, shift->symbols('rightarrow') ],
);
unshift @{$feed->{'items'}}, \%desc; # prepend
@@ -364,9 +364,6 @@
'charsRef' => 'UPPER',
'numberLetterRef' => 'UPPER',
'callback' => \&handleSearch,
- 'overlayRef' => sub {
- return (undef, $client->symbols('rightarrow'))
- },
'_search' => $item->{'search'},
);
@@ -466,11 +463,8 @@
my $searchString = ${ $client->modeParam('valueRef') };
# Don't allow null search string
- my $rightarrow = Slim::Display::Display::symbol('rightarrow');
- return $client->bumpRight if $searchString eq $rightarrow;
-
- $searchString =~ s/$rightarrow//;
-
+ return $client->bumpRight if $searchString eq '';
+
$client->block(
$client->string('SEARCHING'),
$searchString
@@ -501,14 +495,14 @@
if (hasAudio($item)) {
- $overlay .= Slim::Display::Display::symbol('notesymbol');
+ $overlay .= $client->symbols('notesymbol');
}
$item->{'type'} ||= ''; # avoid warning but still display right arrow
if ( $item->{'type'} ne 'text' && ( hasDescription($item) || hasLink($item) ) ) {
- $overlay .= Slim::Display::Display::symbol('rightarrow');
+ $overlay .= $client->symbols('rightarrow');
}
return [ undef, $overlay ];
@@ -595,18 +589,18 @@
if (my $link = hasLink($item)) {
push @lines, {
- 'name' => '{XML_LINK}: ' . $link,
- 'value' => $link,
- 'overlayRef' => [ undef, Slim::Display::Display::symbol('rightarrow') ],
+ 'name' => '{XML_LINK}: ' . $link,
+ 'value' => $link,
+ 'overlayRef'=> [ undef, shift->symbols('rightarrow') ],
}
}
if (hasAudio($item)) {
push @lines, {
- 'name' => '{XML_ENCLOSURE}: ' . $item->{'enclosure'}->{'url'},
- 'value' => $item->{'enclosure'}->{'url'},
- 'overlayRef' => [ undef, Slim::Display::Display::symbol('notesymbol') ],
+ 'name' => '{XML_ENCLOSURE}: ' . $item->{'enclosure'}->{'url'},
+ 'value' => $item->{'enclosure'}->{'url'},
+ 'overlayRef'=> [ undef, $client->symbols('notesymbol') ],
};
# its a remote audio source, use remotetrackinfo
@@ -681,9 +675,9 @@
if ($count) {
push @lines, {
- 'name' => '{XML_AUDIO_ENCLOSURES}: ' . $count,
- 'value' => $feed,
- 'overlayRef' => [ undef, Slim::Display::Display::symbol('notesymbol') ],
+ 'name' => '{XML_AUDIO_ENCLOSURES}: ' . $count,
+ 'value' => $feed,
+ 'overlayRef' => [ undef, shift->symbols('notesymbol') ],
};
}
Modified: trunk/server/Slim/Display/Display.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Display.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Display/Display.pm (original)
+++ trunk/server/Slim/Display/Display.pm Mon Jan 1 07:47:59 2007
@@ -755,55 +755,6 @@
return $strings->{$name.'_DBL'} || $strings->{$name} || logBacktrace("missing string $name") && '';
}
-
-# Utility functions for Text players + backwards compatibility for plugins
-# Aim to move this into Display::Text, but will mean plugin changes
-
-our %Symbols = (
- 'notesymbol' => "\x1Fnotesymbol\x1F",
- 'rightarrow' => "\x1Frightarrow\x1F",
- 'progressEnd'=> "\x1FprogressEnd\x1F",
- 'progress1e' => "\x1Fprogress1e\x1F",
- 'progress2e' => "\x1Fprogress2e\x1F",
- 'progress3e' => "\x1Fprogress3e\x1F",
- 'progress1' => "\x1Fprogress1\x1F",
- 'progress2' => "\x1Fprogress2\x1F",
- 'progress3' => "\x1Fprogress3\x1F",
- 'cursor' => "\x1Fcursor\x1F",
- 'mixable' => "\x1Fmixable\x1F",
- 'bell' => "\x1Fbell\x1F",
- 'hardspace' => "\x1Fhardspace\x1F"
-);
-
-our %commandmap = (
- 'center' => "\x1ecenter\x1e",
- 'cursorpos' => "\x1ecursorpos\x1e",
- 'framebuf' => "\x1eframebuf\x1e",
- '/framebuf' => "\x1e/framebuf\x1e",
- 'linebreak' => "\x1elinebreak\x1e",
- 'repeat' => "\x1erepeat\x1e",
- 'right' => "\x1eright\x1e",
- 'scroll' => "\x1escroll\x1e",
- '/scroll' => "\x1e/scroll\x1e",
- 'tight' => "\x1etight\x1e",
- '/tight' => "\x1e/tight\x1e",
- 'font' => "\x1efont\x1e",
- '/font' => "\x1e/font\x1e",
- 'defaultfont'=> "\x1edefaultfont\x1e",
-);
-
-sub symbol {
- my $symname = shift;
- if (exists($commandmap{$symname})) { return $commandmap{$symname}; }
- return ("\x1f". $symname . "\x1f");
-}
-
-sub command {
- my $symname = shift;
- if (exists($commandmap{$symname})) { return $commandmap{$symname}; }
-}
-
-
=head1 SEE ALSO
=cut
Modified: trunk/server/Slim/Display/Lib/TextVFD.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Lib/TextVFD.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Display/Lib/TextVFD.pm (original)
+++ trunk/server/Slim/Display/Lib/TextVFD.pm Mon Jan 1 07:47:59 2007
@@ -154,7 +154,7 @@
my $line;
- my $cursorchar = Slim::Display::Display::symbol('cursorpos');
+ my $cursorchar = $Slim::Display::Text::commandmap{'cursorpos'};
my $i = 0;
Modified: trunk/server/Slim/Display/Text.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Display/Text.pm?rev=11071&r1=11070&r2=11071&view=diff
==============================================================================
--- trunk/server/Slim/Display/Text.pm (original)
+++ trunk/server/Slim/Display/Text.pm Mon Jan 1 07:47:59 2007
@@ -697,17 +697,6 @@
return lineLength($text);
}
-sub symbols {
- my $display = shift;
- my $line = shift || return undef;
-
- return $Slim::Display::Display::Symbols{$line} if exists $Slim::Display::Display::Symbols{$line};
- return $Slim::Display::Display::commandmap{$line} if exists $Slim::Display::Display::commandmap{$line};
- return "\x1F$line\x1F" if Slim::Display::Lib::TextVFD::isCustomChar($line);
-
- return $line;
-}
-
# Draws a slider bar, bidirectional or single direction is possible.
# $value should be pre-processed to be from 0-100
# $midpoint specifies the position of the divider from 0-100 (use 0 for progressBar)
@@ -809,11 +798,55 @@
return Slim::Utils::Unicode::utf8toLatin1($display->SUPER::doubleString(@_));
}
+our %Symbols = (
+ 'notesymbol' => "\x1Fnotesymbol\x1F",
+ 'rightarrow' => "\x1Frightarrow\x1F",
+ 'progressEnd'=> "\x1FprogressEnd\x1F",
+ 'progress1e' => "\x1Fprogress1e\x1F",
+ 'progress2e' => "\x1Fprogress2e\x1F",
+ 'progress3e' => "\x1Fprogress3e\x1F",
+ 'progress1' => "\x1Fprogress1\x1F",
+ 'progress2' => "\x1Fprogress2\x1F",
+ 'progress3' => "\x1Fprogress3\x1F",
+ 'cursor' => "\x1Fcursor\x1F",
+ 'mixable' => "\x1Fmixable\x1F",
+ 'bell' => "\x1Fbell\x1F",
+ 'hardspace' => "\x1Fhardspace\x1F"
+);
+
+our %commandmap = (
+ 'center' => "\x1ecenter\x1e",
+ 'cursorpos' => "\x1ecursorpos\x1e",
+ 'framebuf' => "\x1eframebuf\x1e",
+ '/framebuf' => "\x1e/framebuf\x1e",
+ 'linebreak' => "\x1elinebreak\x1e",
+ 'repeat' => "\x1erepeat\x1e",
+ 'right' => "\x1eright\x1e",
+ 'scroll' => "\x1escroll\x1e",
+ '/scroll' => "\x1e/scroll\x1e",
+ 'tight' => "\x1etight\x1e",
+ '/tight' => "\x1e/tight\x1e",
+ 'font' => "\x1efont\x1e",
+ '/font' => "\x1e/font\x1e",
+ 'defaultfont'=> "\x1edefaultfont\x1e",
+);
+
+sub symbols {
+ my $display = shift;
+ my $line = shift || return undef;
+
+ return $Symbols{$line} if exists $Symbols{$line};
+ return $commandmap{$line} if exists $commandmap{$line};
+ return "\x1F$line\x1F" if Slim::Display::Lib::TextVFD::isCustomChar($line);
+
+ return $line;
+}
+
+
# register text custom characters - not called as a method of display
sub setCustomChar {
Slim::Display::Lib::TextVFD::setCustomChar(@_);
}
-
# utility functions to manipulate strings including text display control characters
More information about the checkins
mailing list