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

UPnP: some fixes and improvements #6862

Merged
merged 3 commits into from Apr 9, 2015
Merged

Conversation

Montellese
Copy link
Member

I noticed some odd checks in CNetworkServices concerning the different UPnP services (browser, controller, server, renderer) which made it impossible to stop the controller and/or server under certain conditions.

When I looked into that code in more detail I noticed that the current code always starts and stops the client/browser and the controller simultaneously and when the controller is disabled in the settings we also can't browse remote UPnP servers. That doesn't make any sense at all. Therefore I split them up and now the client/browser is basically always active so it's always possible to browse remote UPnP servers but the server, controller and renderer are only running if enabled in the settings.

@Montellese Montellese added Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality labels Apr 2, 2015
{
#ifdef HAS_UPNP
if (!CSettings::Get().GetBool("services.upnpcontroller") ||
!CSettings::Get().GetBool("services.upnpserver"))

This comment was marked as spam.

This comment was marked as spam.

@Montellese
Copy link
Member Author

jenkins build this please

@Montellese
Copy link
Member Author

Any objections to this getting merged? Apart from the cleanup it fixes several issues in setups where not all UPnP services are enabled by the user.

@mkortstiege
Copy link
Member

No objections here.

@mkortstiege
Copy link
Member

jenkins build and merge.

@mkortstiege mkortstiege added this to the Isengard 15.0-beta1 milestone Apr 9, 2015
@jenkins4kodi jenkins4kodi merged commit af7ea36 into xbmc:master Apr 9, 2015
@Montellese Montellese deleted the upnp_cleanup branch April 9, 2015 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants