WIP: audio prep work for gapless

Still have some loose ends, but opening PR so people can start looking at this.
And probably just remove it as I added that one before you ripped things out.