MP1-4258: Refactoring of code to support both gapless playback as well as a change of the sample rate for the next song.