All public functions should consistently use either channel number or channel id

[dalhundal]

Currently, some public functions take as an argument a normal Sky channel number (101->999), whereas others expect the Sky channel ID code (eg, 2002).

Need to make this consistent.