I have just finished editing diskin.c to use the sndfile library.
Not tested but I committed it to the cvs.  If it stands up to use then
there are gross simplifications in wave.c and aiff.c.
==John ffitch