fixed merge conflicts
fix a couple bugs in sound buffer resampling
ofSoundMixer updates
ofSoundMixer updates
ofBuffer merge conflicts