Changeset 18177
- Timestamp:
- 10/10/12 21:10:58 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/scan.h
r18165 r18177 813 813 while(dvbnode != NULL) 814 814 { 815 if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == FE_QPSK)815 if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1) 816 816 { 817 817 if(ostrcmp(dvbnode->feshortname, tuner) == 0) … … 918 918 { 919 919 //satname 920 tmpstr = ostrcat(tmpstr, _("Sat : "), 1, 0);920 tmpstr = ostrcat(tmpstr, _("Sat/Provider: "), 1, 0); 921 921 tmpstr = ostrcat(tmpstr, scaninfo.satname, 1, 0); 922 922 changetext(satname, tmpstr); … … 1029 1029 } 1030 1030 1031 void changescantype(char* scantype, struct skin* scan, struct skin* listbox, struct skin* tuner, struct skin* satellite, struct skin* system, struct skin* frequency, struct skin* inversion, struct skin* symbolrate, struct skin* polarization, struct skin* fec, struct skin* modulation, struct skin* rolloff, struct skin* pilot )1031 void changescantype(char* scantype, struct skin* scan, struct skin* listbox, struct skin* tuner, struct skin* satellite, struct skin* system, struct skin* frequency, struct skin* inversion, struct skin* symbolrate, struct skin* polarization, struct skin* fec, struct skin* modulation, struct skin* rolloff, struct skin* pilot, int flag) 1032 1032 { 1033 1033 struct sat* satnode = sat; … … 1098 1098 satellite->hidden = YES; 1099 1099 } 1100 1101 if(flag == 10) 1102 { 1103 system->hidden = YES; 1104 inversion->hidden = YES; 1105 polarization->hidden = YES; 1106 rolloff->hidden = YES; 1107 pilot->hidden = YES; 1108 satellite->hidden = YES; 1109 } 1100 1110 } 1101 1111 … … 1120 1130 } 1121 1131 1122 //flag 0: manual scan 1132 //flag 0: manual scan DVB-S 1123 1133 //flag 1: auto scan 1134 //flag 10: manual scan DVB-C 1124 1135 void screenscanconfig(int flag) 1125 1136 { 1126 int rcret = 0 ;1137 int rcret = 0, fetype = -1; 1127 1138 unsigned int ifrequency = -1, isymbolrate = -1; 1128 1139 int iscantype = -1, isat = -1; … … 1185 1196 changechoiceboxvalue(pilot, NULL); 1186 1197 1198 if(flag < 10) fetype = FE_QPSK; 1199 if(flag >= 10 && flag < 20) fetype = FE_QAM; 1200 1187 1201 //tuner 1188 1202 while(dvbnode != NULL) 1189 1203 { 1190 if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == FE_QPSK)1204 if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == fetype) 1191 1205 { 1192 1206 treffer = 0; … … 1249 1263 setchoiceboxselection(scantype, "0"); 1250 1264 } 1265 else if(flag == 10) 1266 { 1267 addchoicebox(scantype, "0", _("Single Transponder")); 1268 addchoicebox(scantype, "1", _("Single Provider")); 1269 setchoiceboxselection(scantype, "0"); 1270 } 1251 1271 else 1252 1272 { … … 1255 1275 } 1256 1276 1257 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot );1277 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag); 1258 1278 1259 1279 //sat … … 1423 1443 { 1424 1444 scanchangesat(sat, tpnode, listbox->select->ret); 1425 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot );1445 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag); 1426 1446 drawscreen(scan, 0, 0); 1427 1447 } 1428 1448 if(listbox->select != NULL && ostrcmp(listbox->select->name, "scantype") == 0) 1429 1449 { 1430 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot );1450 changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag); 1431 1451 drawscreen(scan, 0, 0); 1432 1452
Note: See TracChangeset
for help on using the changeset viewer.