2 files changed, 85 insertions, 0 deletions

diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c b/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c
index 11bd62546019..35f01deca25d 100644
--- a/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c
+++ b/multimedia/vdr-plugin-vnsiserver/files/patch-cmdcontrol.c
@@ -1,5 +1,43 @@
 --- a/cmdcontrol.c
 +++ b/cmdcontrol.c
+@@ -950,15 +950,15 @@ bool cCmdControl::processRECORDINGS_GetL
+       }
+       else
+       {
+-        recordingStart = recording->start;
++        recordingStart = recording->Start();
+       }
+     }
+     LOGCONSOLE("GRI: RC: recordingStart=%lu recordingDuration=%lu", recordingStart, recordingDuration);
+ 
+     m_resp->add_U32(recordingStart);
+     m_resp->add_U32(recordingDuration);
+-    m_resp->add_U32(recording->priority);
+-    m_resp->add_U32(recording->lifetime);
++    m_resp->add_U32(recording->Priority());
++    m_resp->add_U32(recording->Lifetime());
+     m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : "");
+     const char* fullname = recording->Name();
+     const char* recname = strrchr(fullname, '~');
+@@ -1019,15 +1019,15 @@ bool cCmdControl::processRECORDINGS_GetI
+     }
+     else
+     {
+-      recordingStart = recording->start;
++      recordingStart = recording->Start();
+     }
+   }
+   LOGCONSOLE("GRI: RC: recordingStart=%lu recordingDuration=%lu", recordingStart, recordingDuration);
+ 
+   m_resp->add_U32(recordingStart);
+   m_resp->add_U32(recordingDuration);
+-  m_resp->add_U32(recording->priority);
+-  m_resp->add_U32(recording->lifetime);
++  m_resp->add_U32(recording->Priority());
++  m_resp->add_U32(recording->Lifetime());
+   m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : "");
+   if (!isempty(recording->Info()->Title()))
+     m_resp->add_String(m_toUTF8.Convert(recording->Info()->Title()));
 @@ -1232,7 +1232,7 @@ bool cCmdControl::processRECORDINGS_Move
            return true;
          }
diff --git a/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
new file mode 100644
index 000000000000..7bbfde6257e6
--- /dev/null
+++ b/multimedia/vdr-plugin-vnsiserver/files/patch-receiver.c
@@ -0,0 +1,47 @@
+--- a/receiver.c
++++ b/receiver.c
+@@ -56,14 +56,23 @@ protected:
+   virtual void Receive(uchar *Data, int Length);
+ 
+ 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);
++#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);