[mythtv-cmyth] Demuxer: Refactor, cosmetics