dsully | 1 Nov 01:07 2005

[Slim-Checkins] r4971 - in /trunk/server: Plugins/ Plugins/MusicMagic/ Plugins/Picks/ Plugins/RadioIO/ Slim/Buttons/ Slim/Control/ Slim/DataStores/ Slim/DataStores/DBI/ Slim/Formats/ Slim/Music/ Slim/Player/ Slim/Player/Protocols/ Slim/Utils/ Slim/Web/

Author: dsully
Date: Mon Oct 31 16:06:54 2005
New Revision: 4971

URL: http://svn.slimdevices.com?rev=4971&view=rev
Log:
Bug: N/A & 2450
Description: Harden the code against bogus objects - check for blessed() & valid object calls.

This is round one - round two will include throwing exceptions up the stack.

Modified:
    trunk/server/Plugins/MusicMagic/Plugin.pm
    trunk/server/Plugins/Picks/Plugin.pm
    trunk/server/Plugins/RPC.pm
    trunk/server/Plugins/RadioIO/Plugin.pm
    trunk/server/Slim/Buttons/AlarmClock.pm
    trunk/server/Slim/Buttons/BrowseTree.pm
    trunk/server/Slim/Buttons/Playlist.pm
    trunk/server/Slim/Buttons/TrackInfo.pm
    trunk/server/Slim/Control/CLI.pm
    trunk/server/Slim/Control/Command.pm
    trunk/server/Slim/DataStores/Base.pm
    trunk/server/Slim/DataStores/DBI/Track.pm
    trunk/server/Slim/Formats/Parse.pm
    trunk/server/Slim/Music/Import.pm
    trunk/server/Slim/Music/Info.pm
    trunk/server/Slim/Player/Client.pm
    trunk/server/Slim/Player/Playlist.pm
    trunk/server/Slim/Player/Protocols/HTTP.pm
(Continue reading)

dsully | 1 Nov 01:21 2005

[Slim-Checkins] r4972 - in /branches/BRANCH_6_2_x/server: Plugins/ Plugins/MusicMagic/ Plugins/Picks/ Plugins/RadioIO/ Slim/Buttons/ Slim/Control/ Slim/DataStores/ Slim/DataStores/DBI/ Slim/Display/ Slim/Formats/ Slim/Music/ Slim/Player/ Slim/Player/Protocols/ Slim/Utils/ Slim/Web/

Author: dsully
Date: Mon Oct 31 16:21:47 2005
New Revision: 4972

URL: http://svn.slimdevices.com?rev=4972&view=rev
Log:
Bug: N/A
Description: Merge from trunk: -r 4969:4971, -r 4967:4968

Modified:
    branches/BRANCH_6_2_x/server/Plugins/MusicMagic/Plugin.pm
    branches/BRANCH_6_2_x/server/Plugins/Picks/Plugin.pm
    branches/BRANCH_6_2_x/server/Plugins/RPC.pm
    branches/BRANCH_6_2_x/server/Plugins/RadioIO/Plugin.pm
    branches/BRANCH_6_2_x/server/Slim/Buttons/AlarmClock.pm
    branches/BRANCH_6_2_x/server/Slim/Buttons/BrowseTree.pm
    branches/BRANCH_6_2_x/server/Slim/Buttons/Playlist.pm
    branches/BRANCH_6_2_x/server/Slim/Buttons/TrackInfo.pm
    branches/BRANCH_6_2_x/server/Slim/Control/CLI.pm
    branches/BRANCH_6_2_x/server/Slim/Control/Command.pm
    branches/BRANCH_6_2_x/server/Slim/DataStores/Base.pm
    branches/BRANCH_6_2_x/server/Slim/DataStores/DBI/Track.pm
    branches/BRANCH_6_2_x/server/Slim/Display/Graphics.pm
    branches/BRANCH_6_2_x/server/Slim/Formats/FLAC.pm
    branches/BRANCH_6_2_x/server/Slim/Formats/Parse.pm
    branches/BRANCH_6_2_x/server/Slim/Music/Import.pm
    branches/BRANCH_6_2_x/server/Slim/Music/Info.pm
    branches/BRANCH_6_2_x/server/Slim/Player/Client.pm
    branches/BRANCH_6_2_x/server/Slim/Player/Playlist.pm
    branches/BRANCH_6_2_x/server/Slim/Player/Protocols/HTTP.pm
(Continue reading)

dsully | 1 Nov 01:26 2005

[Slim-Checkins] r4973 - /trunk/server/Slim/Music/Info.pm

Author: dsully
Date: Mon Oct 31 16:26:21 2005
New Revision: 4973

URL: http://svn.slimdevices.com?rev=4973&view=rev
Log:
Bug: N/A
Description: Fix typo.

Modified:
    trunk/server/Slim/Music/Info.pm

Modified: trunk/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Info.pm?rev=4973&r1=4972&r2=4973&view=diff
==============================================================================
--- trunk/server/Slim/Music/Info.pm (original)
+++ trunk/server/Slim/Music/Info.pm Mon Oct 31 16:26:21 2005
 <at>  <at>  -1107,7 +1107,7  <at>  <at> 

 	for my $track ($obj->tracks) {

-		if (lbessed($track) && $track->can('url')) {
+		if (blessed($track) && $track->can('url')) {

 			push  <at> urls, $track->url;

dsully | 1 Nov 01:27 2005

[Slim-Checkins] r4974 - /branches/BRANCH_6_2_x/server/Slim/Music/Info.pm

Author: dsully
Date: Mon Oct 31 16:27:09 2005
New Revision: 4974

URL: http://svn.slimdevices.com?rev=4974&view=rev
Log:
Bug: N/A
Description: Merge from trunk: -r 4972:4973

Modified:
    branches/BRANCH_6_2_x/server/Slim/Music/Info.pm

Modified: branches/BRANCH_6_2_x/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/branches/BRANCH_6_2_x/server/Slim/Music/Info.pm?rev=4974&r1=4973&r2=4974&view=diff
==============================================================================
--- branches/BRANCH_6_2_x/server/Slim/Music/Info.pm (original)
+++ branches/BRANCH_6_2_x/server/Slim/Music/Info.pm Mon Oct 31 16:27:09 2005
 <at>  <at>  -1106,7 +1106,7  <at>  <at> 

 	for my $track ($obj->tracks) {

-		if (lbessed($track) && $track->can('url')) {
+		if (blessed($track) && $track->can('url')) {

 			push  <at> urls, $track->url;

dsully | 1 Nov 01:50 2005

[Slim-Checkins] r4976 - /branches/BRANCH_6_2_x/server/Slim/Music/Info.pm

Author: dsully
Date: Mon Oct 31 16:50:12 2005
New Revision: 4976

URL: http://svn.slimdevices.com?rev=4976&view=rev
Log:
Bug: N/A
Description: Merge from trunk: -r 4974:4975

Modified:
    branches/BRANCH_6_2_x/server/Slim/Music/Info.pm

Modified: branches/BRANCH_6_2_x/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/branches/BRANCH_6_2_x/server/Slim/Music/Info.pm?rev=4976&r1=4975&r2=4976&view=diff
==============================================================================
--- branches/BRANCH_6_2_x/server/Slim/Music/Info.pm (original)
+++ branches/BRANCH_6_2_x/server/Slim/Music/Info.pm Mon Oct 31 16:50:12 2005
 <at>  <at>  -1098,7 +1098,7  <at>  <at> 

 	if (!blessed($obj) || !$obj->can('tracks')) {

-		return [];
+		return undef;
 	}

 	# We want any PlayListTracks this item may have
 <at>  <at>  -1123,7 +1123,7  <at>  <at> 

 	return \ <at> urls if scalar( <at> urls);

(Continue reading)

dsully | 1 Nov 01:49 2005

[Slim-Checkins] r4975 - /trunk/server/Slim/Music/Info.pm

Author: dsully
Date: Mon Oct 31 16:49:16 2005
New Revision: 4975

URL: http://svn.slimdevices.com?rev=4975&view=rev
Log:
Bug: N/A
Description: Revert logic change - we need to return undef, otherwise the scan is incomplete.

Modified:
    trunk/server/Slim/Music/Info.pm

Modified: trunk/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Music/Info.pm?rev=4975&r1=4974&r2=4975&view=diff
==============================================================================
--- trunk/server/Slim/Music/Info.pm (original)
+++ trunk/server/Slim/Music/Info.pm Mon Oct 31 16:49:16 2005
 <at>  <at>  -1099,7 +1099,7  <at>  <at> 

 	if (!blessed($obj) || !$obj->can('tracks')) {

-		return [];
+		return undef;
 	}

 	# We want any PlayListTracks this item may have
 <at>  <at>  -1124,7 +1124,7  <at>  <at> 

 	return \ <at> urls if scalar( <at> urls);

(Continue reading)

kdf | 1 Nov 03:15 2005

[Slim-Checkins] r4977 - in /trunk/server: Plugins/SavePlaylist.pm strings.txt

Author: kdf
Date: Mon Oct 31 18:15:17 2005
New Revision: 4977

URL: http://svn.slimdevices.com?rev=4977&view=rev
Log:
Bug: 2415
Description: set default cursor pos to end of string if the playlist
title is known.  Also, if playlist already exists, let the message on
line1 reflect this condition before the last press RIGHT to save

Modified:
    trunk/server/Plugins/SavePlaylist.pm
    trunk/server/strings.txt

Modified: trunk/server/Plugins/SavePlaylist.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/SavePlaylist.pm?rev=4977&r1=4976&r2=4977&view=diff
==============================================================================
--- trunk/server/Plugins/SavePlaylist.pm (original)
+++ trunk/server/Plugins/SavePlaylist.pm Mon Oct 31 18:15:17 2005
 <at>  <at>  -64,13 +64,16  <at>  <at> 
 		$context{$client} = $client->currentPlaylist ? 
 				Slim::Music::Info::standardTitle($client, $client->currentPlaylist) : 
 					'A';
+					
+		my $cursorpos = length($context{$client}) || 0;
+
 		Slim::Buttons::Common::pushMode($client,'INPUT.Text', {
 			'callback' => \&Plugins::SavePlaylist::savePluginCallback,
 			'valueRef' => \$context{$client},
(Continue reading)

kdf | 1 Nov 03:35 2005

[Slim-Checkins] r4978 - in /trunk/server/Slim: Player/Client.pm Player/Squeezebox2.pm Web/Setup.pm

Author: kdf
Date: Mon Oct 31 18:35:22 2005
New Revision: 4978

URL: http://svn.slimdevices.com?rev=4978&view=rev
Log:
Bug: 2449
Description: add hasPreAmp function for client object.  default is
zero, SB2 returns 1.  Use this to determine whether or not the Preamp
Volume control settings are shown in the player settings->audio

Modified:
    trunk/server/Slim/Player/Client.pm
    trunk/server/Slim/Player/Squeezebox2.pm
    trunk/server/Slim/Web/Setup.pm

Modified: trunk/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Player/Client.pm?rev=4978&r1=4977&r2=4978&view=diff
==============================================================================
--- trunk/server/Slim/Player/Client.pm (original)
+++ trunk/server/Slim/Player/Client.pm Mon Oct 31 18:35:22 2005
 <at>  <at>  -999,6 +999,7  <at>  <at> 
 }

 sub hasDigitalOut() { return 0; }
+sub hasPreAmp() { return 0; }

 sub maxBrightness() { return undef; }

Modified: trunk/server/Slim/Player/Squeezebox2.pm
(Continue reading)

kdf | 1 Nov 06:18 2005

[Slim-Checkins] r4979 - /trunk/server/Plugins/RandomPlay/Plugin.pm

Author: kdf
Date: Mon Oct 31 21:18:35 2005
New Revision: 4979

URL: http://svn.slimdevices.com?rev=4979&view=rev
Log:
Bug: 2439
Description: add a line item for disabling the current random cycling
mode in the player UI

Modified:
    trunk/server/Plugins/RandomPlay/Plugin.pm

Modified: trunk/server/Plugins/RandomPlay/Plugin.pm
URL: http://svn.slimdevices.com/trunk/server/Plugins/RandomPlay/Plugin.pm?rev=4979&r1=4978&r2=4979&view=diff
==============================================================================
--- trunk/server/Plugins/RandomPlay/Plugin.pm (original)
+++ trunk/server/Plugins/RandomPlay/Plugin.pm Mon Oct 31 21:18:35 2005
 <at>  <at>  -307,10 +307,15  <at>  <at> 
 			year   => 'PLUGIN_RANDOM_YEAR',
 			genreFilter => 'PLUGIN_RANDOM_GENRE_FILTER'
 		)
-	}	
-	
+	}		
+	# if showing the current mode, show altered string
 	if ($item eq $type{$client}) {
 		return string($displayText{$item} . '_PLAYING');
+		
+	# if a mode is active, handle the temporarily added disable option
(Continue reading)

kdf | 1 Nov 06:21 2005

[Slim-Checkins] r4980 - in /branches/BRANCH_6_2_x/server/Slim: Player/Client.pm Player/Squeezebox2.pm Web/Setup.pm

Author: kdf
Date: Mon Oct 31 21:21:36 2005
New Revision: 4980

URL: http://svn.slimdevices.com?rev=4980&view=rev
Log:
Bug: 2449
Description: merge -r 4978:4979 from trunk

Modified:
    branches/BRANCH_6_2_x/server/Slim/Player/Client.pm
    branches/BRANCH_6_2_x/server/Slim/Player/Squeezebox2.pm
    branches/BRANCH_6_2_x/server/Slim/Web/Setup.pm

Modified: branches/BRANCH_6_2_x/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/branches/BRANCH_6_2_x/server/Slim/Player/Client.pm?rev=4980&r1=4979&r2=4980&view=diff
==============================================================================
--- branches/BRANCH_6_2_x/server/Slim/Player/Client.pm (original)
+++ branches/BRANCH_6_2_x/server/Slim/Player/Client.pm Mon Oct 31 21:21:36 2005
 <at>  <at>  -999,6 +999,7  <at>  <at> 
 }

 sub hasDigitalOut() { return 0; }
+sub hasPreAmp() { return 0; }

 sub maxBrightness() { return undef; }

Modified: branches/BRANCH_6_2_x/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/branches/BRANCH_6_2_x/server/Slim/Player/Squeezebox2.pm?rev=4980&r1=4979&r2=4980&view=diff
==============================================================================
(Continue reading)


Gmane