Return the type for compatibility, but set the music type immediately. Change callers to return without using a switch to set the music type based on the returned value. This allows the callers to exit early on a successful load.