marsystems: AudioSink: fix and refactor