Ticket #7232: channelscan.patch
File channelscan.patch, 4.7 KB (added by , 15 years ago) |
---|
-
libs/libmythtv/dtvconfparserhelpers.h
54 54 55 55 operator int() const { return value; } 56 56 int operator=(int _value) { return value = _value; } 57 bool operator==(const int& v) const { return value == v; }58 bool operator!=(const int& v) const { return value != v; }59 57 60 58 protected: 61 59 static bool ParseParam(const QString &symbol, int &value, … … 73 71 static const DTVParamHelperStruct parseTable[]; 74 72 75 73 public: 76 typedefenum74 enum 77 75 { 78 76 // Modulations which may be supported 79 77 kTunerTypeDVBS1 = 0x00, // QPSK … … 104 102 // reality some hardware does support multiple formats and this should 105 103 // be a mask. Also the transmission schemes used in Asia and South 106 104 // America are not represented here. 107 } my_enum;105 }; 108 106 109 bool operator==(const my_enum& v) const { return value == (int) v; }110 bool operator!=(const my_enum& v) const { return value != (int) v; }111 112 107 DTVTunerType(int _default = kTunerTypeUnknown) 113 : DTVParamHelper(_default) { initStr();}108 : DTVParamHelper(_default) { } 114 109 115 110 bool Parse(const QString &_value) 116 111 { return ParseParam(_value, value, parseTable); } … … 137 132 138 133 QString toString() const { return toString(value); } 139 134 140 static void initStr(void);141 135 static QString toString(int _value); 142 136 }; 143 137 -
libs/libmythtv/channelscan/channelscan_sm.cpp
495 495 496 496 DTVTunerType ChannelScanSM::GuessDTVTunerType(DTVTunerType type) const 497 497 { 498 if (scanDTVTunerType != (int)DTVTunerType::kTunerTypeUnknown)498 if (scanDTVTunerType != DTVTunerType(DTVTunerType::kTunerTypeUnknown)) 499 499 type = scanDTVTunerType; 500 500 501 501 const DTVChannel *chan = GetDTVChannel(); -
libs/libmythtv/dtvconfparserhelpers.cpp
1 1 2 #include <QMutex>3 #include <QMap>4 5 2 #include "mythverbose.h" 6 3 #include "dtvconfparserhelpers.h" 7 4 … … 38 35 return strings[index]; 39 36 } 40 37 41 static QMutex dtv_tt_canonical_str_lock;42 static QMap<int,QString> dtv_tt_canonical_str;43 void DTVTunerType::initStr(void)44 {45 QMutexLocker locker(&dtv_tt_canonical_str_lock);46 dtv_tt_canonical_str[kTunerTypeATSC] = "ATSC";47 dtv_tt_canonical_str[kTunerTypeDVBT] = "OFDM";48 dtv_tt_canonical_str[kTunerTypeDVBC] = "QAM";49 dtv_tt_canonical_str[kTunerTypeDVBS1] = "QPSK";50 dtv_tt_canonical_str[kTunerTypeDVBS2] = "DVB_S2";51 dtv_tt_canonical_str[kTunerTypeUnknown] = "UNKNOWN";52 }53 54 38 QString DTVTunerType::toString(int _value) 55 39 { 56 QMutexLocker locker(&dtv_tt_canonical_str_lock); 57 QMap<int,QString>::const_iterator it = dtv_tt_canonical_str.find(_value); 58 if (it != dtv_tt_canonical_str.end()) 59 return *it; 60 return dtv_tt_canonical_str[kTunerTypeUnknown]; 40 switch (_value){ 41 case kTunerTypeATSC: return "ATSC"; 42 case kTunerTypeDVBT: return "OFDM"; 43 case kTunerTypeDVBC: return "QAM"; 44 case kTunerTypeDVBS1: return "QPSK"; 45 case kTunerTypeDVBS2: return "DVB_S2"; 46 default: return "UNKNOWN"; 47 } 61 48 } 62 49 63 50 const DTVParamHelperStruct DTVTunerType::parseTable[] = -
libs/libmythtv/scanwizard.cpp
148 148 149 149 // Just verify what we get from the UI... 150 150 DTVMultiplex tuning; 151 if ((parse_type != DTVTunerType ::kTunerTypeUnknown) &&151 if ((parse_type != DTVTunerType(DTVTunerType::kTunerTypeUnknown)) && 152 152 !tuning.ParseTuningParams( 153 153 parse_type, 154 154 start_chan["frequency"], start_chan["inversion"], -
libs/libmythtv/dtvchannel.cpp
158 158 vector<DTVTunerType> DTVChannel::GetTunerTypes(void) const 159 159 { 160 160 vector<DTVTunerType> tts; 161 if (tunerType != DTVTunerType ::kTunerTypeUnknown)161 if (tunerType != DTVTunerType(DTVTunerType::kTunerTypeUnknown)) 162 162 tts.push_back(tunerType); 163 163 return tts; 164 164 }