Changeset 41154 for titan

Timestamp:

11/09/17 19:57:07 (6 years ago)

Author:

gost

Message:

[titan] restore 41151

File:

• titan/titan/frontenddev.h (modified) (5 diffs)

titan/titan/frontenddev.h

@@ -332 +332 @@
                         if(getconfig(dvbnode->feshortname, NULL) != NULL)
                         {
-                                if(flag != 1) printf("-----xx %s no main tuner... exit\n", dvbnode->feshortname);
                                 dvbnode = dvbnode->next;
                                 continue;                               
@@ -383 +382 @@
                                                 band = calclof(dvbnode, tpnode, aktnr, 1);
                                         found = 0;
-                                        if(dvbnode->feaktband != band)
+                                        if(tmpdvbnode != NULL && tmpdvbnode->feaktband != band)
                                         {
-                                                if(flag != 1) printf("-----xx %s band not ok... exit\n", tmpdvbnode->feshortname);
                                                 found = -1;
                                                 break;
@@ -396 +394 @@
                                                 return tmpdvbnode;
                                         }
-                                        //dvbnode->feaktband = band;
-                                        //dvbnode->feaktpolarization = tpnode->polarization;
-                                        if(tmpdvbnode->feakttransponder != NULL)
-                                                tmpdvbnode->felasttransponder = tmpdvbnode->feakttransponder;
+                                        dvbnode->feaktband = band;
+                                        dvbnode->feaktpolarization = tpnode->polarization;
+                
+                                        tmpdvbnode->felasttransponder = tmpdvbnode->feakttransponder;
                                         tmpdvbnode->feakttransponder = tpnode;
                                         tmpdvbnode->feaktpolarization = tpnode->polarization;
-                                        tmpdvbnode->feaktband = band;
                                         free(tmpdvbnode->feaktnr);
                                         if(aktnr != NULL)
@@ -465 +462 @@
                                 if(tmpdvbnode != NULL && tmpdvbnode->feakttransponder != NULL && (tmpdvbnode->feaktpolarization != tpnode->polarization || tmpdvbnode->feakttransponder->orbitalpos != tpnode->orbitalpos) && (tmpdvbnode->felock != 0 || (flag == 2 && tmpdvbnode->felock == 0)))
                                 {
-                                        if(flag != 1) printf("-----yy %s not equal... exit\n", tmpdvbnode->feshortname);
                                         found = -1;
                                         break;
@@ -499 +495 @@
                                         {
                                                 //if(flag != 1) printf("++++++ test band1 %s\n", CharPtrTmp[found]->feshortname);
-                                                if(CharPtrTmp[found]->feakttransponder != NULL)
+                                                if(CharPtrTmp[found] != NULL && CharPtrTmp[found]->feaktband != band && (CharPtrTmp[found]->felock != 0 || (flag == 2 && CharPtrTmp[found]->felock == 0)))
                                                 {
-                                                        if(CharPtrTmp[found] != NULL && CharPtrTmp[found]->feaktband != band && (CharPtrTmp[found]->felock != 0 || (flag == 2 && CharPtrTmp[found]->felock == 0)))
-                                                        {
-                                                                if(flag != 1) printf("-----yy %s band not ok... exit\n", tmpdvbnode->feshortname);
-                                                                found = 99;
-                                                                break;
-                                                        }
-                                                        found = found + 1;
+                                                        found = 99;
+                                                        break;
                                                 }
+                                                found = found + 1;
                                         }
                                                 //if(tmpdvbnode != NULL && tmpdvbnode->feaktband != band && (tmpdvbnode->felock != 0 || (flag == 2 && tmpdvbnode->felock == 0)))