Split Subsonic support back into dev_subsonic_api