Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 73832 | Differences between
and this patch

Collapse All | Expand All

(-)slimserver.old/Plugins/iTunes.pm (-2 / +1 lines)
Lines 1226-1233 Link Here
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' => {
(-)slimserver.old/Slim/Player/Source.pm (-1 / +3 lines)
Lines 1474-1480 Link Here
1474
				return undef;
1474
				return undef;
1475
			}
1475
			}
1476
1476
1477
			if (!$size || !$duration) {
1477
			# This is an upstream problem with how they implemented the logic:
1478
			# if (!$size || !$duration) {
1479
			if (((defined($size)) && (!$size)) || ((defined($duration)) && (!$duration))) {
1478
1480
1479
				$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");
1481
				$::d_source && msg("openSong: not bothering opening file with zero size or duration\n");
1480
				errorOpening($client);
1482
				errorOpening($client);
(-)slimserver.old/Slim/Utils/Unicode.pm (+1 lines)
Lines 23-28 Link Here
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
(-)slimserver.old/Slim/Web/Setup.pm (-2 / +2 lines)
Lines 1224-1230 Link Here
1224
			},
1224
			},
1225
1225
1226
			'Default' => {
1226
			'Default' => {
1227
				'PrefOrder' => ['audiodir', 'playlistdir', undef],
1227
				'PrefOrder' => [undef],
1228
			},
1228
			},
1229
1229
1230
			'Rescan' => {
1230
			'Rescan' => {
Lines 1416-1422 Link Here
1416
		,'Groups' => {
1416
		,'Groups' => {
1417
			'Default' => {
1417
			'Default' => {
1418
					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
1418
					'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
1419
					'artfolder','thumbSize','includeNoArt']
1419
					'thumbSize','includeNoArt']
1420
				}
1420
				}
1421
			}
1421
			}
1422
		,'Prefs' => {
1422
		,'Prefs' => {
(-)slimserver.old/slimserver.pl (-4 lines)
Lines 973-982 Link Here
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