[Slimp3-checkins] CVS: slimp3/server/lib/SliMP3 Playlist.pm,1.129,1.130 Stdio.pm,1.7,1.8

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

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

Modified Files:
	Playlist.pm Stdio.pm 
Log Message:
Command-line bugs fixed:  querying of shuffle mode shouldn't reshuffle
and if you specify a player IP address, it should be returned in the
response.


Index: Playlist.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Playlist.pm,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** Playlist.pm	30 Oct 2002 17:47:35 -0000	1.129
--- Playlist.pm	31 Oct 2002 21:21:42 -0000	1.130
***************
*** 251,260 ****
  				if (!defined($p2)) {
  					shuffle($client, !shuffle($client));
  				} elsif ($p2 eq "?") {
  					$p2 = shuffle($client);
  				} else {
  					shuffle($client, $p2);
  				}
- 				reshuffle($client);
  			} elsif ($p1 eq "clear") {
  				@{playList($client)} = ();
--- 251,261 ----
  				if (!defined($p2)) {
  					shuffle($client, !shuffle($client));
+ 					reshuffle($client);
  				} elsif ($p2 eq "?") {
  					$p2 = shuffle($client);
  				} else {
  					shuffle($client, $p2);
+ 					reshuffle($client);
  				}
  			} elsif ($p1 eq "clear") {
  				@{playList($client)} = ();
***************
*** 502,506 ****
  	}
  	
! 	return SliMP3::Prefs::clientGet($client, "shuffle");
  }
  
--- 503,507 ----
  	}
  	
! 	return SliMP3::Prefs::clientGet($client, "shuffle") ? 1 : 0;
  }
  

Index: Stdio.pm
===================================================================
RCS file: /cvsroot/slimp3/slimp3/server/lib/SliMP3/Stdio.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Stdio.pm	20 Sep 2002 17:58:09 -0000	1.7
--- Stdio.pm	31 Oct 2002 21:21:44 -0000	1.8
***************
*** 245,248 ****
--- 245,249 ----
  	my @params;
  	my($client) = undef;
+ 	my $prefix = "";
  
  	# todo - allow for escaping and/or quoting
***************
*** 257,260 ****
--- 258,262 ----
  		
  		if (defined($client)) {
+ 			$prefix = SliMP3::HTTP::escape($params[0]) . " ";
  			shift @params;
  		}
***************
*** 272,276 ****
  		}
  
! 		$output = join(" ", @outputParams);
  	} else {
  		$::d_stdio && msg("No params parsed from stdio!\n");
--- 274,278 ----
  		}
  
! 		$output = $prefix . join(" ", @outputParams);
  	} else {
  		$::d_stdio && msg("No params parsed from stdio!\n");