Changeset 34931

Timestamp:

07/28/15 16:27:53 (9 years ago)

Author:

gost

Message:

test... set record.h to 34847

File:

• titan/titan/record.h (modified) (14 diffs)

titan/titan/record.h

@@ -84 +84 @@
                                 tmpstr = ostrcat(_("No space left on device"), NULL, 0, 0);
                                 break;
-                        case 18:
-                                tmpstr = ostrcat(_("No free encoder"), NULL, 0, 0);
-                                break;
-                        case 19:
-                                tmpstr = ostrcat(_("Can't open VIDEO device"), NULL, 0, 0);
-                                break;
-                        case 20:
-                                tmpstr = ostrcat(_("Can't open AUDIO device"), NULL, 0, 0);
-                                break;
                 }
                 if(tmpstr != NULL)
@@ -326 +317 @@
                         }
                         encoderclose(node->encoderdev, -1);
-                        printf("---- encoder closed\n");
                 }
 #endif
@@ -680 +670 @@
                                                 {
                                                         if(buf[i] == 0x47)
-                                                        {
                                                                 buf[i+3] = buf[i+3] & 0x3f;
-                                                                i = i + 188;
-                                                        }
-/*                                                      else
-                                                        {
-                                                                while(i < readret-1)
-                                                                {
-                                                                        i = i + 1;
-                                                                        if(buf[i] == 0x47)
-                                                                        {
-                                                                                buf[i+3] = buf[i+3] & 0x3f;
-                                                                                i = i + 188;
-                                                                                break;
-                                                                        }
-                                                                }       
-                                                        }*/
+                                                        i = i + 188;
                                                 }
                                         }
@@ -733 +708 @@
                                         }*/
 //Workaround scrambled Bits
-
 #ifndef MIPSEL
                                         if(servicenode->type == RECORDPLAY)
@@ -757 +731 @@
                                                                         i = i + 188;
                                                                 }
-/*                                                              else
+                                                                else
                                                                 {
                                                                         while(i < readret-1)
@@ -769 +743 @@
                                                                                 }
                                                                         }       
-                                                                }*/
+                                                                }
                                                         }
                                                 }
@@ -966 +940 @@
         tmpstr = ostrcat(tmpstr, buf1, 1, 1);
         tmpstr = ostrcat(tmpstr, ")", 1, 0);
-        if(ostrcmp(channelname, "HDMIIN") == 0)
-                tmpstr = ostrcat(tmpstr, ".mpeg", 1, 0);
-        else
-                tmpstr = ostrcat(tmpstr, ".ts", 1, 0);
+        tmpstr = ostrcat(tmpstr, ".ts", 1, 0);
 
         return tmpstr;
@@ -1000 +971 @@
         }
 
-        //hdmi record.. serviceid=65535
-        if(filefd < 0 && chnode->serviceid != 65535)
+        if(filefd < 0)
         {
                 tpnode = chnode->transponder;
@@ -1010 +980 @@
                 }
         }
-        
 
         switch(type)
@@ -1022 +991 @@
                         fd = recordfd;
                         break;
-                case RECSTREAMENC:
+                                case RECSTREAMENC:
                         servicetype = RECORDSTREAM;
                         fd = recordfd;
@@ -1141 +1110 @@
         if(rectimernode != NULL) servicenode->rectimestamp = ostrcat(rectimernode->timestamp, NULL, 0, 0);
 
-        if(filefd < 0 && chnode->serviceid != 65535)
+        if(filefd < 0)
         {
                 //got frontend dev
@@ -1353 +1322 @@
                 }
         }
-#ifdef MIPSEL
-        else if(chnode->serviceid == 65535)
-        {
-                encoderset(-1, 1, 1024*1024*8, 1280, 720, 25000, 0, 0);
-                encnode = encoderopen(0);
-                if(encnode == NULL)
-                {
-                        ret = 18;
-                        goto end;
-                }
-                servicenode->encoderdev = encnode;
-                
-                videonode = videoopen(0, encnode->decoder);
-                if(videonode == NULL)
-                {
-                        ret = 19;
-                        goto end;
-                }               
-                servicenode->videodev = videonode;
-                videoselectsource(servicenode->videodev, VIDEO_SOURCE_HDMI);
-                videoplay(servicenode->videodev);
-
-                audionode = audioopen(encnode->decoder);
-                if(audionode == NULL)
-                {
-                        ret = 20;
-                        videostop(servicenode->videodev, 1);
-                        videoclose(servicenode->videodev, -1);
-                        goto end;
-                } 
-                servicenode->audiodev = audionode;
-                audioselectsource(servicenode->audiodev, AUDIO_SOURCE_HDMI);
-                audioplay(servicenode->audiodev);
-
-                encnode->fd = encoderopendirect(encnode->dev);
-                servicenode->recdmxstart = 1;
-                servicenode->recsrcfd = encnode->fd;
-        }
-#endif
-                
+
         if(rectimernode != NULL)
                 rectimernode->servicenode = servicenode;
@@ -1430 +1360 @@
                 if(VFD_Recordthread == NULL && getconfigint("vfdisplayrecord", NULL) != 0)
                         VFD_Recordthread = addtimer(&vfdrecordthread, START, 10000, 1, NULL, NULL, NULL);
-#ifdef MIPSEL
-                if(chnode->serviceid == 65535)
-                        servicenode->recsrcfd = encnode->fd;
-#endif
         }
 
@@ -1657 +1583 @@
                 servicenode = servicenode->next;
         }
-        //65535 gleich HDMIIN
-        if(status.aktservice->channel->serviceid != 65535)
-                addmenulist(&mlist, _("add recording (stop after current event)"), NULL, NULL, 0, 0);
+
+        addmenulist(&mlist, _("add recording (stop after current event)"), NULL, NULL, 0, 0);
         addmenulist(&mlist, _("add recording (indefinitely)"), NULL, NULL, 0, 0);
         addmenulist(&mlist, _("add recording (enter duration)"), NULL, NULL, 0, 0);