1 files changed, 7 insertions, 42 deletions
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
index 7bbfde6257e6..df1865789ebd 100644
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
+++ b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
@@ -1,47 +1,12 @@
 --- a/receiver.c
 +++ b/receiver.c
-@@ -56,14 +56,23 @@ protected:
-   virtual void Receive(uchar *Data, int Length);
+@@ -32,7 +32,9 @@
  
- public:
--  cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids);
-+  cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids);
-   virtual ~cLiveReceiver();
- };
- 
--cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids)
-- : cReceiver(ChannelID, Priority, 0, Pids)
-+#if (APIVERSNUM < 10725)
-+cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids)
-+ : cReceiver(Channel->GetChannelID(), Priority, 0, Pids)
-  , m_Streamer(Streamer)
- {
-+#else
-+cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids)
-+ : cReceiver(Channel, Priority)
-+ , m_Streamer(Streamer)
-+{
-+  AddPid(0);
-+  AddPids(Pids);
+ #include <vdr/remux.h>
+ #include <vdr/channels.h>
++#ifndef __FreeBSD__
+ #include <asm/byteorder.h>
 +#endif
-   LOGCONSOLE("Starting live receiver");
- }
- 
-@@ -492,7 +501,7 @@ void cLivePatFilter::Process(u_short Pid
-         }
-       }
  
--      m_Streamer->m_Receiver  = new cLiveReceiver(m_Streamer, m_Channel->GetChannelID(), m_Streamer->m_Priority, m_Streamer->m_Pids);
-+      m_Streamer->m_Receiver  = new cLiveReceiver(m_Streamer, m_Channel, m_Streamer->m_Priority, m_Streamer->m_Pids);
-       m_Streamer->m_Device->AttachReceiver(m_Streamer->m_Receiver);
-       isyslog("VNSI: Currently unknown new streams found, receiver and demuxers reinited\n");
-     }
-@@ -785,7 +794,7 @@ bool cLiveStreamer::StreamChannel(const 
-       if (m_NumStreams > 0 && m_Socket)
-       {
-         dsyslog("VNSI: Creating new live Receiver");
--        m_Receiver  = new cLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids);
-+        m_Receiver  = new cLiveReceiver(this, m_Channel, m_Priority, m_Pids);
-         m_PatFilter = new cLivePatFilter(this, m_Channel);
-         m_Device->AttachReceiver(m_Receiver);
-         m_Device->AttachFilter(m_PatFilter);
+ #include "config.h"
+ #include "receiver.h"