Merge pull request #388 from stefansaraev/vdr

vdr: update to 1.7.27

packages/3rdparty/multimedia/vdr-dynamite/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-dynamite"
-PKG_VERSION="cdf48a8"
+PKG_VERSION="10d78a8"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-c98852f_receiver-and-recording-fixes.patch

@@ -0,0 +1,84 @@
+diff --git a/src/live/livepatfilter.c b/src/live/livepatfilter.c
+index e811c8c..f1b94fd 100644
+--- a/src/live/livepatfilter.c
++++ b/src/live/livepatfilter.c
+@@ -447,7 +447,7 @@ void cLivePatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Le
+         }
+       }
+ 
+-      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);
+       INFOLOG("Currently unknown new streams found, requesting stream change");
+       m_Streamer->RequestStreamChange();
+diff --git a/src/live/livereceiver.c b/src/live/livereceiver.c
+index 34f5ba8..528f65a 100644
+--- a/src/live/livereceiver.c
++++ b/src/live/livereceiver.c
+@@ -27,10 +27,12 @@
+ #include "livereceiver.h"
+ #include "livestreamer.h"
+ 
+-cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids)
+- : cReceiver(ChannelID, Priority, 0, Pids)
++cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids)
++ : cReceiver(Channel, Priority)
+  , m_Streamer(Streamer)
+ {
++  AddPid(0);
++  AddPids(Pids);
+   DEBUGLOG("Starting live receiver");
+ }
+ 
+diff --git a/src/live/livereceiver.h b/src/live/livereceiver.h
+index 8d23522..2ccd8bf 100644
+--- a/src/live/livereceiver.h
++++ b/src/live/livereceiver.h
+@@ -42,7 +42,7 @@ 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();
+ };
+ 
+diff --git a/src/live/livestreamer.c b/src/live/livestreamer.c
+index a2d6826..6bafc02 100644
+--- a/src/live/livestreamer.c
++++ b/src/live/livestreamer.c
+@@ -406,7 +406,7 @@ bool cLiveStreamer::StreamChannel(const cChannel *channel, int priority, cxSocke
+   if (m_NumStreams > 0 && m_Socket)
+   {
+     DEBUGLOG("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);
+diff --git a/src/xvdr/xvdrclient.c b/src/xvdr/xvdrclient.c
+index cea1af2..931ea61 100644
+--- a/src/xvdr/xvdrclient.c
++++ b/src/xvdr/xvdrclient.c
+@@ -1572,7 +1572,7 @@ bool cXVDRClient::processRECORDINGS_GetList() /* OPCODE 102 */
+       }
+       else
+       {
+-        recordingStart = recording->start;
++        recordingStart = recording->Start();
+       }
+     }
+     DEBUGLOG("GRI: RC: recordingStart=%lu recordingDuration=%i", recordingStart, recordingDuration);
+@@ -1584,10 +1584,10 @@ bool cXVDRClient::processRECORDINGS_GetList() /* OPCODE 102 */
+     m_resp->add_U32(recordingDuration);
+ 
+     // priority
+-    m_resp->add_U32(recording->priority);
++    m_resp->add_U32(recording->Priority());
+ 
+     // lifetime
+-    m_resp->add_U32(recording->lifetime);
++    m_resp->add_U32(recording->Lifetime());
+ 
+     // channel_name
+     m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : "");

packages/3rdparty/multimedia/vdr-wirbelscan/build

@@ -24,6 +24,6 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
-cd $BUILD/wirbelscan-*
+cd $PKG_BUILD
 make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"
 

packages/3rdparty/multimedia/vdr-wirbelscan/patches/vdr-wirbelscan-0.0.7-receiver-api-fixes.patch

@@ -0,0 +1,51 @@
+commit 64f969e39d18aefa263dc3a61172e33df33963fb
+Author: Stefan Saraev <stefan@saraev.ca>
+Date:   Thu Mar 29 20:22:11 2012 +0300
+
+    wirbelscan: receiver-api-fixes
+
+diff --git a/statemachine.c b/statemachine.c
+index 48a212e..bc0c8e5 100644
+--- a/statemachine.c
++++ b/statemachine.c
+@@ -36,12 +36,12 @@ protected:
+     while (Running()) cCondWait::SleepMs(5);
+     }; /*TODO: check here periodically for lock and wether we got any data!*/
+ public:
+-  cScanReceiver(tChannelID ChannelID, int AnyPid);
++  cScanReceiver(const cChannel* chan, int AnyPid);
+   virtual ~cScanReceiver() {cReceiver::Detach(); };
+   };
+ 
+-cScanReceiver::cScanReceiver(tChannelID ChannelID, int AnyPid) :
+-     cReceiver(ChannelID, 99, AnyPid), cThread("dummy receiver") { }
++cScanReceiver::cScanReceiver(const cChannel* chan, int AnyPid) :
++     cReceiver(chan, 99), cThread("dummy receiver") {  AddPid(AnyPid); }
+ 
+ ///!-----------------------------------------------------------------
+ ///!  v 0.0.5, store state in lastState if different and print state
+@@ -144,7 +144,7 @@ void cStateMachine::Action(void) {
+          ScannedTransponders.Add(ScannedTransponder);
+ 
+          dev->SwitchChannel(Transponder, false);
+-         aReceiver = new cScanReceiver(Transponder->GetChannelID(), 99);
++         aReceiver = new cScanReceiver(Transponder, 99);
+          dev->AttachReceiver(aReceiver);
+ 
+          cCondWait::SleepMs(1000);
+diff --git a/ttext.c b/ttext.c
+index 0053936..0864484 100644
+--- a/ttext.c
++++ b/ttext.c
+@@ -374,9 +374,9 @@ void cSwReceiver::Action() {
+      }
+ }
+ 
+-cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel->GetChannelID(),
+-   100, Channel->Tpid()), cThread("ttext") {
++cSwReceiver::cSwReceiver(cChannel * Channel) : cReceiver(Channel, 100), cThread("ttext") {
+ 
++   AddPid(Channel->Tpid());
+    stopped = fuzzy = false;
+    channel = Channel;
+    buffer  = new cRingBufferLinear(MEGABYTE(1),184);

packages/3rdparty/multimedia/vdr-wirbelscan/rename

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $BUILD
+mv wirbelscan-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

packages/3rdparty/multimedia/vdr/meta

@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="vdr"
-PKG_VERSION="1.7.26"
+PKG_VERSION="1.7.27"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/3rdparty/multimedia/vdr/patches/vdr-1.7.27-61_dynamite-subdevice.patch

@@ -25,7 +25,7 @@ index 74e0270..d38e2dd 100644
  
  class cTPDU;
 diff --git a/device.c b/device.c
-index 8c527aa..8b0a7e2 100644
+index 00645cf..fc4c93d 100644
 --- a/device.c
 +++ b/device.c
 @@ -69,12 +69,22 @@ int cDevice::currentChannel = 1;
@@ -113,7 +113,7 @@ index 8c527aa..8b0a7e2 100644
    for (int i = 0; i < numDevices; i++) {
        if (device[i] == this)
           return i;
-@@ -341,6 +380,8 @@ bool cDevice::HasCi(void)
+@@ -346,6 +385,8 @@ bool cDevice::HasCi(void)
  
  void cDevice::SetCamSlot(cCamSlot *CamSlot)
  {
@@ -122,7 +122,7 @@ index 8c527aa..8b0a7e2 100644
    camSlot = CamSlot;
  }
  
-@@ -553,6 +594,10 @@ void cDevice::DelLivePids(void)
+@@ -558,6 +599,10 @@ void cDevice::DelLivePids(void)
  
  void cDevice::StartSectionHandler(void)
  {
@@ -133,7 +133,7 @@ index 8c527aa..8b0a7e2 100644
    if (!sectionHandler) {
       sectionHandler = new cSectionHandler(this);
       AttachFilter(eitFilter = new cEitFilter);
-@@ -564,6 +609,10 @@ void cDevice::StartSectionHandler(void)
+@@ -569,6 +614,10 @@ void cDevice::StartSectionHandler(void)
  
  void cDevice::StopSectionHandler(void)
  {
@@ -144,7 +144,7 @@ index 8c527aa..8b0a7e2 100644
    if (sectionHandler) {
       delete nitFilter;
       delete sdtFilter;
-@@ -590,12 +639,17 @@ void cDevice::CloseFilter(int Handle)
+@@ -595,12 +644,17 @@ void cDevice::CloseFilter(int Handle)
  
  void cDevice::AttachFilter(cFilter *Filter)
  {
@@ -162,7 +162,7 @@ index 8c527aa..8b0a7e2 100644
    if (sectionHandler)
       sectionHandler->Detach(Filter);
  }
-@@ -757,6 +811,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
+@@ -762,6 +816,7 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
          sectionHandler->SetStatus(false);
          sectionHandler->SetChannel(NULL);
          }
@@ -170,7 +170,7 @@ index 8c527aa..8b0a7e2 100644
       // Tell the camSlot about the channel switch and add all PIDs of this
       // channel to it, for possible later decryption:
       if (camSlot)
-@@ -803,19 +858,27 @@ void cDevice::ForceTransferMode(void)
+@@ -808,19 +863,27 @@ void cDevice::ForceTransferMode(void)
  {
    if (!cTransferControl::ReceiverDevice()) {
       cChannel *Channel = Channels.GetByNumber(CurrentChannel());
@@ -199,7 +199,7 @@ index 8c527aa..8b0a7e2 100644
    if (Seconds >= 0)
       occupiedTimeout = time(NULL) + min(Seconds, MAXOCCUPIEDTIMEOUT);
  }
-@@ -1188,7 +1251,10 @@ bool cDevice::Transferring(void) const
+@@ -1193,7 +1256,10 @@ bool cDevice::Transferring(void) const
  
  bool cDevice::AttachPlayer(cPlayer *Player)
  {
@@ -210,7 +210,7 @@ index 8c527aa..8b0a7e2 100644
       if (player)
          Detach(player);
       DELETENULL(liveSubtitle);
-@@ -1207,6 +1273,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
+@@ -1212,6 +1278,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
  
  void cDevice::Detach(cPlayer *Player)
  {
@@ -219,7 +219,7 @@ index 8c527aa..8b0a7e2 100644
    if (Player && player == Player) {
       cPlayer *p = player;
       player = NULL; // avoids recursive calls to Detach()
-@@ -1226,6 +1294,8 @@ void cDevice::Detach(cPlayer *Player)
+@@ -1231,6 +1299,8 @@ void cDevice::Detach(cPlayer *Player)
  
  void cDevice::StopReplay(void)
  {
@@ -228,7 +228,7 @@ index 8c527aa..8b0a7e2 100644
    if (player) {
       Detach(player);
       if (IsPrimaryDevice())
-@@ -1508,6 +1578,8 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+@@ -1513,6 +1583,8 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
  
  int cDevice::Priority(void) const
  {
@@ -237,7 +237,7 @@ index 8c527aa..8b0a7e2 100644
    int priority = IDLEPRIORITY;
    if (IsPrimaryDevice() && !Replaying() && ActualDevice() == PrimaryDevice())
       priority = TRANSFERPRIORITY; // we use the same value here, no matter whether it's actual Transfer Mode or real live viewing
-@@ -1526,6 +1598,8 @@ bool cDevice::Ready(void)
+@@ -1531,6 +1603,8 @@ bool cDevice::Ready(void)
  
  bool cDevice::Receiving(bool Dummy) const
  {
@@ -246,7 +246,7 @@ index 8c527aa..8b0a7e2 100644
    cMutexLock MutexLock(&mutexReceiver);
    for (int i = 0; i < MAXRECEIVERS; i++) {
        if (receiver[i])
-@@ -1606,10 +1680,13 @@ bool cDevice::GetTSPacket(uchar *&Data)
+@@ -1611,10 +1685,13 @@ bool cDevice::GetTSPacket(uchar *&Data)
  
  bool cDevice::AttachReceiver(cReceiver *Receiver)
  {
@@ -260,7 +260,7 @@ index 8c527aa..8b0a7e2 100644
  // activate the following line if you need it - actually the driver should be fixed!
  //#define WAIT_FOR_TUNER_LOCK
  #ifdef WAIT_FOR_TUNER_LOCK
-@@ -1648,6 +1725,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
+@@ -1653,6 +1730,8 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
  
  void cDevice::Detach(cReceiver *Receiver)
  {
@@ -269,7 +269,7 @@ index 8c527aa..8b0a7e2 100644
    if (!Receiver || Receiver->device != this)
       return;
    bool receiversLeft = false;
-@@ -1673,6 +1752,8 @@ void cDevice::Detach(cReceiver *Receiver)
+@@ -1678,6 +1757,8 @@ void cDevice::Detach(cReceiver *Receiver)
  
  void cDevice::DetachAll(int Pid)
  {
@@ -278,7 +278,7 @@ index 8c527aa..8b0a7e2 100644
    if (Pid) {
       cMutexLock MutexLock(&mutexReceiver);
       for (int i = 0; i < MAXRECEIVERS; i++) {
-@@ -1685,6 +1766,8 @@ void cDevice::DetachAll(int Pid)
+@@ -1690,6 +1771,8 @@ void cDevice::DetachAll(int Pid)
  
  void cDevice::DetachAllReceivers(void)
  {
@@ -287,7 +287,7 @@ index 8c527aa..8b0a7e2 100644
    cMutexLock MutexLock(&mutexReceiver);
    for (int i = 0; i < MAXRECEIVERS; i++)
        Detach(receiver[i]);
-@@ -1756,3 +1839,25 @@ uchar *cTSBuffer::Get(void)
+@@ -1761,3 +1844,25 @@ uchar *cTSBuffer::Get(void)
       }
    return NULL;
  }
@@ -314,7 +314,7 @@ index 8c527aa..8b0a7e2 100644
 +  DynamicDeviceProbes.Del(this, false);
 +}
 diff --git a/device.h b/device.h
-index 0d9ac3a..5cb5645 100644
+index 987dfd2..1ad06ae 100644
 --- a/device.h
 +++ b/device.h
 @@ -169,7 +169,6 @@ private:
@@ -334,8 +334,8 @@ index 0d9ac3a..5cb5645 100644
 -         ///< Returns the card index of this device (0 ... MAXDEVICES - 1).
    int DeviceNumber(void) const;
           ///< Returns the number of this device (0 ... numDevices).
-   virtual bool HasDecoder(void) const;
-@@ -404,9 +400,6 @@ public:
+   virtual cString DeviceName(void) const;
+@@ -407,9 +403,6 @@ public:
           ///< Returns true if this device has a Common Interface.
    void SetCamSlot(cCamSlot *CamSlot);
           ///< Sets the given CamSlot to be used with this device.
@@ -345,7 +345,7 @@ index 0d9ac3a..5cb5645 100644
  
  // Image Grab facilities
  
-@@ -562,9 +555,6 @@ private:
+@@ -565,9 +558,6 @@ private:
    cTsToPes tsToPesSubtitle;
    bool isPlayingVideo;
  protected:
@@ -355,7 +355,7 @@ index 0d9ac3a..5cb5645 100644
    virtual bool CanReplay(void) const;
         ///< Returns true if this device can currently start a replay session.
    virtual bool SetPlayMode(ePlayMode PlayMode);
-@@ -749,6 +739,38 @@ public:
+@@ -752,6 +742,38 @@ public:
         ///< Detaches all receivers from this device for this pid.
    virtual void DetachAllReceivers(void);
         ///< Detaches all receivers from this device.
@@ -394,7 +394,7 @@ index 0d9ac3a..5cb5645 100644
    };
  
  /// Derived cDevice classes that can receive channels will have to provide
-@@ -772,4 +794,47 @@ public:
+@@ -775,4 +797,47 @@ public:
    uchar *Get(void);
    };
  
@@ -584,7 +584,7 @@ index adbe40d..6d117b2 100644
  
  #endif //__DVBCI_H
 diff --git a/dvbdevice.c b/dvbdevice.c
-index 4c9268f..e2944e3 100644
+index 65e9a4b..4bc42ab 100644
 --- a/dvbdevice.c
 +++ b/dvbdevice.c
 @@ -286,7 +286,7 @@ private:
@@ -736,7 +736,7 @@ index 4c9268f..e2944e3 100644
  
    // The DVR device (will be opened and closed as needed):
  
-@@ -1230,7 +1281,11 @@ bool cDvbDevice::BondDevices(const char *Bondings)
+@@ -1235,7 +1286,11 @@ bool cDvbDevice::BondDevices(const char *Bondings)
           if (d >= 0) {
              int ErrorDevice = 0;
              if (cDevice *Device1 = cDevice::GetDevice(i)) {
@@ -748,7 +748,7 @@ index 4c9268f..e2944e3 100644
                    if (cDvbDevice *DvbDevice1 = dynamic_cast<cDvbDevice *>(Device1)) {
                       if (cDvbDevice *DvbDevice2 = dynamic_cast<cDvbDevice *>(Device2)) {
                          if (!DvbDevice1->Bond(DvbDevice2))
-@@ -1264,7 +1319,10 @@ bool cDvbDevice::BondDevices(const char *Bondings)
+@@ -1269,7 +1324,10 @@ bool cDvbDevice::BondDevices(const char *Bondings)
  void cDvbDevice::UnBondDevices(void)
  {
    for (int i = 0; i < cDevice::NumDevices(); i++) {
@@ -760,7 +760,7 @@ index 4c9268f..e2944e3 100644
           d->UnBond();
        }
  }
-@@ -1318,6 +1376,26 @@ bool cDvbDevice::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
+@@ -1323,6 +1381,26 @@ bool cDvbDevice::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
    return true;
  }
  
@@ -787,7 +787,7 @@ index 4c9268f..e2944e3 100644
  bool cDvbDevice::HasCi(void)
  {
    return ciAdapter;
-@@ -1484,7 +1562,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
+@@ -1489,7 +1567,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
  
  bool cDvbDevice::ProvidesEIT(void) const
  {
@@ -797,7 +797,7 @@ index 4c9268f..e2944e3 100644
  
  int cDvbDevice::NumProvidedSystems(void) const
 diff --git a/dvbdevice.h b/dvbdevice.h
-index 85b0d9c..2dcb319 100644
+index c53a208..b016669
 --- a/dvbdevice.h
 +++ b/dvbdevice.h
 @@ -107,7 +107,7 @@ class cDvbTuner;
@@ -809,7 +809,7 @@ index 85b0d9c..2dcb319 100644
    static cString DvbName(const char *Name, int Adapter, int Frontend);
    static int DvbOpen(const char *Name, int Adapter, int Frontend, int Mode, bool ReportError = false);
  private:
-@@ -133,11 +133,13 @@ private:
+@@ -133,12 +133,13 @@ private:
    mutable bool needsDetachBondedReceivers;
    bool QueryDeliverySystems(int fd_frontend);
  public:
@@ -819,8 +819,8 @@ index 85b0d9c..2dcb319 100644
    int Adapter(void) const { return adapter; }
    int Frontend(void) const { return frontend; }
    virtual bool Ready(void);
+   virtual cString DeviceName(void) const;
 +  virtual bool SetIdleDevice(bool Idle, bool TestOnly);
-+
    static bool BondDevices(const char *Bondings);
         ///< Bonds the devices as defined in the given Bondings string.
         ///< A bonding is a sequence of device numbers (starting at 1),

packages/addons/service/multimedia/vdr-addon/addon

@@ -38,7 +38,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-dynamite-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-iptv-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $BUILD/wirbelscan-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $BUILD/vdr-wirbelscan-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-dvbapi-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-sc-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-sc-*/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,8 @@
+2.1.2
+- update to vdr-1.7.27
+- update to vdr-dynamite-10d78a8
+- update to vdr-sc-605
+
 2.1.1
 - rebuild for addon version 2.1
 - update to vdr-plugin-dvbapi-9bef03f

packages/addons/service/multimedia/vdr-addon/meta

@@ -20,8 +20,8 @@
 ################################################################################
 
 PKG_NAME="vdr-addon"
-PKG_VERSION="2.0"
-PKG_REV="1"
+PKG_VERSION="2.1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"