Additional function to buffer audio if we need it (#634)

Additional function to buffer audio if we need it (#634) #1124