diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:57:17 +0100 |
|---|---|---|
| committer | Mikko Matilainen <mikkom@iki.fi> | 2011-03-22 21:16:18 +0200 |
| commit | 6ea5efe93960fc761dbb5e0b2d93d9b5818d5d7c (patch) | |
| tree | 836d96c9a4688a01745719787a7a0e83804356f8 /server/connectionHTTP.c | |
| parent | 0a860a1e3e45ee83563b09beb93ede0e99eb75fb (diff) | |
| download | vdr-plugin-streamdev-6ea5efe93960fc761dbb5e0b2d93d9b5818d5d7c.tar.gz vdr-plugin-streamdev-6ea5efe93960fc761dbb5e0b2d93d9b5818d5d7c.tar.bz2 | |
Snapshot 2010-09-15
Diffstat (limited to 'server/connectionHTTP.c')
| -rw-r--r-- | server/connectionHTTP.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c index 16a2af7..54ccf5a 100644 --- a/server/connectionHTTP.c +++ b/server/connectionHTTP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionHTTP.c,v 1.20 2010/07/22 14:18:18 schmirl Exp $ + * $Id: connectionHTTP.c,v 1.21 2010/08/03 10:46:41 schmirl Exp $ */ #include <ctype.h> @@ -149,7 +149,9 @@ bool cConnectionHTTP::ProcessRequest(void) if (m_ChannelList) return Respond("%s", true, m_ChannelList->HttpHeader().c_str()); else if (m_Channel != NULL) { - cDevice *device = GetDevice(m_Channel, 0); + cDevice *device = NULL; + if (ProvidesChannel(m_Channel, 0)) + device = GetDevice(m_Channel, 0); if (device != NULL) { device->SwitchChannel(m_Channel, false); m_LiveStreamer = new cStreamdevLiveStreamer(0, this); @@ -186,8 +188,7 @@ bool cConnectionHTTP::ProcessRequest(void) if (m_ChannelList) return Respond("%s", true, m_ChannelList->HttpHeader().c_str()); else if (m_Channel != NULL) { - cDevice *device = GetDevice(m_Channel, 0); - if (device != NULL) { + if (ProvidesChannel(m_Channel, 0)) { if (m_StreamType == stEXT) { // TODO return Respond("HTTP/1.0 200 OK") |