Changeset 26 in svn for trunk/zasc/app_c/DST_BaseWin.c

Timestamp:

Mar 25, 2015 5:12:16 PM (11 years ago)

Author:

megakiss

Message:

금강방송 Except 채널 구현

File:

• trunk/zasc/app_c/DST_BaseWin.c (modified) (4 diffs)

trunk/zasc/app_c/DST_BaseWin.c

@@ -183 +183 @@
                                                 bPSIPTimeOut = true;
                                                 if (nScanCount > 0 && CT_ScanFindChannel() == false) JST_DB_Del(event.data32[1]);
-                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1)
+                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1 - DST_DB_GetExceptRFCount())
                                                 {
                                                         DST_SendWindowEventWithOnlyCmd(WM_POWER_DOWN_ENTER);
                                                         return;
                                                 }
-                                                nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                //nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                nRF = DST_DB_GetNextUnexceptRF(nRF);
                                                 JST_Scan(nRF);
                                                 nScanCount++;
@@ -215 +216 @@
                                                 bLockTimeOut = true;
                                                 if (nScanCount > 0 && CT_ScanFindChannel() == false) JST_DB_Del(event.data32[1]);
-                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1)
+                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1- DST_DB_GetExceptRFCount())
                                                 {
                                                         DST_SendWindowEventWithOnlyCmd(WM_POWER_DOWN_ENTER);
                                                         return;
                                                 }
-                                                nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                //nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                nRF = DST_DB_GetNextUnexceptRF(nRF);
                                                 JST_Scan(nRF);
                                                 nScanCount++;
@@ -229 +231 @@
                                                 if (bPSIPTimeOut || bLockTimeOut || bReceiveTVCT) break;
                                                 bReceiveTVCT = true;
-                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1)
+                                                if (nScanCount > DST_MaxRF() - DST_MinRF()+1- DST_DB_GetExceptRFCount())
                                                 {
                                                         DST_SendWindowEventWithOnlyCmd(WM_POWER_DOWN_ENTER);
                                                         return;
                                                 }
-                                                nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                //nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                                nRF = DST_DB_GetNextUnexceptRF(nRF);
                                                 JST_Scan(nRF);
                                                 nScanCount++;
@@ -262 +265 @@
                                 this->KillTimer(this, 1); // Background ScanÀ» ÁßÁöÇÑ´Ù.
                                 if (DST_g_PowerOn == true) break;
-                                nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                //nRF = (nRF >= DST_MaxRF()) ? DST_MinRF() : nRF+1;
+                                nRF = DST_DB_GetNextUnexceptRF(nRF);
                                 JST_Scan(nRF);
                                 nScanCount++;