Move APSv2 choosing to helper header.
Two commits ago didn't actually add the play_waveforms file.

It just updated waveforms.cpp.