Ticket #9592: 0015-Obey-useonairguide-and-enable-it-for-kabelplus-DVB-C.patch

File 0015-Obey-useonairguide-and-enable-it-for-kabelplus-DVB-C.patch, 2.3 KB (added by Karl Egly, 11 years ago)

variant of the patch

  • mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp 

    From 8af9197e32d96890ac7851e4c1d244209ec060b0 Mon Sep 17 00:00:00 2001
From: Karl Dietz <dekarl@mythtv.org>
Date: Mon, 7 Jan 2013 22:42:16 +0100
Subject: [PATCH 15/15] Obey useonairguide and enable it for kabelplus (DVB-C AT)

Ignore the SDT in the EIT scanner, thus obeying useonairguide.
Add quirck for ONID 222 (kabelsignal) to the channel scanner.

Refs #9592
---
 .../libs/libmythtv/channelscan/channelscan_sm.cpp  |   11 ++++++++---
 mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp       |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
index 2328bf3..74524e6 100644
    a b static void update_info(ChannelInsertInfo &info, 
    10271027                        const ServiceDescriptionTable *sdt, uint i,
    10281028                        const QMap<uint64_t, QString> &defAuthorities)
    10291029{
    1030     // HACK beg -- special exception for this network
     1030    // HACK beg -- special exception for these networks
    10311031    //             (dbver == "1067")
    1032     bool force_guide_present = (sdt->OriginalNetworkID() == 70);
    1033     // HACK end -- special exception for this network
     1032    bool force_guide_present = (
     1033        // Telenor (NO)
     1034        (sdt->OriginalNetworkID() ==    70) ||
     1035        // Kabelplus (AT) formerly Kabelsignal, registered to NDS, see #9592
     1036        (sdt->OriginalNetworkID() ==   222)
     1037    );
     1038    // HACK end -- special exception for these networks
    10341039
    10351040    // Figure out best service name and callsign...
    10361041    ServiceDescriptor *desc = sdt->GetServiceDescriptor(i);

  • mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp 

    diff --git a/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp
index d09017e..46e8c72 100644
    a b void DVBStreamData::ProcessSDT(uint tsid, const ServiceDescriptionTable *sdt) 
    424424bool DVBStreamData::HasEITPIDChanges(const uint_vec_t &in_use_pids) const
    425425{
    426426    QMutexLocker locker(&_listener_lock);
    427     bool want_eit = (_eit_rate >= 0.5f) && HasAnyEIT();
     427    bool want_eit = (_eit_rate >= 0.5f);
    428428    bool has_eit  = in_use_pids.size();
    429429    return want_eit != has_eit;
    430430}