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.

Sign up for GitHub

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

Jump to bottom

[pvr] optimise CPVRChannelGroup #6635

Merged
merged 1 commit into from
Mar 7, 2015
Merged

[pvr] optimise CPVRChannelGroup #6635

merged 1 commit into from
Mar 7, 2015

Conversation

opdenkamp
Copy link
Member

replaced a ton of vector::at() calls by iterators and made epg getters const

@opdenkamp opdenkamp added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Type: Improvement non-breaking change which improves existing functionality Component: PVR v15 Isengard labels Mar 7, 2015
@opdenkamp
Copy link
Member Author

jenkins build this please

xhaggi
xhaggi reviewed Mar 7, 2015
View reviewed changes
xbmc/pvr/channels/PVRChannelGroup.cpp
return groupMember.channel;
if ((*it).channel->UniqueID() == iUniqueChannelId &&
(*it).channel->ClientID() == iClientID)
retval = (*it).channel;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

opdenkamp pushed a commit that referenced this pull request Mar 7, 2015
Merge pull request #6635 from opdenkamp/optimisegroups
4d9ae64 
[pvr] optimise CPVRChannelGroup
@opdenkamp opdenkamp merged commit 4d9ae64 into xbmc:master Mar 7, 2015
@opdenkamp opdenkamp deleted the optimisegroups branch March 7, 2015 20:25
@MartijnKaijser MartijnKaijser modified the milestone: I******* 15.0-alpha2 Mar 8, 2015
@MilhouseVH
Copy link
Contributor

Any thoughts on this crash log, reported in a test build?

http://forum.kodi.tv/showthread.php?tid=211501&pid=1949665#pid1949665

@opdenkamp
Copy link
Member Author

that's not a crash log, can you get one?

@MilhouseVH
Copy link
Contributor

It's linked in the forum post (sorry if that wasn't clear - scroll down, I've no idea why the log starts with a debug log).

Here's a direct link to the pastebin for the posted log: http://pastebin.com/GY5vsJ4p - the crash log starts at line 936.

@opdenkamp
Copy link
Member Author

yeah found it here too yesterday evening, still had the trace open on my pc this morning :)

#5  PVR::CPVRChannel::ClientID (this=0x0) at PVRChannel.cpp:753
#6  0x0000000000c78d6a in PVR::CPVRChannelGroup::RemoveDeletedChannels (this=this@entry=0x7fef04001060, channels=...) at PVRChannelGroup.cpp:663

somehow we got an empty channel in the group member list

ksooo
ksooo reviewed Mar 10, 2015
View reviewed changes
xbmc/pvr/channels/PVRChannelGroup.cpp
}

m_members.erase(m_members.begin() + iChannelPtr);
m_members.erase(it++);
m_bChanged = true;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@opdenkamp opdenkamp mentioned this pull request Mar 11, 2015
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Component: PVR Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Type: Improvement non-breaking change which improves existing functionality v15 Isengard
Projects
None yet
Milestone
Isengard 15.0-alpha2
Development

Successfully merging this pull request may close these issues.
8 participants
@opdenkamp @MilhouseVH @FernetMenta @Memphiz @xhaggi @ksooo @AlwinEsch @MartijnKaijser