diff options
| author | schmirl <schmirl> | 2009-01-16 11:35:43 +0000 |
|---|---|---|
| committer | schmirl <schmirl> | 2009-01-16 11:35:43 +0000 |
| commit | 9af6ceb00705470484c4b23cf71f9bb11d2af271 (patch) | |
| tree | 29bb2eca1572f8f39435e5576cc2f6be46bfee25 /server/livestreamer.c | |
| parent | 41cf7a58488e8e482383d427d6afc5deef0b8d0e (diff) | |
| download | vdr-plugin-streamdev-9af6ceb00705470484c4b23cf71f9bb11d2af271.tar.gz vdr-plugin-streamdev-9af6ceb00705470484c4b23cf71f9bb11d2af271.tar.bz2 | |
Commented PES for vdr 1.7.3+
Modified Files:
HISTORY common.c common.h remux/ts2ps.h remux/tsremux.h
server/connectionHTTP.c server/connectionVTP.c
server/livestreamer.c server/livestreamer.h server/menuHTTP.c
server/setup.c
Diffstat (limited to 'server/livestreamer.c')
| -rw-r--r-- | server/livestreamer.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/server/livestreamer.c b/server/livestreamer.c index d535819..97dffd7 100644 --- a/server/livestreamer.c +++ b/server/livestreamer.c @@ -329,7 +329,9 @@ cStreamdevLiveStreamer::cStreamdevLiveStreamer(int Priority, std::string Paramet m_Device(NULL), m_Receiver(NULL), m_PatFilter(NULL), +#if APIVERSNUM < 10703 m_PESRemux(NULL), +#endif m_ESRemux(NULL), m_PSRemux(NULL), m_ExtRemux(NULL) @@ -345,7 +347,9 @@ cStreamdevLiveStreamer::~cStreamdevLiveStreamer() DELETENULL(m_PatFilter); } DELETENULL(m_Receiver); +#if APIVERSNUM < 10703 delete m_PESRemux; +#endif delete m_ESRemux; delete m_PSRemux; delete m_ExtRemux; @@ -459,10 +463,12 @@ bool cStreamdevLiveStreamer::SetChannel(const cChannel *Channel, eStreamType Str return SetPids(pid); } +#if APIVERSNUM < 10703 case stPES: m_PESRemux = new cRemux(m_Channel->Vpid(), m_Channel->Apids(), m_Channel->Dpids(), m_Channel->Spids(), false); return SetPids(m_Channel->Vpid(), Apids, Dpids, m_Channel->Spids()); +#endif case stPS: m_PSRemux = new cTS2PSRemux(m_Channel->Vpid(), m_Channel->Apids(), m_Channel->Dpids(), @@ -502,8 +508,10 @@ int cStreamdevLiveStreamer::Put(const uchar *Data, int Count) case stTSPIDS: return cStreamdevStreamer::Put(Data, Count); +#if APIVERSNUM < 10703 case stPES: return m_PESRemux->Put(Data, Count); +#endif case stES: return m_ESRemux->Put(Data, Count); @@ -526,8 +534,10 @@ uchar *cStreamdevLiveStreamer::Get(int &Count) case stTSPIDS: return cStreamdevStreamer::Get(Count); +#if APIVERSNUM < 10703 case stPES: return m_PESRemux->Get(Count); +#endif case stES: return m_ESRemux->Get(Count); @@ -551,9 +561,11 @@ void cStreamdevLiveStreamer::Del(int Count) cStreamdevStreamer::Del(Count); break; +#if APIVERSNUM < 10703 case stPES: m_PESRemux->Del(Count); break; +#endif case stES: m_ESRemux->Del(Count); |