[mythtv-firehose] mythtv branch master updated by jstichnoth. v0.26-pre-627-g689a7b5

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user jstichnoth.
       via  689a7b5d526099c2ec533701625ae62ddbba6d44 (commit)
      from  ea554c9cbe5fc86c4a4e301eb9f97fd90abbe7a4 (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 689a7b5d526099c2ec533701625ae62ddbba6d44
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 11:18:23 -0700
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=689a7b5d526099c2ec533701625ae62ddbba6d44

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.



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

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

--