Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pvr: fix channel switch for addons using other stream #2757

Merged
merged 1 commit into from May 25, 2013

Conversation

FernetMenta
Copy link
Contributor

@opdenkamp
fix trac 14307 Player stops if switch channel

pOtherStream->NextStream returns always STREAM_NONE. we need to call this on m_pFile

@opdenkamp
Copy link
Member

wasn't pOtherStream needed for mediaportal?

@FernetMenta
Copy link
Contributor Author

Yes it is. CPVRFile is opened anyway. This returns true for SkipNext in case of live tv. Addons using stream urls open pOtherStream in addition to CPVRFile but SkipNext returns false for DVDInputStream.
This two lines have ever been wrong in this place, then it was hacked around by introducing this m_breopened flag.

@opdenkamp
Copy link
Member

alright thanks.

@margro do you have time to test this commit with mediaportal? thanks

@afedchin
Copy link
Member

I confirm that this fixes the issue if use pvr.demo or pvr.iptvsimple addons.

@opdenkamp
Copy link
Member

yeah that's what this patch is supposed to fix, so that's good, but i'd like to have someone verify that we don't break mediaportal (and i think argustv too) with this

@elupus
Copy link
Contributor

elupus commented May 17, 2013

Should it check both?

If otherstream gives something else than none then return that. Else check
the pFile.

@FernetMenta
Copy link
Contributor Author

Should it check both? If otherstream gives something else than none then return that. Else check the pFile.

sounds reasonable. I will update.

@margro
Copy link
Contributor

margro commented May 18, 2013

I've just tested master with and without this change. The MediaPortal pvr addon was not affected by the 14307 bug.
The addition from this pull request does not break the MediaPortal pvr addon behavior either, so I'm fine with this change.
Although not yet tested, the argustv addon is not affected either (based on the same playback code).

@elupus
Copy link
Contributor

elupus commented May 18, 2013

Not good enough. You can only request next stream once. Now it's done
twice.

@FernetMenta
Copy link
Contributor Author

thanks, updated now

@FernetMenta
Copy link
Contributor Author

@opdenkamp as discussed on IRC, I'll put this to the backport list for Frodo.

FernetMenta added a commit that referenced this pull request May 25, 2013
pvr: fix channel switch for addons using other stream
@FernetMenta FernetMenta merged commit 2ccc82c into xbmc:master May 25, 2013
@FernetMenta FernetMenta deleted the pvrstream branch May 25, 2013 08:02
@opdenkamp
Copy link
Member

right, you were quicker than me :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants