(click on the image to enlarge)
I've still got some cleanup to do, but now that it's working it should be easier to take a second pass over the code and see what was really needed to make it work.... I need to refactor it so that there is minimal interference with the existing DVB support while still sharing code where appropriate (such as the PAT/PMT parsing)