Some code refactoring, will beimplemented new AudioStreamer