summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2014-06-07 23:11:42 +0200
committerFrank Schmirler <vdr@schmirler.de>2014-06-22 11:21:02 +0200
commitbfbf19deccb28caf83aaa722d53d6ae6fe217f1d (patch)
treeefdeff6183a4a89559f8f52e60bcb2312783fefc /server
parente5550175658b3f4617d460e9fd04b3d70de366e6 (diff)
downloadvdr-plugin-streamdev-bfbf19deccb28caf83aaa722d53d6ae6fe217f1d.tar.gz
vdr-plugin-streamdev-bfbf19deccb28caf83aaa722d53d6ae6fe217f1d.tar.bz2
Dropped unused function and parameter.
Diffstat (limited to 'server')
-rw-r--r--server/livestreamer.c8
-rw-r--r--server/livestreamer.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/server/livestreamer.c b/server/livestreamer.c
index bb21ef1..c2ba110 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -350,12 +350,12 @@ cStreamdevLiveStreamer::cStreamdevLiveStreamer(const cServerConnection *Connecti
m_ReceiveBuffer = new cStreamdevBuffer(LIVEBUFSIZE, TS_SIZE *2, true, "streamdev-livestreamer"),
m_ReceiveBuffer->SetTimeouts(0, 100);
if (Priority == IDLEPRIORITY) {
- SetChannel(Channel, StreamType, Apid, Dpid);
+ SetChannel(Apid, Dpid);
}
else {
m_Device = SwitchDevice(Channel, Priority);
if (m_Device)
- SetChannel(Channel, StreamType, Apid, Dpid);
+ SetChannel(Apid, Dpid);
}
}
@@ -487,12 +487,10 @@ void cStreamdevLiveStreamer::StartReceiver(void)
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");
//printf("ca pid: %d\n", Channel->Ca());
- m_Channel = Channel;
- m_StreamType = StreamType;
const int *Apids = Apid ? Apid : m_Channel->Apids();
const int *Dpids = Dpid ? Dpid : m_Channel->Dpids();
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 4e89cf8..e259ee9 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -42,9 +42,7 @@ private:
/* Find a suitable device and tune it to the requested channel. */
cDevice *SwitchDevice(const cChannel *Channel, int Priority);
- void SetDevice(cDevice *Device) { m_Device = Device; }
-
- bool SetChannel(const cChannel *Channel, eStreamType StreamType, const int* Apid = NULL, const int* Dpid = NULL);
+ bool SetChannel(const int* Apid = NULL, const int* Dpid = NULL);
protected:
virtual uchar* GetFromReceiver(int &Count) { return m_ReceiveBuffer->Get(Count); }