Changeset 14280

Timestamp:

02/24/12 18:40:13 (10 years ago)

Author:

nit

Message:

[titan] fixtime poweroff (if rec is running, don't stop box, increase timer and check again every 15 min

Location:

titan/titan

Files:

• powerofftimer.h (modified) (2 diffs)
• titan.c (modified) (2 diffs)

titan/titan/powerofftimer.h

@@ -30 +30 @@
 void checkshutdowntimer()
 {
+        int mode = 0;
         if(status.standby != 0) return;
 
@@ -37 +38 @@
         time_t akttime = time(NULL);
 
-        if((status.sd_timer != NULL && status.sd_timer->active && status.sd_timer->shutdown_time < akttime) || (status.fixpowerofftime > 1 && status.fixpowerofftime > akttime - 180 && status.fixpowerofftime < akttime))
+        if(status.sd_timer != NULL && status.sd_timer->active && status.sd_timer->shutdown_time < akttime)
+                mode = 1;
+                
+        if(status.fixpowerofftime > 1 && status.fixpowerofftime > akttime - 180 && status.fixpowerofftime < akttime)
+                mode = 2;
+                
+        if(mode > 0)
         {
-                status.fixpowerofftime += 86400;
+                if(status.fixpowerofftime > 1) status.fixpowerofftime += 86400;
                 status.sd_timer->active = 0;
                 if(getconfigint("shutdowntimetype", NULL) == 0)
-                        oshutdown(1, 3); 
+                {
+                        if(mode == 2)
+                        {
+                                mode = 0;
+                                oshutdown(1, 4);
+                        }
+                        else
+                        {
+                                mode = 0;
+                                oshutdown(1, 3);
+                        } 
+                }
                 else
                 {
+                        mode = 0;
                         status.standby = 2;
                         screenstandby();

titan/titan/titan.c

@@ -192 +192 @@
 //flag: 2 check record / do write config
 //flag: 3 check record with timeout
+//flag: 4 check record with increase fixpowerofftime
 void oshutdown(int exitcode, int flag)
 {
@@ -202 +203 @@
 
         //check if record running
-        if((flag == 1 || flag == 2 || flag == 3) && (status.recording > 0 || getrectimerbytimediff(300) != NULL))
-        {
+        if((flag == 1 || flag == 2 || flag == 3 || flag == 4) && (status.recording > 0 || getrectimerbytimediff(300) != NULL))
+        {
+                if(flag == 4 && status.fixpowerofftime > 1)
+                {
+                                status.fixpowerofftime = time(NULL) + 900; //check powerofftimer again in 15min
+                                return;
+                }
                 int timeout = 0;
-                if(flag == 3) timeout = 15;
+                if(flag == 3 || flag == 4) timeout = 15;
                 if(textbox(_("Message"), _("Found running record\nor record is starting in next time.\nRealy shutdown ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, timeout, 1) == 2)
                         return;