Ticket #13414: 20190226-dvbsh-drb-v5.patch

File 20190226-dvbsh-drb-v5.patch, 1.9 KB (added by Klaas de Waal, 11 months ago)

Full fix for dvbstreamhandler.cpp and dvbstreamhandler.h, removed duplicate calls, removed superfluous override function.

  • mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp

    diff --git a/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp
    index d45064cbbf..7158f882fe 100644
    a b void DVBStreamHandler::Return(DVBStreamHandler * & ref, int inputid) 
    8181
    8282    if ((it != s_handlers.end()) && (*it == ref))
    8383    {
    84         LOG(VB_RECORD, LOG_INFO, QString("dVBSH[%1]: Closing handler for %2")
     84        LOG(VB_RECORD, LOG_INFO, QString("DVBSH[%1]: Closing handler for %2")
    8585            .arg(inputid).arg(devname));
    8686        delete *it;
    8787        s_handlers.erase(it);
    DVBStreamHandler::DVBStreamHandler(const QString &dvb_device, int inputid) 
    108108    setObjectName("DVBRead");
    109109}
    110110
    111 void DVBStreamHandler::SetRunningDesired(bool desired)
    112 {
    113     if (_drb && m_running_desired && !desired)
    114     {
    115         StreamHandler::SetRunningDesired(desired);
    116         _drb->Stop();
    117     }
    118     else
    119     {
    120         StreamHandler::SetRunningDesired(desired);
    121     }
    122 }
    123 
    124111void DVBStreamHandler::run(void)
    125112{
    126113    RunProlog();
    void DVBStreamHandler::RunTS(void) 
    297284
    298285    if (drb)
    299286    {
    300         if (drb->IsRunning())
    301             drb->Stop();
    302287        delete drb;
    303288    }
    304289
  • mythtv/libs/libmythtv/recorders/dvbstreamhandler.h

    diff --git a/mythtv/libs/libmythtv/recorders/dvbstreamhandler.h b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.h
    index fff3600bb6..15f0854b0b 100644
    a b class DVBStreamHandler : public StreamHandler 
    6060    PIDInfo *CreatePIDInfo(uint pid, uint stream_type, int pes_type) override // StreamHandler
    6161        { return new DVBPIDInfo(pid, stream_type, pes_type); }
    6262
    63     void SetRunningDesired(bool desired) override; // StreamHandler
    64 
    6563  private:
    6664    QString           _dvr_dev_path;
    6765    volatile bool     _allow_retune;