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
|
|
|
257 | 257 | ok = _stream_handler->TuneChannel(QString("qam64:%1").arg(frequency)); |
258 | 258 | else if (modulation == "qam_256") |
259 | 259 | ok = _stream_handler->TuneChannel(QString("qam256:%1").arg(frequency)); |
| 260 | else if (modulation == "auto") |
| 261 | ok = _stream_handler->TuneChannel(QString("auto:%1").arg(frequency)); |
260 | 262 | |
261 | 263 | if (ok) |
262 | 264 | SetSIStandard(si_std); |
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
|
|
|
25 | 25 | #include "RingBuffer.h" |
26 | 26 | #include "atsctables.h" |
27 | 27 | #include "atscstreamdata.h" |
| 28 | #include "dvbstreamdata.h" |
28 | 29 | #include "eithelper.h" |
29 | 30 | #include "tv_rec.h" |
30 | 31 | |
… |
… |
|
161 | 162 | data->AddMPEGSPListener(this); |
162 | 163 | data->AddMPEGListener(this); |
163 | 164 | |
| 165 | DVBStreamData *dvb = dynamic_cast<DVBStreamData*>(data); |
| 166 | if (dvb) |
| 167 | dvb->AddDVBMainListener(this); |
| 168 | |
164 | 169 | ATSCStreamData *atsc = dynamic_cast<ATSCStreamData*>(data); |
165 | 170 | |
166 | 171 | if (atsc && atsc->DesiredMinorChannel()) |
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
|
|
|
23 | 23 | class HDHRRecorder : public DTVRecorder, |
24 | 24 | public MPEGStreamListener, |
25 | 25 | public MPEGSingleProgramStreamListener, |
| 26 | public DVBMainStreamListener, |
| 27 | public ATSCMainStreamListener, |
26 | 28 | public TSPacketListener, |
27 | 29 | public TSPacketListenerAV |
28 | 30 | { |
29 | | friend class ATSCStreamData; |
30 | 31 | |
31 | 32 | public: |
32 | 33 | HDHRRecorder(TVRec *rec, HDHRChannel *channel); |
… |
… |
|
59 | 60 | void HandleSingleProgramPAT(ProgramAssociationTable *pat); |
60 | 61 | void HandleSingleProgramPMT(ProgramMapTable *pmt); |
61 | 62 | |
62 | | /* |
63 | 63 | // ATSC |
64 | 64 | void HandleSTT(const SystemTimeTable*) {} |
65 | | void HandleMGT(const MasterGuideTable *mgt); |
| 65 | void HandleMGT(const MasterGuideTable *mgt) {} |
66 | 66 | 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*) {} |
68 | 72 | |
69 | 73 | // TSPacketListenerAV |
70 | 74 | bool ProcessVideoTSPacket(const TSPacket& tspacket); |
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
|
|
|
395 | 395 | QString::number(DVBUtilsImport)); |
396 | 396 | break; |
397 | 397 | case CardUtil::ATSC: |
398 | | case CardUtil::HDHOMERUN: |
399 | 398 | addSelection(tr("Full Scan"), |
400 | 399 | QString::number(FullScan_ATSC), true); |
401 | 400 | addSelection(tr("Import channels.conf"), |
402 | 401 | QString::number(DVBUtilsImport)); |
403 | 402 | 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; |
404 | 413 | case CardUtil::FREEBOX: |
405 | 414 | addSelection(tr("M3U Import"), |
406 | 415 | QString::number(IPTVImport), true); |