This is simpler and also should allow the code to function when the
channel number changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>