Changeset 39803

Timestamp:

01/26/17 17:05:25 (6 years ago)

Author:

gost

Message:

[titan] fix pip long press

Location:

titan/titan

Files:

• infobar.h (modified) (1 diff)
• rc.h (modified) (2 diffs)
• record.h (modified) (2 diffs)

titan/titan/infobar.h

@@ -1117 +1117 @@
                                 printf("---------> %i\n",rcret); 
                                 if(status.recording > 0 && rcret == getrcconfigint("rcpiprec", NULL))
-                                        pipchannel = status.recchnode[1];
+                                {
+                                        for(int i = 0; i < 9; i++)
+                                        {
+                                                if(status.recchnode[i] != NULL)
+                                                {
+                                                        pipchannel = status.recchnode[i];
+                                                        break;
+                                                }
+                                        }
+                                }
                                 else if(rcret == getrcconfigint("rcpiprec", NULL))
                                         textbox(_("Message"), _("no record channel found"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 0, 0);

titan/titan/rc.h

@@ -306 +306 @@
                         {
                                 rcsignal(0);
+#ifdef DREAMBOX
+                                if(longpresscount > 0)
+                                {
+                                        rcdata.code = longpress;
+                                        if(longpresscount > 3) rcdata.code = longpress + 3000;
+                                        ret = rcdata.code;      
+                                        break;
+                                }
+#endif
                                 usleep(10000);
                                 continue;
@@ -317 +326 @@
                                 longpresscount++;
                                 timeout = 0;
+#ifdef DREAMBOX
+                                if(longpresscount == 1)
+                                        rest = 700;
+                                else
+                                        rest = 500;
+#else
                                 rest = 500;
+#endif                                                          
                                 usleep(10000);
                                 continue;

titan/titan/record.h

@@ -333 +333 @@
                 else
                 {
-                        status.recchnode[status.recording] = NULL;
+                        for(int i = 0; i < 9; i++)
+                        {
+                                if(status.recchnode[i] == node->channel)
+                                {
+                                        status.recchnode[i] = NULL;
+                                        break;
+                                }
+                        }                       
                         status.recording--;
                 }
@@ -1414 +1421 @@
         {
                 status.recording++;
-                status.recchnode[status.recording] = chnode;
+                for(int i = 0; i < 9; i++)
+                {
+                        if(status.recchnode[i] == NULL)
+                        {
+                                status.recchnode[i] = chnode;
+                                break;
+                        }
+                }
                 servicenode->recname = ostrcat(filename, NULL, 0, 0);
                 if(VFD_Recordthread == NULL && getconfigint("vfdisplayrecord", NULL) != 0)