Index: strings.txt
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/strings.txt,v
retrieving revision 1.117
diff -u -p -B -r1.117 strings.txt
--- strings.txt	2 Jul 2004 13:22:37 -0000	1.117
+++ strings.txt	3 Jul 2004 03:45:06 -0000
@@ -985,6 +985,12 @@ SETUP_SCROLLRATE_DESC
 	NO	Du kan justere tiden spilleren venter før den scroller til neste bokstav i teksten på displayet. Skriv inn verdien i sekunder. Lavt nummer scroller fortere. 0.15 sekunder er standard.
 	SE	Tid mellan rullande scroll-bilder. O.15 är standardvärdet. Värden mellan 0 och 1 kan sättas för att öka eller minska scroll-tempot 
 
+SETUP_SCROLLRATEDOUBLE
+	EN	Double-Size Scroll Rate
+
+SETUP_SCROLLRATEDOUBLE_DESC
+	EN	You can adjust the amount of time that the player waits before scrolling another letter of text on the display when using Double Size text. Enter a value, in seconds, for the amount of time to wait.  Lower numbers make it scroll faster.  0.1 seconds is the default.
+
 SETUP_GROUP_ALARM
 	DE	Wecker
 	DK	Alarm
Index: Slim/Utils/Prefs.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Utils/Prefs.pm,v
retrieving revision 1.75
diff -u -p -B -r1.75 Prefs.pm
--- Slim/Utils/Prefs.pm	1 Jul 2004 05:10:32 -0000	1.75
+++ Slim/Utils/Prefs.pm	3 Jul 2004 03:45:07 -0000
@@ -197,6 +197,7 @@ my %DEFAULT = (
 			,'screensavertimeout' 	=> 30
 			,'scrollPause'			=> 3.6
 			,'scrollRate'			=> 0.15
+			,'scrollRateDouble'		=> 0.1
 			,'shuffle'				=> 0
 			,'silent'				=> 0
 			,'syncPower'			=> 0
Index: Slim/Web/Setup.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Web/Setup.pm,v
retrieving revision 1.86
diff -u -p -B -r1.86 Setup.pm
--- Slim/Web/Setup.pm	25 Jun 2004 00:53:34 -0000	1.86
+++ Slim/Web/Setup.pm	3 Jul 2004 03:45:09 -0000
@@ -426,7 +426,7 @@ sub initSetupConfig {
 		# if more than one ir map exists the undef will be replaced by 'Default'
 		,'Groups' => {
 			'Default' => {
-				'PrefOrder' => ['autobrightness','screensavertimeout','scrollPause','scrollRate']
+				'PrefOrder' => ['autobrightness','screensavertimeout','scrollPause','scrollRate','scrollRateDouble']
 			}
 			,'AlarmClock' => {
 				'PrefOrder' => ['alarm','alarmtime','alarmvolume','alarmplaylist']
@@ -486,6 +486,10 @@ sub initSetupConfig {
 				'validate' => \&validateNumber
 				,'validateArgs' => [0,undef,1]
 			},
+			'scrollRateDouble' => {
+				'validate' => \&validateNumber
+				,'validateArgs' => [0,undef,1]
+			},
 			'irsetlist' => {
 				'isArray' => 1
 				,'dontSet' => 1
Index: Slim/Display/Animation.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Display/Animation.pm,v
retrieving revision 1.16
diff -u -p -B -r1.16 Animation.pm
--- Slim/Display/Animation.pm	10 May 2004 20:01:07 -0000	1.16
+++ Slim/Display/Animation.pm	3 Jul 2004 03:45:09 -0000
@@ -25,9 +25,6 @@ my $scrollSingleLine1FrameRate = 0.9;	# 
                                         # slower?  But at this rate the time
                                         # looks smooth.
 
-my $scrollDoubleFrameRate = 0.1;	# How quickly to scroll in 2x display
-                                        # mode..
-
 my $scrollSeparator = "      ";
 ################### WARNING WARNING WARNING WARNING ###################
 # The code in this file has been carefully tuned for performance.
@@ -119,13 +116,15 @@ sub showBriefly {
 
 		my @newqueue = ();
 		my ($t1, $t2);
-		
-		my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');
+		my $rate;
 	
 		# double them
 		if ($double) {
+			$rate = Slim::Buttons::Common::paramOrPref($client,'scrollRateDouble');
 			($line1, $line2) = Slim::Display::Display::doubleSize($client,$line1,$line2);
-		}	
+		} else {
+			$rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');
+		}
 		
 		# add some blank space to the end of each line
 		if (Slim::Hardware::VFD::lineLength($line1) > 40) {
@@ -343,13 +342,19 @@ sub scrollBottom {
 	my $line2 = shift;
 	my $overlay1 = shift;
 	my $overlay2 = shift;
-	my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');
+	my $rate;
+	my $double;
 	
+	if ($double = Slim::Utils::Prefs::clientGet($client,'doublesize')) {
+		$rate = Slim::Buttons::Common::paramOrPref($client,'scrollRateDouble');
+	} else {
+		$rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');
+	}
+	print "RAte: $rate\n";
 	if (!defined($line1)) { $line1 = ""; };
 	if (!defined($overlay1)) { $overlay1 = ""; };
 	if (!defined($line2)) { $line2 = ""; };
 	if (!defined($overlay2)) { $overlay2 = ""; };
-	my $double;
 	my $len;
 
 	if (Slim::Utils::Prefs::get('animationLevel') < 3) {
@@ -361,8 +366,8 @@ sub scrollBottom {
 	# now uses a client param, undef or zero for static top line, non-zero for a dynamic top line.
 	if (defined(Slim::Buttons::Common::param($client,'animateTop')) 
 				&& Slim::Buttons::Common::param($client,'animateTop')) {
-		if (Slim::Utils::Prefs::clientGet($client,'doublesize')) {
-			scrollDouble($client,$line2,$overlay2);
+		if ($double) {
+			scrollDouble($client,$line2,$overlay2,$rate);
 		}
 		else {
 			scrollSingle($client,$line2,$overlay2);
@@ -371,15 +376,12 @@ sub scrollBottom {
 	}
 	
 	# calculate the displayed length
-	if ($double = Slim::Utils::Prefs::clientGet($client,'doublesize')) {
-		my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');#*2/3;
-		$double = 1;
+	if ($double) {
 		$overlay2 = "";
 		$overlay1 = "";
 		my ($double1, $double2) = Slim::Display::Display::doubleSize($client,$line1,$line2);
 		$len = Slim::Hardware::VFD::lineLength($double1);
 	} else {
-		$double = 0;
 		$len = Slim::Hardware::VFD::lineLength($line2);
 	}
 
@@ -397,8 +399,8 @@ sub scrollBottom {
 
 		# double them
 		if ($double) {
-			($measure1, $measure2) = Slim::Display::Display::doubleSize($client,$line1,$measure2);
-			($line1, $line2) = Slim::Display::Display::doubleSize($client,$line1,$line2);
+			scrollDouble($client,$line2,$overlay2,$rate);
+			return;
 		}
 	
 		$len = Slim::Hardware::VFD::lineLength($measure2);
@@ -411,8 +413,6 @@ sub scrollBottom {
 				,[0,0] #start at the begining
 				,[$double,1] #scroll the top if doublesize
 				,$rate,$double);
-		
-		
 	} else {
 		$client->update();
 	}
@@ -449,7 +449,7 @@ sub scrollDouble {
 	my $rate = shift;
 	
 	if (!defined($rate) || $rate < 0) {
-		my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');#*2/3;
+		my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRateDouble');
 	}
 
 	my ($text1,$text2) = Slim::Display::Display::doubleSize($client,$line2);
@@ -741,7 +741,7 @@ sub animateScrollDouble {
 	my $ind = shift;
 	my $len = shift;
 	my $hold = Slim::Buttons::Common::paramOrPref($client,'scrollPause');
-	my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRate');#*2/3;
+	my $rate = Slim::Buttons::Common::paramOrPref($client,'scrollRateDouble');
 	if ($overdue > $rate) {
 		$ind += int($overdue/$rate);
 	}