Changeset 14611

Timestamp:

03/13/12 02:23:55 (10 years ago)

Author:

nit

Message:

[titan] fix record in standby if tuner volt is off

Location:

titan/titan

Files:

• record.h (modified) (2 diffs)
• service.h (modified) (4 diffs)
• standby.h (modified) (2 diffs)

titan/titan/record.h

@@ -672 +672 @@
                                         else
                                                 servicestart(chnode, NULL, NULL, 0);
+                                        
+                                        if(status.standby > 0) servicestop(status.aktservice, 1, 0);    
+                                        
                                         fenode = fegetfree(tpnode, 2, NULL);
                                         if(fenode == NULL)
@@ -684 +687 @@
 
                 //frontend tune
-                if(fenode != status.aktservice->fedev)
+                if(fenode != status.aktservice->fedev || (status.standby > 0 && getconfigint("standbytuneroff", NULL) == 1))
                 {
                         if(fenode->feinfo->type == FE_QPSK)

titan/titan/service.h

@@ -58 +58 @@
 //flag 2: timeshift
 //flag 3: same as 0 but don't check chnode
+//flag 4: same as 0 but new tuning
+//flag 5: same as 3 but new tuning
 int servicestart(struct channel* chnode, char* channellist, char* pin, int flag)
 {
@@ -70 +72 @@
         int ret = 0, festatus = 1;
         unsigned char *patbuf = NULL;
-        int checkpmt = 0, pincheck = 0, stopflag = 0, ageprotect = 0;
+        int checkpmt = 0, pincheck = 0, stopflag = 0, ageprotect = 0, tune = 0;
         struct epg* epgnode = NULL;
 
         m_lock(&status.servicemutex, 2);
+
+        if(flag == 4 || flag == 5) tune = 1;
+        if(flag == 4) flag == 0;
 
         if(flag == 0 && status.aktservice->type == CHANNEL && status.aktservice->channel != NULL && chnode == status.aktservice->channel)
@@ -80 +85 @@
                 return 20;
         }
-        if(flag == 3) flag = 0;
+        if(flag == 3 || flag == 5) flag = 0;
 
         if(chnode == NULL)
@@ -146 +151 @@
 
                 //frontend tune
-                if(fenode->felasttransponder != tpnode)
+                if(fenode->felasttransponder != tpnode || tune == 1)
                 {
                         if(fenode->feinfo->type == FE_QPSK)

titan/titan/standby.h

@@ -62 +62 @@
                 if(lastrun + 300 < time(NULL) && ostrcmp(loctime, getconfig("epg_refreshtime", NULL)) == 0)
                 {
+                        //TODO: check if volt is off
                         //start epg scanlist
                         lastrun = time(NULL);
@@ -77 +78 @@
         setvfdbrightness(getconfigint("vfdbrightness", NULL));
 
-        if(status.aktservice->fedev != NULL && voltoff == 1)
-        {
-                status.aktservice->fedev->felasttransponder = NULL;
-                status.aktservice->fedev->feaktpolarization = 0;
-                status.aktservice->fedev->feakttransponder = NULL;
-        }
+        tmpstr = ostrcat(status.lastservice->channellist, NULL, 0, 0);
+        if(voltoff == 1)
+                servicestart(status.lastservice->channel, tmpstr, NULL, 4);
+        else
+                servicestart(status.lastservice->channel, tmpstr, NULL, 0);
+        free(tmpstr); tmpstr = NULL;
 
-        tmpstr = ostrcat(status.lastservice->channellist, NULL, 0, 0);
-        servicestart(status.lastservice->channel, tmpstr, NULL, 0);
-        free(tmpstr); tmpstr = NULL;
         subtitlepause(0);
         status.standby = 0;