Fix issue 1795088       Improve audio routing code

Integrated comments after patch set 1 review.
1 file changed