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.dvblink version 3.3.5 (krypton) #54

Merged
merged 4 commits into from Sep 21, 2016

Conversation

@dvblogic
Copy link
Contributor

commented Sep 13, 2016

Fixed: Crash on startup with search timers
Fixed: Incorrect disk space display if disk size is more than 2TB

dvblogic added 2 commits Sep 13, 2016
Fixed: Crash on startup with search timers
Fixed: Incorrect disk space display if disk size is more than 2TB
if (schedule_to_timer_map.find(epg_schedules[i]->GetID()) != schedule_to_timer_map.end() &&
schedule_to_timer_map[epg_schedules[i]->GetID()].size() > 0)
if (schedule_to_timer_map.find(bp_schedules[i]->GetID()) != schedule_to_timer_map.end() &&
schedule_to_timer_map[bp_schedules[i]->GetID()].size() > 0)

This comment has been minimized.

Copy link
@fritsch

fritsch Sep 19, 2016

might want to use !empty() ?

@dvblogic

This comment has been minimized.

Copy link
Contributor Author

commented Sep 19, 2016

Done.
Can you, please, also merge the pull request for Jarvis branch?

@fritsch

This comment has been minimized.

Copy link

commented Sep 19, 2016

This is something for @ksooo I was just interested in looking at the code.

@dvblogic

This comment has been minimized.

Copy link
Contributor Author

commented Sep 21, 2016

@fritsch
Is there any way to contact @ksooo or anyone else, who can merge those pull requests?..

@ksooo

This comment has been minimized.

Copy link
Member

commented Sep 21, 2016

@dvblogic i have no good feeling to merge this if travis-ci check fails. Any chance that you fix that?

@dvblogic

This comment has been minimized.

Copy link
Contributor Author

commented Sep 21, 2016

@ksooo Please, have a look at the Travis log. It is some kind of build misconfiguration issue, which is outside of my competence.

@ksooo

This comment has been minimized.

Copy link
Member

commented Sep 21, 2016

i'm also not an expert on this, but maybe https://github.com/kodi-pvr/pvr.dvblink/blob/master/.travis.yml needs to be fixed?
This file looks little different for pvr.hts, for instance. https://github.com/kodi-pvr/pvr.hts/blob/master/.travis.yml
Maybe changing pvr.dvblogic's .travis.yml to like the one for pvr.hts looks like already does the trick?

@dvblogic

This comment has been minimized.

Copy link
Contributor Author

commented Sep 21, 2016

@ksooo can someone from kodi team fix this issue, please? I really do not want to mess around with build variables, not knowing what they do. And, more important, not been able to test.

@ksooo

This comment has been minimized.

Copy link
Member

commented Sep 21, 2016

@hudokkow maybe you can help with the travis problem?

@hudokkow

This comment has been minimized.

Copy link
Contributor

commented Sep 21, 2016

@ksooo nothing really different between the 2 apart from hts not depending on tinyxml2 and wrongly calling script: make twice.

Apart from that, build error is self-explanatory. We require CMake 3.1 and xcode6.1 machine only provides 3.0.2. I'll bug travis folks about this.

In the meantime, if you guys are happy with the code changes it should be safe to merge. And if a tiny red cross is something you really don't like, comment out https://github.com/kodi-pvr/pvr.dvblink/blob/master/.travis.yml#L22-L23 😜

@ksooo

This comment has been minimized.

Copy link
Member

commented Sep 21, 2016

@hudokkow thanks for the explanation. will merge now

@ksooo ksooo merged commit e842db9 into kodi-pvr:master Sep 21, 2016
1 check failed
1 check failed
continuous-integration/travis-ci/pr The Travis CI build could not complete due to an error
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.