Revert the ugly parts of 023b90f4ba37744d2a123f68213240a86ae03540

I jumbled up streamdata with streamhander in my head while designing that part.
Re-implement cardid logging in streamdata in a much cleaner and more useful way.

Note: this commit may be reverted if it is decided that corrupting the
mpegstream data with (useless) cardid info, is not sufficiently offset by the
extra logging information.
Merge branch 'master' of code.mythtv.org:mythtv