Add case for 7.1 audio.
Make mpd parser more ameanable for extension.