PDA

View Full Version : Rate limiting broken in current CVS



Roy M. Silvernail
2004-06-09, 05:44
I ended up wiping my normal /home/slimserver tree and copying in the
current CVS to test Vidur's patch. Now from a remote location, MP3 ->
MP3 rate limiting is broken. Note that WMA -> MP3 rate limiting is
working fine. Unfortunately, my WMA collection doesn't comprise my
favoite material. :)

Log snip attached.
--
Roy M. Silvernail is roy (AT) rant-central (DOT) com, and you're not
Never Forget: It's Only 1's and 0's!
SpamAssassin->procmail->/dev/null->bliss
http://www.rant-central.com

2004-06-09 08:32:58.1766 openSong on: file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3
2004-06-09 08:32:58.1777 openSong: getting duration 230.008125, size 7359413, endian and offset 2172 for file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3
2004-06-09 08:32:58.1792 undermax = , type = mp3, softsqueeze = 54:15:6d:12:c5:c4, lame = /usr/bin/lame
2004-06-09 08:32:58.1797 checking formats for: mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.1799 Checking to see if mp3-aif-softsqueeze-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.1802 There are 7 disabled formats...
2004-06-09 08:32:58.1804 Testing wma-wav-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.1806 Testing shn-wav-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.1808 Testing shn-mp3-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.1809 Testing mpc-wav-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2107 Testing mpc-mp3-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2111 Testing mpc-aif-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2113 Testing mov-mp3-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2115 Testing mov-aif-*-* vs mp3-aif-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2117 enabled
2004-06-09 08:32:58.2118 checking formats for: mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2120 Checking to see if mp3-aif-*-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.2122 There are 7 disabled formats...
2004-06-09 08:32:58.2125 Testing wma-wav-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2126 Testing shn-wav-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2128 Testing shn-mp3-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2130 Testing mpc-wav-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2132 Testing mpc-mp3-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2133 Testing mpc-aif-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2135 Testing mov-mp3-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2137 Testing mov-aif-*-* vs mp3-aif-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2138 enabled
2004-06-09 08:32:58.2140 checking formats for: mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2142 Checking to see if mp3-aif-softsqueeze-* is enabled
2004-06-09 08:32:58.2145 There are 7 disabled formats...
2004-06-09 08:32:58.2147 Testing wma-wav-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2149 Testing shn-wav-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2151 Testing shn-mp3-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2153 Testing mpc-wav-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2154 Testing mpc-mp3-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2156 Testing mpc-aif-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2158 Testing mov-mp3-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2160 Testing mov-aif-*-* vs mp3-aif-softsqueeze-*
2004-06-09 08:32:58.2162 enabled
2004-06-09 08:32:58.2163 checking formats for: mp3-aif-*-*
2004-06-09 08:32:58.2165 Checking to see if mp3-aif-*-* is enabled
2004-06-09 08:32:58.2167 There are 7 disabled formats...
2004-06-09 08:32:58.2169 Testing wma-wav-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2171 Testing shn-wav-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2173 Testing shn-mp3-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2174 Testing mpc-wav-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2176 Testing mpc-mp3-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2178 Testing mpc-aif-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2179 Testing mov-mp3-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2181 Testing mov-aif-*-* vs mp3-aif-*-*
2004-06-09 08:32:58.2182 enabled
2004-06-09 08:32:58.2185 checking formats for: mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2187 Checking to see if mp3-wav-softsqueeze-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.2190 There are 7 disabled formats...
2004-06-09 08:32:58.2192 Testing wma-wav-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2194 Testing shn-wav-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2195 Testing shn-mp3-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2301 Testing mpc-wav-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2304 Testing mpc-mp3-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2306 Testing mpc-aif-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2308 Testing mov-mp3-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2310 Testing mov-aif-*-* vs mp3-wav-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2312 enabled
2004-06-09 08:32:58.2314 checking formats for: mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2315 Checking to see if mp3-wav-*-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.2318 There are 7 disabled formats...
2004-06-09 08:32:58.2320 Testing wma-wav-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2322 Testing shn-wav-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2324 Testing shn-mp3-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2326 Testing mpc-wav-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2328 Testing mpc-mp3-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2329 Testing mpc-aif-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2331 Testing mov-mp3-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2333 Testing mov-aif-*-* vs mp3-wav-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2334 enabled
2004-06-09 08:32:58.2336 checking formats for: mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2338 Checking to see if mp3-wav-softsqueeze-* is enabled
2004-06-09 08:32:58.2340 There are 7 disabled formats...
2004-06-09 08:32:58.2342 Testing wma-wav-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2344 Testing shn-wav-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2346 Testing shn-mp3-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2348 Testing mpc-wav-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2350 Testing mpc-mp3-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2352 Testing mpc-aif-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2353 Testing mov-mp3-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2355 Testing mov-aif-*-* vs mp3-wav-softsqueeze-*
2004-06-09 08:32:58.2357 enabled
2004-06-09 08:32:58.2359 checking formats for: mp3-wav-*-*
2004-06-09 08:32:58.2361 Checking to see if mp3-wav-*-* is enabled
2004-06-09 08:32:58.2363 There are 7 disabled formats...
2004-06-09 08:32:58.2366 Testing wma-wav-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2367 Testing shn-wav-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2369 Testing shn-mp3-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2371 Testing mpc-wav-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2372 Testing mpc-mp3-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2374 Testing mpc-aif-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2375 Testing mov-mp3-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2377 Testing mov-aif-*-* vs mp3-wav-*-*
2004-06-09 08:32:58.2379 enabled
2004-06-09 08:32:58.2381 checking formats for: mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2383 Checking to see if mp3-mp3-softsqueeze-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.2385 There are 7 disabled formats...
2004-06-09 08:32:58.2387 Testing wma-wav-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2389 Testing shn-wav-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2391 Testing shn-mp3-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2393 Testing mpc-wav-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2394 Testing mpc-mp3-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2515 Testing mpc-aif-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2520 Testing mov-mp3-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2522 Testing mov-aif-*-* vs mp3-mp3-softsqueeze-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2524 enabled
2004-06-09 08:32:58.2526 checking formats for: mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2528 Checking to see if mp3-mp3-*-54:15:6d:12:c5:c4 is enabled
2004-06-09 08:32:58.2530 There are 7 disabled formats...
2004-06-09 08:32:58.2532 Testing wma-wav-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2534 Testing shn-wav-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2536 Testing shn-mp3-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2537 Testing mpc-wav-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2539 Testing mpc-mp3-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2541 Testing mpc-aif-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2543 Testing mov-mp3-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2544 Testing mov-aif-*-* vs mp3-mp3-*-54:15:6d:12:c5:c4
2004-06-09 08:32:58.2546 enabled
2004-06-09 08:32:58.2548 checking formats for: mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2550 Checking to see if mp3-mp3-softsqueeze-* is enabled
2004-06-09 08:32:58.2552 There are 7 disabled formats...
2004-06-09 08:32:58.2554 Testing wma-wav-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2556 Testing shn-wav-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2558 Testing shn-mp3-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2560 Testing mpc-wav-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2561 Testing mpc-mp3-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2563 Testing mpc-aif-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2565 Testing mov-mp3-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2567 Testing mov-aif-*-* vs mp3-mp3-softsqueeze-*
2004-06-09 08:32:58.2569 enabled
2004-06-09 08:32:58.2570 checking formats for: mp3-mp3-*-*
2004-06-09 08:32:58.2572 Checking to see if mp3-mp3-*-* is enabled
2004-06-09 08:32:58.2574 There are 7 disabled formats...
2004-06-09 08:32:58.2576 Testing wma-wav-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2578 Testing shn-wav-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2580 Testing shn-mp3-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2581 Testing mpc-wav-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2583 Testing mpc-mp3-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2585 Testing mpc-aif-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2586 Testing mov-mp3-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2589 Testing mov-aif-*-* vs mp3-mp3-*-*
2004-06-09 08:32:58.2591 enabled
2004-06-09 08:32:58.2592 Found command: -
2004-06-09 08:32:58.2594 ******* Error: Didn't find any command matches for type: mp3 format: mp3 ******
2004-06-09 08:32:58.2953 openSong: this is an mp3 file: file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3
2004-06-09 08:32:58.2959 file type: mp3 format: mp3 inrate: 256 maxRate: 64
Use of uninitialized value in concatenation (.) or string at /home/slimserver/Slim/Player/Source.pm line 891.
2004-06-09 08:32:58.2961 command:
2004-06-09 08:32:58.2963 Couldn't create command line for mp3 playback for file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3

Roy M. Silvernail
2004-06-09, 06:01
Roy M. Silvernail wrote:
> I ended up wiping my normal /home/slimserver tree and copying in the
> current CVS to test Vidur's patch. Now from a remote location, MP3 ->
> MP3 rate limiting is broken. Note that WMA -> MP3 rate limiting is
> working fine. Unfortunately, my WMA collection doesn't comprise my
> favoite material. :)
>
> Log snip attached.

With a quick shift back to the 5/31 nightly, the log difference shows
right up. Here's a failure:

2004-06-09 08:32:58.2592 Found command: -
2004-06-09 08:32:58.2594 ******* Error: Didn't find any command matches
for type: mp3 format: mp3 ******
2004-06-09 08:32:58.2953 openSong: this is an mp3 file:
file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3
2004-06-09 08:32:58.2959 file type: mp3 format: mp3 inrate: 256
maxRate: 64
Use of uninitialized value in concatenation (.) or string at
/home/slimserver/Slim/Player/Source.pm line 891.
2004-06-09 08:32:58.2961 command:
2004-06-09 08:32:58.2963 Couldn't create command line for mp3 playback
for
file:///home/mp3/donnie_iris/back_on_the_streets/09-daddy_dont_live_here_anymore.mp3


And here;s the 5/31 success:

2004-06-09 08:54:07.4932 Found command: -
2004-06-09 08:54:07.4933 Matched Format: mp3 Type: mp3 Command: [lame]
--resample 44100 --silent -b $BITRATE$ $FILE$ -
2004-06-09 08:54:07.4934 openSong: this is an mp3 file:
file:///home/mp3/various_artists/a_mighty_wind__the_album/04-the_folksmen__never_did_no_wanderin.mp3
2004-06-09 08:54:07.4935 file type: mp3 format: mp3 inrate: 256
maxRate: 64
2004-06-09 08:54:07.4935 command: [lame] --resample 44100 --silent -b
$BITRATE$ $FILE$ -
2004-06-09 08:54:07.4940 Using command for conversion: "/usr/bin/lame"
--resample 44100 --silent -b 64
"/home/mp3/various_artists/a_mighty_wind__the_album/04-the_folksmen__never_did_no_wanderin.mp3"
- & |
2004-06-09 08:54:07.5003 Streaming with format: mp3

This may be related to Vidur's patch. (if I wasn't clear in the first
note, I was trying out current CVS + Vidur's patch from yesterday) It
looks like the server isn't picking up the MP3 -> MP3 command for rate
limiting.

I'd test further, but I really should do some actual work at work. ;)
--
Roy M. Silvernail is roy (AT) rant-central (DOT) com, and you're not
Never Forget: It's Only 1's and 0's!
SpamAssassin->procmail->/dev/null->bliss
http://www.rant-central.com

vidurapparao
2004-06-09, 07:11
Roy M. Silvernail wrote:

> I'd test further, but I really should do some actual work at work. ;)

You've done quite a lot already. :-) I'll get on it. Thanks!

--Vidur

Roy M. Silvernail
2004-06-09, 07:32
Vidur Apparao wrote:
> Roy M. Silvernail wrote:
>
>> I'd test further, but I really should do some actual work at work. ;)
>
>
> You've done quite a lot already. :-) I'll get on it. Thanks!

OK, a *little* more research. I went up to yesterday's (6/8/04) nightly
(I don't think this incorporates your patch, so this may be lingering
stuff). When I first start the server, rate-limiting works, but
WMA->MP3 is disabled. If I turn WMA->MP3 on, rate-limiting stops
working. The current rate-limited song plays out, but the next one will
fail. WMA tracks rate-limit just fine, though. Turn WMA->MP3 off and
rate-limiting is *still* broken. Now, the only songs that will play are
those MP3s that are already at or below the rate limit. Restart the
server and rate-limiting once again works, but WMA is off, etc.

Note that I'm testing with Softsqueeze over SSH.
--
Roy M. Silvernail is roy (AT) rant-central (DOT) com, and you're not
Never Forget: It's Only 1's and 0's!
SpamAssassin->procmail->/dev/null->bliss
http://www.rant-central.com

Roy M. Silvernail
2004-06-09, 19:11
Further research on the rate limit problem. I freshened my CVS and
started the server there. WMA was already turned on in my .prefs, so
the server came up willing to play WMA and MP3 rate-shifted down to
64Kb/s. Then I turned WMA off, and... MP3 rate-limiting fails once
again!

I think I tracked the cause down to line 979 of Slim/Web/Setup.pm, in
the preEval block for the filetypes setup page:

delete $formatslistref->{'mp3-lame-*-*'};

Looks like once deleted (which happens when you just load this page),
the mp3-lame-*-* rule is never reloaded, so the rate-limit command comes
back as undef for further rate-limit play requests. Commenting the line
out seems to work as a fix, but I don't know offhand whether that has
other side-effects.

Patch attached. (slightly noisy, as Vidur's patch from yesterday is
still in my CVS tree)
--
Roy M. Silvernail is roy (AT) rant-central (DOT) com, and you're not
Never Forget: It's Only 1's and 0's!
SpamAssassin->procmail->/dev/null->bliss
http://www.rant-central.com

vidurapparao
2004-06-09, 22:30
Actually, I think the problem is that there isn't a corresponding delete
in the postChange method just below. I'll post a modified patch that
also addresses the issue kdf brought up regarding the prefs page shortly.

--Vidur

Roy M. Silvernail wrote:

>Further research on the rate limit problem. I freshened my CVS and
>started the server there. WMA was already turned on in my .prefs, so
>the server came up willing to play WMA and MP3 rate-shifted down to
>64Kb/s. Then I turned WMA off, and... MP3 rate-limiting fails once
>again!
>
>I think I tracked the cause down to line 979 of Slim/Web/Setup.pm, in
>the preEval block for the filetypes setup page:
>
>delete $formatslistref->{'mp3-lame-*-*'};
>
>Looks like once deleted (which happens when you just load this page),
>the mp3-lame-*-* rule is never reloaded, so the rate-limit command comes
>back as undef for further rate-limit play requests. Commenting the line
>out seems to work as a fix, but I don't know offhand whether that has
>other side-effects.
>
>Patch attached. (slightly noisy, as Vidur's patch from yesterday is
>still in my CVS tree)
>
>
>------------------------------------------------------------------------
>
>Index: server/Slim/Web/Setup.pm
>================================================== =================
>RCS file: /cvsroot/slim/server/Slim/Web/Setup.pm,v
>retrieving revision 1.84
>diff -u -p -B -u -p -B -r1.84 Setup.pm
>--- server/Slim/Web/Setup.pm 20 May 2004 20:10:38 -0000 1.84
>+++ server/Slim/Web/Setup.pm 10 Jun 2004 02:03:07 -0000
>@@ -126,7 +126,7 @@ sub initSetupConfig {
> $pageref->{'GroupOrder'}[3] = undef;
> }
> my @formats = $client->formats();
>- Slim::Utils::Prefs::setMaxRate($client);
>+ Slim::Utils::Prefs::maxRate($client);
> if ($formats[0] ne 'mp3') {
> $pageref->{'Groups'}{'Format'}{'GroupDesc'} = string('SETUP_MAXBITRATE_DESC');
> $pageref->{'Prefs'}{'maxBitrate'}{'options'}{'0'} = ' '.string('NO_LIMIT');
>@@ -976,7 +976,7 @@ sub initSetupConfig {
> my $i = 0;
> my %formats = map {$_ => 1} Slim::Utils::Prefs::getArray('disabledformats');
> my $formatslistref = Slim::Player::Source::Conversions();
>- delete $formatslistref->{'mp3-lame-*-*'};
>+ # delete $formatslistref->{'mp3-lame-*-*'};
> foreach my $formats (sort {$a cmp $b}(keys %{$formatslistref})) {
> if (exists $paramref->{"formatslist$i"} && $paramref->{"formatslist$i"} == (exists $formats{$formats} ? 0 : 1)) {
> delete $paramref->{"formatslist$i"};
>
>
>------------------------------------------------------------------------
>
>