Diff of /xbmc/FileSystem/FileCurl.cpp [1bb066] .. [ed57a4]  Maximize  Restore

Repo status: analyzing...

  Switch to side-by-side view

--- a/xbmc/FileSystem/FileCurl.cpp
+++ b/xbmc/FileSystem/FileCurl.cpp
@@ -326,6 +326,7 @@
   m_password = "";
   m_httpauth = "";
   m_state = new CReadState();
+  m_skipshout = false;
 }
 
 //Has to be called before Open()
@@ -711,6 +712,8 @@
           SetCookie(value);
         else if (name.Equals("Encoding"))
           SetContentEncoding(value);
+        else if (name.Equals("noshout") && value.Equals("true"))
+          m_skipshout = true;
         else
           SetRequestHeader(name, value);
       }
@@ -849,9 +852,9 @@
 
   // check if this stream is a shoutcast stream. sometimes checking the protocol line is not enough so examine other headers as well.
   // shoutcast streams should be handled by FileShoutcast.
-  if (m_state->m_httpheader.GetProtoLine().Left(3) == "ICY" || !m_state->m_httpheader.GetValue("icy-notice1").IsEmpty()
+  if ((m_state->m_httpheader.GetProtoLine().Left(3) == "ICY" || !m_state->m_httpheader.GetValue("icy-notice1").IsEmpty()
      || !m_state->m_httpheader.GetValue("icy-name").IsEmpty()
-     || !m_state->m_httpheader.GetValue("icy-br").IsEmpty() )
+     || !m_state->m_httpheader.GetValue("icy-br").IsEmpty()) && !m_skipshout)
   {
     CLog::Log(LOGDEBUG,"FileCurl - file <%s> is a shoutcast stream. re-opening", m_url.c_str());
     throw new CRedirectException(new CFileShoutcast);

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks