Hijack indeed supports this very well. For me, an interesting additional option however would be the possibiilty to disable the 'AUX' option (e.g. in the config file). I never use AUX, and when switching source I usually have too toggle twice (Radio-->AUX-->Player) instead of Radio-->player

Jelle