sound-control: Cleanup and correct the speaker output hook