[mythtv-firehose] mythtv/fixes/0.24 commit: 1be38ea4e by Mark Kendall (mark-kendall)

[MythTV]

      Author:  Mark Kendall <mkendall at mythtv.org>
 Change Date:  2011-06-12T20:46:41-07:00
   Push Date:  2011/06/12 20:46:53 -0700
  Repository:  mythtv
      Branch:  fixes/0.24
New Revision:  1be38ea4edbbf251f0a06d8e44fec27cfa1b12af
   Changeset:  https://github.com/MythTV/mythtv/commit/1be38ea4e

Log:

OSD: Fix subtitle window painting order.

The order of iterating over a QHash is arbitrary and the fact that
subtitle and interactive screens have (mostly) been drawn in the correct
order since the OSD re-write is pure luck.

So switch to a QMap which, while marginally slower, will order on the
basis of the key (QString) and force the subtitle/interactive screens to
be painted first by adding some numerics to their identifiers.

Should fix the ordering issue seen in #9822 and occasionally in the yet
to be enabled blu-ray HDMV navigation mode.

Cherry picked from master be25039cd6e511bedc55

Fixes #9822

Modified:

   mythtv/libs/libmythtv/osd.cpp
   mythtv/libs/libmythtv/osd.h