Ticket #6138: 136-hdhr.dvb.1.patch

File 136-hdhr.dvb.1.patch, 4.3 KB (added by cizek@…, 12 years ago)

dvb patches from #6274

  • mythtv/libs/libmythtv/hdhrchannel.cpp

    diff -r -u -N -X diff.exclude -x release.19962.0209a -x release.19962.0209b release.19962.0209a/mythtv/libs/libmythtv/hdhrchannel.cpp release.19962.0209b/mythtv/libs/libmythtv/hdhrchannel.cpp
     
    257257        ok = _stream_handler->TuneChannel(QString("qam64:%1").arg(frequency));
    258258    else if (modulation == "qam_256")
    259259        ok = _stream_handler->TuneChannel(QString("qam256:%1").arg(frequency));
     260    else if (modulation == "auto")
     261        ok = _stream_handler->TuneChannel(QString("auto:%1").arg(frequency));
    260262
    261263    if (ok)
    262264        SetSIStandard(si_std);
  • mythtv/libs/libmythtv/hdhrrecorder.cpp

    diff -r -u -N -X diff.exclude -x release.19962.0209a -x release.19962.0209b release.19962.0209a/mythtv/libs/libmythtv/hdhrrecorder.cpp release.19962.0209b/mythtv/libs/libmythtv/hdhrrecorder.cpp
     
    2525#include "RingBuffer.h"
    2626#include "atsctables.h"
    2727#include "atscstreamdata.h"
     28#include "dvbstreamdata.h"
    2829#include "eithelper.h"
    2930#include "tv_rec.h"
    3031
     
    161162        data->AddMPEGSPListener(this);
    162163        data->AddMPEGListener(this);
    163164
     165        DVBStreamData *dvb = dynamic_cast<DVBStreamData*>(data);
     166        if (dvb)
     167            dvb->AddDVBMainListener(this);
     168
    164169        ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data);
    165170
    166171        if (atsc && atsc->DesiredMinorChannel())
  • mythtv/libs/libmythtv/hdhrrecorder.h

    diff -r -u -N -X diff.exclude -x release.19962.0209a -x release.19962.0209b release.19962.0209a/mythtv/libs/libmythtv/hdhrrecorder.h release.19962.0209b/mythtv/libs/libmythtv/hdhrrecorder.h
     
    2323class HDHRRecorder : public DTVRecorder,
    2424                     public MPEGStreamListener,
    2525                     public MPEGSingleProgramStreamListener,
     26                     public DVBMainStreamListener,
     27                     public ATSCMainStreamListener,
    2628                     public TSPacketListener,
    2729                     public TSPacketListenerAV
    2830{
    29     friend class ATSCStreamData;
    3031
    3132  public:
    3233    HDHRRecorder(TVRec *rec, HDHRChannel *channel);
     
    5960    void HandleSingleProgramPAT(ProgramAssociationTable *pat);
    6061    void HandleSingleProgramPMT(ProgramMapTable *pmt);
    6162
    62     /*
    6363    // ATSC
    6464    void HandleSTT(const SystemTimeTable*) {}
    65     void HandleMGT(const MasterGuideTable *mgt);
     65    void HandleMGT(const MasterGuideTable *mgt) {}
    6666    void HandleVCT(uint, const VirtualChannelTable*) {}
    67     */
     67
     68    // DVBMainStreamListener
     69    void HandleTDT(const TimeDateTable*) {}
     70    void HandleNIT(const NetworkInformationTable*) {}
     71    void HandleSDT(uint /*tsid*/, const ServiceDescriptionTable*) {}
    6872
    6973    // TSPacketListenerAV
    7074    bool ProcessVideoTSPacket(const TSPacket& tspacket);
  • mythtv/libs/libmythtv/scanwizardhelpers.cpp

    diff -r -u -N -X diff.exclude -x release.19962.0209a -x release.19962.0209b release.19962.0209a/mythtv/libs/libmythtv/scanwizardhelpers.cpp release.19962.0209b/mythtv/libs/libmythtv/scanwizardhelpers.cpp
     
    395395                     QString::number(DVBUtilsImport));
    396396        break;
    397397    case CardUtil::ATSC:
    398     case CardUtil::HDHOMERUN:
    399398        addSelection(tr("Full Scan"),
    400399                     QString::number(FullScan_ATSC), true);
    401400        addSelection(tr("Import channels.conf"),
    402401                     QString::number(DVBUtilsImport));
    403402        break;
     403    case CardUtil::HDHOMERUN:
     404        addSelection(tr("Full Scan (ATSC)"),
     405                     QString::number(FullScan_ATSC), true);
     406        addSelection(tr("Full Scan (DVB)"),
     407                     QString::number(FullScan_OFDM), true);
     408        addSelection(tr("Full Scan (Tuned)"),
     409                     QString::number(NITAddScan_OFDM));
     410        addSelection(tr("Import channels.conf"),
     411                     QString::number(DVBUtilsImport));
     412        break;
    404413    case CardUtil::FREEBOX:
    405414        addSelection(tr("M3U Import"),
    406415                     QString::number(IPTVImport), true);