Changeset 18177

Timestamp:

10/10/12 21:10:58 (12 years ago)

Author:

nit

Message:

[titan] kabel scan next step

File:

• titan/titan/scan.h (modified) (9 diffs)

titan/titan/scan.h

@@ -813 +813 @@
                 while(dvbnode != NULL)
                 {
-                        if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == FE_QPSK)
+                        if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1)
                         {
                                 if(ostrcmp(dvbnode->feshortname, tuner) == 0)
@@ -918 +918 @@
         {
                 //satname
-                tmpstr = ostrcat(tmpstr, _("Sat: "), 1, 0);
+                tmpstr = ostrcat(tmpstr, _("Sat/Provider: "), 1, 0);
                 tmpstr = ostrcat(tmpstr, scaninfo.satname, 1, 0);
                 changetext(satname, tmpstr);
@@ -1029 +1029 @@
 }
 
-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)
+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)
 {
         struct sat* satnode = sat;
@@ -1098 +1098 @@
                 satellite->hidden = YES;
         }
+
+        if(flag == 10)
+        {
+                system->hidden = YES;
+                inversion->hidden = YES;
+                polarization->hidden = YES;
+                rolloff->hidden = YES;
+                pilot->hidden = YES;
+                satellite->hidden = YES;
+        }
 }
 
@@ -1120 +1130 @@
 }
 
-//flag 0: manual scan
+//flag 0: manual scan DVB-S
 //flag 1: auto scan
+//flag 10: manual scan DVB-C
 void screenscanconfig(int flag)
 {
-        int rcret = 0;
+        int rcret = 0, fetype = -1;
         unsigned int ifrequency = -1, isymbolrate = -1;
         int iscantype = -1, isat = -1;
@@ -1185 +1196 @@
         changechoiceboxvalue(pilot, NULL);
 
+        if(flag < 10) fetype = FE_QPSK;
+        if(flag >= 10 && flag < 20) fetype = FE_QAM;
+
         //tuner
         while(dvbnode != NULL)
         {
-                if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == FE_QPSK)
+                if(dvbnode->type == FRONTENDDEV && dvbnode->feinfo != NULL && dvbnode->felock < 1 && dvbnode->feinfo->type == fetype)
                 {
                         treffer = 0;
@@ -1249 +1263 @@
                 setchoiceboxselection(scantype, "0");
         }
+        else if(flag == 10)
+        {
+                addchoicebox(scantype, "0", _("Single Transponder"));
+                addchoicebox(scantype, "1", _("Single Provider"));
+                setchoiceboxselection(scantype, "0");
+        }
         else
         {
@@ -1255 +1275 @@
         }
 
-        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot);
+        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag);
 
         //sat
@@ -1423 +1443 @@
                 {
                         scanchangesat(sat, tpnode, listbox->select->ret);
-                        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot);
+                        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag);
                         drawscreen(scan, 0, 0);
                 }
                 if(listbox->select != NULL && ostrcmp(listbox->select->name, "scantype") == 0)
                 {
-                        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot);
+                        changescantype(scantype->ret, scan, listbox, tuner, sat, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, flag);
                         drawscreen(scan, 0, 0);