Skip to content

Commit

Permalink
References #1095. UI cleanup for captions/subtitle/teletext.
Browse files Browse the repository at this point in the history
Puts the EIA-608 and EIA-708 captions in the track selection system previously only used for subtitles and audio. This also tells you what language these streams are in if this information is available in the PMT.

Puts all the caption types into an SetCaptionsEnabled(bool) method which selects the best set available. TOGGLECC uses this function to toggle the best available caption. For instance, if two captions in a different language are available the one in your most preferred language is chosen, subtitles are preferred over teletext, etc.

Adds TOGGLE bindings for each type of caption and uses that in the individual caption menus rather than the global TOGGLECC.

Adds a NEXTCC binding which allows you to go through all the available caption types including teletext menus in PAL countries.

None of the new bindings have a keyboard binding by default, and I've removed the "^" default keybinding for TOGGLECC708. NEXTCC is the only one I could see as being of general use.



git-svn-id: http://svn.mythtv.org/svn/trunk@9291 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
daniel-kristjansson committed Mar 8, 2006
1 parent ca9ec23 commit f423a74
Show file tree
Hide file tree
Showing 9 changed files with 1,336 additions and 1,005 deletions.
9 changes: 3 additions & 6 deletions mythtv/libs/libmythtv/DVDRingBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ void DVDRingBufferPriv::SetAudioTrack(void)

int track = dvdnav_get_active_audio_stream(dvdnav);
if (parent)
parent->setCurrentAudioTrack(track);
parent->SetTrack(kTrackTypeAudio, track);
}

void DVDRingBufferPriv::SetSubtitleTrack(void)
Expand All @@ -894,11 +894,8 @@ void DVDRingBufferPriv::SetSubtitleTrack(void)
return;

int track = dvdnav_get_active_spu_stream(dvdnav);
if (parent && track >=0 && !IsInMenu())
{
parent->setCurrentSubtitleTrack(track);
parent->SetSubtitleMode(true);
}
if (parent && track >= 0 && !IsInMenu())
parent->SetTrack(kTrackTypeSubtitle, track);
}

uint8_t DVDRingBufferPriv::GetNumAudioChannels(int id)
Expand Down
Loading

0 comments on commit f423a74

Please sign in to comment.