Revert "servicemp3: simplify finding audio/video sinks"

This reverts commit d4cb27ae45485dda5153756918f199a5af9e4bbb.