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

Jump to bottom

[htsp] remove internal htsp support. #6699

Merged
merged 1 commit into from Mar 14, 2015
Merged

[htsp] remove internal htsp support. #6699

merged 1 commit into from Mar 14, 2015

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Mar 12, 2015

No description provided.

@ksooo ksooo changed the title [PVR] remove internal htsp support. [htsp] remove internal htsp support. Mar 12, 2015
@ksooo ksooo added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v15 Isengard labels Mar 12, 2015
mkortstiege
mkortstiege reviewed Mar 12, 2015
View reviewed changes
xbmc/filesystem/HTSPDirectory.cpp
CURL url2(url);
url2.SetFileName("tags/0/");
item->SetURL(url2);
item->SetLabel(g_localizeStrings.Get(22018));

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@ksooo
Copy link
Member Author

ksooo commented Mar 13, 2015

@opdenkamp I see no reason to maintain htsp. We have a PVR client for htsp support. That's IMO sufficient.

@ksooo
Copy link
Member Author

ksooo commented Mar 13, 2015

If nobody objects I will merge this very soon after #6698 got merged (it will most probably cause merge conflicts for this pr).

@akva2
Copy link
Contributor

akva2 commented Mar 13, 2015

you need to do some more cleaning in GUIDialogNetworkSetup.cpp

@notspiff
Copy link
Contributor

ignore, i somehow missed it in the diff (relogged in notspiff).

@mkortstiege
Copy link
Member

@ksooo please rebase. #6698 is in.

@ksooo ksooo force-pushed the remove-internal-htsp branch 3 times, most recently from 2ce4e4f to c89db0a Compare March 13, 2015 18:56
@ksooo
Copy link
Member Author

ksooo commented Mar 13, 2015

@mkortstiege done.

@ksooo
Copy link
Member Author

ksooo commented Mar 13, 2015

jenkins build this please

ksooo added a commit that referenced this pull request Mar 14, 2015
@ksooo
Merge pull request #6699 from ksooo/remove-internal-htsp
6bedce5 
[htsp] remove internal htsp support.
@ksooo ksooo merged commit 6bedce5 into xbmc:master Mar 14, 2015
@ksooo ksooo deleted the remove-internal-htsp branch March 14, 2015 11:46
@MartijnKaijser MartijnKaijser modified the milestone: I******* 15.0-alpha2 Mar 15, 2015
ksooo
ksooo reviewed Mar 16, 2015
View reviewed changes
xbmc/network/ZeroconfBrowser.cpp
@@ -57,7 +57,6 @@ CZeroconfBrowser::CZeroconfBrowser():mp_crit_sec(new CCriticalSection),m_started
AddServiceType("_smb._tcp.");
#endif
AddServiceType("_ftp._tcp.");
AddServiceType("_htsp._tcp.");

This comment was marked as spam.

Sign in to view

@mrblond18
Copy link

Guys, I do not like the fact that this is gone. For two of my setups, this is giving problems, also see:
http://forum.kodi.tv/showthread.php?tid=225210&pid=1989834#pid1989834

Any chance this is getting back in? Or somehow to add it manually?

@x23piracy x23piracy mentioned this pull request Jun 4, 2015
Closed
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
Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v15 Isengard
Projects
None yet
Milestone
Isengard 15.0-alpha2
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ksooo @akva2 @notspiff @mkortstiege @mrblond18 @opdenkamp @MartijnKaijser