Various (untested) changes to the CurrentMedia parsing. This code is a little less pretty than what I wrote, but it also has the advantage of being less clever. It walks the string character-by-character, which may be easier to understand than mine which uses strchr().