[rbp/omxplayer] Some code tidy ups

These changes should have no visible effect but tidies some code and adds some plumbing that will be used in a subsequent commit.