[mythtv-firehose] mythtv branch fixes/0.25 updated by jstichnoth. v0.25.1-32-g6a9af02

[Git Repo Owner]

The branch, fixes/0.25 has been updated on the
mythtv repository by gitolite user jstichnoth.
       via  6a9af0260bf4d7c80e77a7889e999c4f0bb91867 (commit)
       via  3b41cb7ae550bf0cf58cad8fe814d6bd7c03df0f (commit)
      from  56fd9e2cd63c4700f90f6e0b9326d36bc38cff92 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a9af0260bf4d7c80e77a7889e999c4f0bb91867
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 15 Jun 2012 11:18:23 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 15 Jun 2012 16:40:34 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=6a9af0260bf4d7c80e77a7889e999c4f0bb91867

Subtitles: Be less aggressive about auto-selecting a forced track.
1. Don't favor a forced subtitle track if DefaultCCMode=1 (i.e., the
user already wants subtitles or captions which are likely to also
contain the force subtitles).

2. Don't favor a forced subtitle track if AllowForcedSubtitles=0
(i.e., the user doesn't want to be inflicted with forced subtitles).

3. Only favor a forced track if it is a subtitle track.  (Do any other
track types ever have the forced flag set?)

Note that this still may not be perfect, e.g. a user may end up
auto-displaying cc608 captions where a forced subtitle track is still
needed for the complete experience.

Refs #10808
(cherry picked from commit 689a7b5d526099c2ec533701625ae62ddbba6d44)



commit 3b41cb7ae550bf0cf58cad8fe814d6bd7c03df0f
Author:    Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 15 Jun 2012 07:07:04 -0700
Committer: Jim Stichnoth <jstichnoth at mythtv.org> at Fri, 15 Jun 2012 16:38:18 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=3b41cb7ae550bf0cf58cad8fe814d6bd7c03df0f

Subtitles: Favor forced tracks for auto-track selection.  Refs #10808
For first-time auto-track selection, we put highest priority on forced
tracks, second priority on user language preference, and third
priority on track order.

This changes the previous behavior only by adding the forced flag to
the criteria.
(cherry picked from commit ea554c9cbe5fc86c4a4e301eb9f97fd90abbe7a4)



-----------------------------------------------------------------------

Summary of changes:
 mythtv/libs/libmythtv/decoderbase.cpp |   46 ++++++++++++++++++++------------
 mythtv/libs/libmythtv/mythplayer.h    |    3 ++
 2 files changed, 32 insertions(+), 17 deletions(-)

--