Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[pvr] reenable teletext and subtitles #1544

Closed
wants to merge 1 commit into from

6 participants

@pipelka

I think this got lost, somehow.
Needed to reenable teletext and subtitles for live tv.

@xhaggi
Collaborator

+1

@elupus
Collaborator
@ghost

+1

@mikkle
Collaborator

Confirmed working with commit 93d4d70

@elupus
Collaborator
@pipelka

Alright.
My knowledge about these things is just too limited.
Sorry for wasting your time.

@pipelka pipelka closed this
@jmarshallnz
Owner

@elupus: the commit is not in master, even though the github link seems to suggest it is.

@elupus
Collaborator
@xhaggi
Collaborator

OpenDefaultStream is not working for pvr streams, because at this time no stream information exists. i don't know if it depends to the PVR backend. only tested this with tvheadend.

@mikrohard

Back when I added support for teletext in tvheadend I also enabled teletext with one additional call to OpenDefaultStreams() (which wasn't merged into opdenkamps branch). Maybe that would be the solution now (or maybe not). You can take a look here: opdenkamp#250

@elupus
Collaborator
@ghost

Is this going to be fixed one way or another? Or just being ignored?

Thanks

@elupus
Collaborator

I finally had the time to look at this. The fix is simple, in IsBetterStream() remove the if(isteletext) return false;

@elupus
Collaborator

fixed in master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 6, 2012
  1. @pipelka
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 3 deletions.
  1. +5 −3 xbmc/cores/dvdplayer/DVDPlayer.cpp
View
8 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -913,11 +913,13 @@ bool CDVDPlayer::IsBetterStream(CCurrentStream& current, CDemuxStream* stream)
if(stream->type != current.type)
return false;
- if(current.type == STREAM_SUBTITLE)
- return false;
+ if(current.type == STREAM_SUBTITLE) {
+ SelectionStream& s = m_SelectionStreams.Get(STREAM_SUBTITLE, g_settings.m_currentVideoSettings.m_SubtitleStream);
+ return (stream->iId == s.id);
+ }
if(current.type == STREAM_TELETEXT)
- return false;
+ return true;
if(current.id < 0)
return true;
Something went wrong with that request. Please try again.