Permalink
Browse files

updated: List of internet protocols + removed MMS from HTTP translati…

…on list (done through ffmpeg now)
  • Loading branch information...
1 parent 6fc53f7 commit 742cddea7b997d21c76b7d7868c2b4173055fd48 arnova committed Jun 18, 2012
Showing with 10 additions and 6 deletions.
  1. +0 −1 xbmc/URL.cpp
  2. +10 −5 xbmc/utils/URIUtils.cpp
View
@@ -714,7 +714,6 @@ CStdString CURL::TranslateProtocol(const CStdString& prot)
|| prot == "dav"
|| prot == "tuxbox"
|| prot == "lastfm"
- || prot == "mms"
|| prot == "rss")
return "http";
@@ -682,13 +682,18 @@ bool URIUtils::IsInternetStream(const CURL& url, bool bStrictCheck /* = false */
CStdString strProtocol2 = url.GetTranslatedProtocol();
// Special case these
- if (strProtocol2 == "ftp" || strProtocol2 == "ftps" ||
- strProtocol == "dav" || strProtocol == "davs")
+ if (strProtocol2 == "ftp" || strProtocol2 == "ftps" ||
+ strProtocol == "dav" || strProtocol == "davs")
return bStrictCheck;
- if (strProtocol2 == "http" || strProtocol2 == "https" ||
- strProtocol == "rtp" || strProtocol == "udp" ||
- strProtocol == "rtmp" || strProtocol == "rtsp")
+ if (strProtocol2 == "http" || strProtocol2 == "https" ||
+ strProtocol2 == "tcp" || strProtocol2 == "udp" ||
+ strProtocol2 == "rtp" || strProtocol2 == "sdp" ||
+ strProtocol2 == "mms" || strProtocol2 == "mmst" ||
+ strProtocol2 == "mmsh" || strProtocol2 == "rtsp" ||
+ strProtocol2 == "rtmp" || strProtocol2 == "rtmpt" ||
+ strProtocol2 == "rtmpe" || strProtocol2 == "rtmpte" ||
+ strProtocol2 == "rtmps")
return true;
return false;

0 comments on commit 742cdde

Please sign in to comment.