Attachment #73157 for bug #73832

Lines 1226-1233 Link Here

(-)slimserver.old/Plugins/iTunes.pm (-2 / +1 lines)
1226	'Groups' => {	1226	'Groups' => {
1227		1227
1228	'Default' => {	1228	'Default' => {
1229	'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks',	1229	'PrefOrder' => ['itunesscaninterval','ignoredisableditunestracks']
1230	'itunes_library_autolocate','itunes_library_xml_path','itunes_library_music_path']
1231	},	1230	},
1232		1231
1233	'iTunesPlaylistFormat' => {	1232	'iTunesPlaylistFormat' => {

Lines 30-38 Link Here

(-)slimserver.old/Slim/DataStores/DBI/DataModel.pm (-3 lines)
30	{	30	{
31	my $class = __PACKAGE__;	31	my $class = __PACKAGE__;
32		32
33	# The Live Object Index causes far more trouble than it's worth.
34	Class::DBI->use_object_index(0);
35
36	# Create a low-memory & cpu usage call for DB cleanup	33	# Create a low-memory & cpu usage call for DB cleanup
37	$class->set_sql('retrieveAllOnlyIds' => 'SELECT id FROM __TABLE__');	34	$class->set_sql('retrieveAllOnlyIds' => 'SELECT id FROM __TABLE__');
38	}	35	}

Lines 1528-1534 Link Here

(-)slimserver.old/Slim/Player/Source.pm (-1 / +3 lines)
1528	return undef;	1528	return undef;
1529	}	1529	}
1530		1530
1531	if (!$size \|\| !$duration) {	1531	# This is an upstream problem with how they implemented the logic:
		1532	# if (!$size \|\| !$duration) {
		1533	if (((defined($size)) && (!$size)) \|\| ((defined($duration)) && (!$duration))) {
1532		1534
1533	$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");	1535	$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");
1534	errorOpening($client);	1536	errorOpening($client);

Lines 23-28 Link Here

(-)slimserver.old/Slim/Utils/Unicode.pm (+1 lines)
23		23
24	if ($] > 5.007) {	24	if ($] > 5.007) {
25	require Encode;	25	require Encode;
		26	require Encode::Guess;
26	require File::BOM;	27	require File::BOM;
27	}	28	}
28		29

Lines 1248-1254 Link Here

(-)slimserver.old/Slim/Web/Setup.pm (-2 / +2 lines)
1248	},	1248	},
1249		1249
1250	'Default' => {	1250	'Default' => {
1251	'PrefOrder' => ['audiodir', 'playlistdir', undef],	1251	'PrefOrder' => [undef],
1252	},	1252	},
1253		1253
1254	'Rescan' => {	1254	'Rescan' => {
Lines 1440-1446 Link Here
1440	,'Groups' => {	1440	,'Groups' => {
1441	'Default' => {	1441	'Default' => {
1442	'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',	1442	'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
1443	'artfolder','thumbSize','includeNoArt']	1443	'thumbSize','includeNoArt']
1444	}	1444	}
1445	}	1445	}
1446	,'Prefs' => {	1446	,'Prefs' => {

Lines 973-982 Link Here

(-)slimserver.old/slimserver.pl (-4 lines)
973	# name after we fork. So don't do it on Mac. The System Preferences	973	# name after we fork. So don't do it on Mac. The System Preferences
974	# start/stop still works.	974	# start/stop still works.
975		975
976	if (Slim::Utils::OSDetect::OS() ne 'mac') {
977	$0 = "slimserver";
978	}
979
980	if (!setsid) { die "Can't start a new session: $!"; }	976	if (!setsid) { die "Can't start a new session: $!"; }
981	if (!open STDERR, '>&STDOUT') { die "Can't dup stdout: $!"; }	977	if (!open STDERR, '>&STDOUT') { die "Can't dup stdout: $!"; }
982	}	978	}

Return to bug 73832