-
Notifications
You must be signed in to change notification settings - Fork 64
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
[Testing Required] update to PVR addon API 5.7.0 #100
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should figure out whether the 'channelNumber' change is actually correct.
src/SData.cpp
Outdated
@@ -341,7 +341,7 @@ PVR_ERROR SData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channe | |||
|
|||
tag.iUniqueBroadcastId = event->uniqueBroadcastId; | |||
tag.strTitle = event->title.c_str(); | |||
tag.iChannelNumber = event->channelNumber; | |||
tag.iUniqueChannelId = event->channelNumber; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure whether this is correct. Have you checked the actual semantics of event->channelNumber
? This API change is not cosmetics, it's not just renaming a struct member. a channel unique id is semantically different form a channel number...
src/SData.cpp
Outdated
std::string strUrl = ""; | ||
std::vector<SC::Channel> channels; | ||
channels = m_channelManager->GetChannels(); | ||
for (std::vector<SC::Channel>::iterator Schannel = channels.begin(); Schannel != channels.end(); ++Schannel) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have seen my comments regarding string init and for loop syntax in your pvr.filmon PR, havn't you. ;-)
squashed and updates as requested. Dont merge this, ill look into the channelnumber issue. Most of the other addons have been using iuniqueid == channel number when creating the channel, but ill admit i didnt look closely at this one. Ill double check it |
np, take your time. Thanks again. |
I think this may be more appropriate than the channel name |
update jsoncpp to 0.10.6 remove deprecated functions and implement a basic GetChannelStreamProperties() tag.uniqueid change for more appropriate source
Sorry, butchered the build. Fixed up and squashed it all. Should pass travis-ci this time around |
@@ -341,7 +341,7 @@ PVR_ERROR SData::GetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL &channe | |||
|
|||
tag.iUniqueBroadcastId = event->uniqueBroadcastId; | |||
tag.strTitle = event->title.c_str(); | |||
tag.iChannelNumber = event->channelNumber; | |||
tag.iUniqueChannelId = chan->uniqueId; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, this looks good.
This brings the addon upto API 5.7.0 compatibility
Removed deprecated methods and stubbed out new ones. Implemented GetChannelStreamProperties() which should work, but requires verification.
Bumped jsoncpp to 0.10.6
Please note, ive not been able to test functionality at all. If anyone can let me know if the changes work, or need further tweaking. This was a quick attempt to get up and running, so feedback is very appreciated.