[Slimp3-checkins] CVS: slimp3/server/lib/SliMP3 Animation.pm,1.26,1.27 HTTP.pm,1.128,1.129 Info.pm,1.32,1.33 RemoteStream.pm,1.9,1.10

[dean b. <bla...@us...>]

Update of /cvsroot/slimp3/slimp3/server/lib/SliMP3
In directory usw-pr-cvs1:/tmp/cvs-serv3499/lib/SliMP3

Modified Files:
	Animation.pm HTTP.pm Info.pm RemoteStream.pm 
Log Message:
Fixed some bugs relating to the sourceforge bug: 536004

When calculating the scroll entries for "Now Playing", make sure you are using
the current lines as returned by SliMP3::Buttons::Playlist::currentSongLines()

Fixed another problem where hitting the REC button would crash in the same way.

Use the SliMP3::Playlist::currentSong() function instead of looking at the 
data structures directly in the HTTP and remotestream code...

Fixed a bug where we weren't displaying an empty playlist correctly sometimes.




Index: Animation.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Animation.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Animation.pm	27 Mar 2002 19:59:16 -0000	1.26
--- Animation.pm	28 Mar 2002 05:28:35 -0000	1.27
***************
*** 305,310 ****
  	my $client = shift;
  
! 	#get the untrimmed version of line2
! 	my $line2 = SliMP3::Info::standardTitle($client,SliMP3::Playlist::currentSong($client));
  	if (SliMP3::Prefs::clientGet($client,'doublesize')) {
  		scrollDouble($client,$line2);
--- 305,310 ----
  	my $client = shift;
  
! 	my ($line1, $line2, $overlay1, $overlay2) = SliMP3::Buttons::Playlist::currentSongLines($client);
! 
  	if (SliMP3::Prefs::clientGet($client,'doublesize')) {
  		scrollDouble($client,$line2);

Index: HTTP.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/HTTP.pm,v
retrieving revision 1.128
retrieving revision 1.129
diff -C2 -d -r1.128 -r1.129
*** HTTP.pm	24 Mar 2002 01:21:24 -0000	1.128
--- HTTP.pm	28 Mar 2002 05:28:36 -0000	1.129
***************
*** 886,896 ****
  
  	my $songcount = SliMP3::Playlist::count($myClientState);
! 	
  	if ($songcount > 0) {
  		$$main_form_ref{'currentsong'}    = $myClientState->currentsong + 1;
  		$$main_form_ref{'songcount'}      = $songcount;
! 		$$main_form_ref{'songtitle'}      = SliMP3::Info::standardTitle(undef,$myClientState->playlist($myClientState->shufflelist($myClientState->currentsong)));
! 		$$main_form_ref{'artist'} 		  = SliMP3::Info::artist($myClientState->playlist($myClientState->shufflelist($myClientState->currentsong)));
! 		$$main_form_ref{'album'} 		  = SliMP3::Info::album($myClientState->playlist($myClientState->shufflelist($myClientState->currentsong)));
  	}
  	my $output = "";
--- 886,896 ----
  
  	my $songcount = SliMP3::Playlist::count($myClientState);
! 
  	if ($songcount > 0) {
  		$$main_form_ref{'currentsong'}    = $myClientState->currentsong + 1;
  		$$main_form_ref{'songcount'}      = $songcount;
! 		$$main_form_ref{'songtitle'}      = SliMP3::Info::standardTitle(undef,SliMP3::Playlist::currentSong($myClientState));
! 		$$main_form_ref{'artist'} 		  = SliMP3::Info::artist(SliMP3::Playlist::currentSong($myClientState));
! 		$$main_form_ref{'album'} 		  = SliMP3::Info::album(SliMP3::Playlist::currentSong($myClientState));
  	}
  	my $output = "";

Index: Info.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Info.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Info.pm	27 Mar 2002 19:03:04 -0000	1.32
--- Info.pm	28 Mar 2002 05:28:36 -0000	1.33
***************
*** 245,248 ****
--- 245,249 ----
  	my $safestr = shift; # format string to use in the event that after filling the first string, there is nothing left
  	my $pos = 0; # keeps track of position within the format string
+ 
  	my %infoHash = %{info($file)}; # hash of data elements not cached in the main repository
  	if (!defined($str)) { #use a safe format string if none specified

Index: RemoteStream.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/RemoteStream.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RemoteStream.pm	25 Mar 2002 01:18:03 -0000	1.9
--- RemoteStream.pm	28 Mar 2002 05:28:36 -0000	1.10
***************
*** 97,101 ****
  		$client->mp3filehandle()->read($metadata, $metadataSize);
  		if ($metadata =~ (/StreamTitle=\'(.*?)\'/)) {
! 			my $url = $client->playlist($client->shufflelist($client->currentsong));
  			
  			my $title = $1;
--- 97,101 ----
  		$client->mp3filehandle()->read($metadata, $metadataSize);
  		if ($metadata =~ (/StreamTitle=\'(.*?)\'/)) {
! 			my $url = SliMP3::Playlist::currentSong($client);
  			
  			my $title = $1;