changed: Move actual protocol translation in a seperate static function

diff --git a/xbmc/URL.cpp b/xbmc/URL.cpp
index 6916002..68834cb 100644 (file)
--- a/xbmc/URL.cpp
+++ b/xbmc/URL.cpp
@@ -433,19 +433,7 @@ const CStdString& CURL::GetProtocol() const
 
 const CStdString CURL::GetTranslatedProtocol() const
 {
-  if (m_strProtocol == "shout"
-   || m_strProtocol == "daap"
-   || m_strProtocol == "dav"
-   || m_strProtocol == "tuxbox"
-   || m_strProtocol == "lastfm"
-   || m_strProtocol == "mms"
-   || m_strProtocol == "rss")
-   return "http";
-  
-  if (m_strProtocol == "davs")
-    return "https";
-  
-  return m_strProtocol;
+  return TranslateProtocol(m_strProtocol);
 }
 
 const CStdString& CURL::GetFileType() const
@@ -715,3 +703,21 @@ void CURL::Encode(CStdString& strURLData)
   }
   strURLData = strResult;
 }
+
+CStdString CURL::TranslateProtocol(const CStdString& prot)
+{
+  if (prot == "shout"
+   || prot == "daap"
+   || prot == "dav"
+   || prot == "tuxbox"
+   || prot == "lastfm"
+   || prot == "mms"
+   || prot == "rss")
+   return "http";
+
+  if (prot == "davs")
+    return "https";
+
+  return prot;
+}
+

diff --git a/xbmc/URL.h b/xbmc/URL.h
index 3ecba1f..2807e5a 100644 (file)
--- a/xbmc/URL.h
+++ b/xbmc/URL.h
@@ -71,6 +71,8 @@ public:
   static bool IsFullPath(const CStdString &url); ///< return true if the url includes the full path
   static void Decode(CStdString& strURLData);
   static void Encode(CStdString& strURLData);
+  static CStdString TranslateProtocol(const CStdString& prot);
+
 protected:
   int m_iPort;
   CStdString m_strHostName;