Simplified how the audio stream is created

Ignore-this: 2bb0490639f26372d743d76d1527f0ae

darcs-hash:20130118163637-b22ec-1bd9a4cfc2349cda8d108f5f5561e6658cbb336d