Changeset 24042

Timestamp:

10/03/13 16:03:03 (10 years ago)

Author:

nit

Message:

[titan] fix

File:

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

titan/titan/scan.h

@@ -199 +199 @@
                         break;
         }
-
-        if(frequency > 1000000) frequency /= 1000;
-
-        frequency = (int)1000 * (int)round((double)frequency / (double)1000);
 
         id = ((onid << 16) | transportid) & 0xffffffff;
@@ -1126 +1122 @@
                         {
                                 feset(fenode, tpnode);
-                                fetunedvbs(fenode, tpnode);
+                                if(fetunedvbs(fenode, tpnode) != 0)
+                                {
+                                        scaninfo.tpcount++;
+                                        tpnode = tpnode->next;
+                                        debug(500, "tuning failed");
+                                        if(scaninfo.scantype == 0) break;
+                                        continue;
+                                }
                         }
                         else if(fenode->feinfo->type == FE_QAM)
-                                fetunedvbc(fenode, tpnode);
+                        {
+                                fetunedvbc(fenode, tpnode) != 0)
+                                {
+                                        scaninfo.tpcount++;
+                                        tpnode = tpnode->next;
+                                        debug(500, "tuning failed");
+                                        if(scaninfo.scantype == 0) break;
+                                        continue;
+                                }
+                        }
                         else if(fenode->feinfo->type == FE_OFDM)
-                                fetunedvbt(fenode, tpnode);
+                        {
+                                if(fetunedvbt(fenode, tpnode) != 0)
+                                {
+                                        scaninfo.tpcount++;
+                                        tpnode = tpnode->next;
+                                        debug(500, "tuning failed");
+                                        if(scaninfo.scantype == 0) break;
+                                        continue;
+                                }
+                        }
                         else
                         {
@@ -1147 +1168 @@
                                 scaninfo.tpcount++;
                                 tpnode = tpnode->next;
-                                debug(500, "tuning failed");
+                                debug(500, "tuning failed last");
                                 if(scaninfo.scantype == 0) break;
                                 continue;