More work to adapt the new idWaveFile