This removes lots of code duplication and also allows more complex specifiers, for example you can use p:204:aⓂ️language:eng to select the English language audio stream from program 204. Signed-off-by: Marton Balint <cus@passwd.hu>