diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | server/connectionHTTP.c | 12 |
2 files changed, 12 insertions, 2 deletions
@@ -1,6 +1,8 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- the icy-name HTTP header sent with radio streams makes VLC pick the wrong + demuxer. Send icy-name only for ES audio streams. - fixed regression of "live TV must be switched in VDR main thread" change: deadlock in IGMP streaming server when switching live TV. - streamdev-client returns true in its AvoidRecording() method introduced diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index 54ccf5a..ffcc924 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -161,11 +161,15 @@ bool cConnectionHTTP::ProcessRequest(void) LOG_ERROR_STR("unable to set DSCP sockopt"); if (m_StreamType == stEXT) { return Respond("HTTP/1.0 200 OK"); - } else if (ISRADIO(m_Channel) || (m_StreamType == stES && (m_Apid[0] || m_Dpid[0]))) { + } else if (m_StreamType == stES && (m_Apid[0] || m_Dpid[0] || ISRADIO(m_Channel))) { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: audio/mpeg") && Respond("icy-name: %s", true, m_Channel->Name()) && Respond(""); + } else if (ISRADIO(m_Channel)) { + return Respond("HTTP/1.0 200 OK") + && Respond("Content-Type: audio/mpeg") + && Respond(""); } else { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: video/mpeg") @@ -193,11 +197,15 @@ bool cConnectionHTTP::ProcessRequest(void) // TODO return Respond("HTTP/1.0 200 OK") && Respond(""); - } else if (ISRADIO(m_Channel) || (m_StreamType == stES && (m_Apid[0] || m_Dpid[0]))) { + } else if (m_StreamType == stES && (m_Apid[0] || m_Dpid[0] || ISRADIO(m_Channel))) { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: audio/mpeg") && Respond("icy-name: %s", true, m_Channel->Name()) && Respond(""); + } else if (ISRADIO(m_Channel)) { + return Respond("HTTP/1.0 200 OK") + && Respond("Content-Type: audio/mpeg") + && Respond(""); } else { return Respond("HTTP/1.0 200 OK") && Respond("Content-Type: video/mpeg") |