frodovdr
/
vdr-plugin-iptv
mirror of https://github.com/rofafor/vdr-plugin-iptv.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for channel parsing.

This commit is contained in:
Rolf Ahrenberg 2007-09-13 18:14:41 +00:00
parent 5d6d68d566
commit df3658365f
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
device.c
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: device.c,v 1.5 2007/09/13 16:58:22 rahrenbe Exp $ * $Id: device.c,v 1.6 2007/09/13 18:14:41 rahrenbe Exp $
*/ */
#include "common.h" #include "common.h"
@ -64,21 +64,21 @@ cIptvDevice *cIptvDevice::Get(unsigned int DeviceIndex)
return NULL; return NULL;
} }
cString cIptvDevice::GetChannelSettings(const char *Param, int *IpPort, cString *Protocol) cString cIptvDevice::GetChannelSettings(const char *Param, int *IpPort, int *Protocol)
{ {
unsigned int a, b, c, d; unsigned int a, b, c, d;
debug("cIptvDevice::GetChannelSettings(%d)\n", deviceIndex); debug("cIptvDevice::GetChannelSettings(%d)\n", deviceIndex);
if (sscanf(Param, "IPTV-UDP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) { if (sscanf(Param, "IPTV-UDP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) {
*Protocol = cString("udp", true); *Protocol = PROTOCOL_UDP;
return cString::sprintf("%u.%u.%u.%u", a, b, c, d); return cString::sprintf("%u.%u.%u.%u", a, b, c, d);
} }
else if (sscanf(Param, "IPTV-RTSP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) { else if (sscanf(Param, "IPTV-RTSP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) {
*Protocol = cString("rtsp", true); *Protocol = PROTOCOL_RTSP;
return cString::sprintf("%u.%u.%u.%u", a, b, c, d); return cString::sprintf("%u.%u.%u.%u", a, b, c, d);
} }
else if (sscanf(Param, "IPTV-HTTP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) { else if (sscanf(Param, "IPTV-HTTP-%u.%u.%u.%u-%u", &a, &b, &c, &d, IpPort) == 5) {
*Protocol = cString("http", true); *Protocol = PROTOCOL_HTTP;
return cString::sprintf("%u.%u.%u.%u", a, b, c, d); return cString::sprintf("%u.%u.%u.%u", a, b, c, d);
} }
return NULL; return NULL;
@ -117,13 +117,13 @@ bool cIptvDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *N
bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) bool cIptvDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
{ {
int port; int port, protocol;
cString protocol, addr; cString addr;
debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex); debug("cIptvDevice::SetChannelDevice(%d)\n", deviceIndex);
addr = GetChannelSettings(Channel->Param(), &port, &protocol); addr = GetChannelSettings(Channel->Param(), &port, &protocol);
if (addr) if (addr)
pIptvStreamer->SetStream(addr, port, protocol); pIptvStreamer->SetStream(addr, port, (protocol == PROTOCOL_UDP) ? "udp" : (protocol == PROTOCOL_RTSP) ? "rtsp" : "http");
return true; return true;
} }

9
device.h
View File

@ -3,7 +3,7 @@
* *
* See the README file for copyright information and how to reach the author. * See the README file for copyright information and how to reach the author.
* *
* $Id: device.h,v 1.2 2007/09/12 21:14:51 rahrenbe Exp $ * $Id: device.h,v 1.3 2007/09/13 18:14:41 rahrenbe Exp $
*/ */
#ifndef __IPTV_DEVICE_H #ifndef __IPTV_DEVICE_H
@ -22,6 +22,11 @@ public:
// private parts // private parts
private: private:
enum tProtocol {
PROTOCOL_UDP,
PROTOCOL_RTSP,
PROTOCOL_HTTP
};
unsigned int deviceIndex; unsigned int deviceIndex;
bool isPacketDelivered; bool isPacketDelivered;
bool isOpenDvr; bool isOpenDvr;
@ -36,7 +41,7 @@ public:
// for channel parsing // for channel parsing
private: private:
cString GetChannelSettings(const char *Param, int *IpPort, cString *Protocol); cString GetChannelSettings(const char *Param, int *IpPort, int *Protocol);
bool ProvidesIptv(const char *Param) const; bool ProvidesIptv(const char *Param) const;
// for channel selection // for channel selection