Dropped unused function and parameter.

This commit is contained in:
Frank Schmirler 2014-06-07 23:11:42 +02:00
parent e555017565
commit bfbf19decc
2 changed files with 4 additions and 8 deletions

View File

@ -350,12 +350,12 @@ cStreamdevLiveStreamer::cStreamdevLiveStreamer(const cServerConnection *Connecti
m_ReceiveBuffer = new cStreamdevBuffer(LIVEBUFSIZE, TS_SIZE *2, true, "streamdev-livestreamer"), m_ReceiveBuffer = new cStreamdevBuffer(LIVEBUFSIZE, TS_SIZE *2, true, "streamdev-livestreamer"),
m_ReceiveBuffer->SetTimeouts(0, 100); m_ReceiveBuffer->SetTimeouts(0, 100);
if (Priority == IDLEPRIORITY) { if (Priority == IDLEPRIORITY) {
SetChannel(Channel, StreamType, Apid, Dpid); SetChannel(Apid, Dpid);
} }
else { else {
m_Device = SwitchDevice(Channel, Priority); m_Device = SwitchDevice(Channel, Priority);
if (m_Device) if (m_Device)
SetChannel(Channel, StreamType, Apid, Dpid); SetChannel(Apid, Dpid);
} }
} }
@ -487,12 +487,10 @@ void cStreamdevLiveStreamer::StartReceiver(void)
DELETENULL(m_Receiver); DELETENULL(m_Receiver);
} }
bool cStreamdevLiveStreamer::SetChannel(const cChannel *Channel, eStreamType StreamType, const int* Apid, const int *Dpid) bool cStreamdevLiveStreamer::SetChannel(const int* Apid, const int *Dpid)
{ {
Dprintf("Initializing Remuxer for full channel transfer\n"); Dprintf("Initializing Remuxer for full channel transfer\n");
//printf("ca pid: %d\n", Channel->Ca()); //printf("ca pid: %d\n", Channel->Ca());
m_Channel = Channel;
m_StreamType = StreamType;
const int *Apids = Apid ? Apid : m_Channel->Apids(); const int *Apids = Apid ? Apid : m_Channel->Apids();
const int *Dpids = Dpid ? Dpid : m_Channel->Dpids(); const int *Dpids = Dpid ? Dpid : m_Channel->Dpids();

View File

@ -42,9 +42,7 @@ private:
/* Find a suitable device and tune it to the requested channel. */ /* Find a suitable device and tune it to the requested channel. */
cDevice *SwitchDevice(const cChannel *Channel, int Priority); cDevice *SwitchDevice(const cChannel *Channel, int Priority);
void SetDevice(cDevice *Device) { m_Device = Device; } bool SetChannel(const int* Apid = NULL, const int* Dpid = NULL);
bool SetChannel(const cChannel *Channel, eStreamType StreamType, const int* Apid = NULL, const int* Dpid = NULL);
protected: protected:
virtual uchar* GetFromReceiver(int &Count) { return m_ReceiveBuffer->Get(Count); } virtual uchar* GetFromReceiver(int &Count) { return m_ReceiveBuffer->Get(Count); }