Changeset 19339

Timestamp:

12/28/12 13:55:36 (11 years ago)

Author:

nit

Message:

[titan] update extended epg

Location:

titan

Files:

• settings/extepg (modified) (1 diff)
• titan/extepg.h (modified) (10 diffs)
• titan/struct.h (modified) (1 diff)

titan/settings/extepg

@@ -1 @@
-#transponderid#type#channelpid#titlepid#summarypid#file
+#transponderid#type#file#channelpid#titlepid1#titlepid2#titlepid3#titlepid4#titlepid5#titlepid6#titlepid7#titlepid8#summarypid1#summarypid2#summarypid3#summarypid4#summarypid5#summarypid6#summarypid7#summarypid8
 #transponderid 0=all transponder
 
 #mhw
-0#0#-#211#210#211
+0#0#-#211#210#-1#-1#-1#-1#-1#-1#-1#211#-1#-1#-1#-1#-1#-1#-1
 
 #mhw2
-0#1#-#561#564#566
+0#1#-#561#564#-1#-1#-1#-1#-1#-1#-1#566#-1#-1#-1#-1#-1#-1#-1
 
 #skyit 13.2
-4227802696#2#/var/etc/titan/skyit.dict#17#48#64
+4227802696#2#/var/etc/titan/skyit.dict#17#48#49#50#51#52#53#54#55#64#65#66#67#68#69#70#71
 
 #skyuk 28.2
-133076#2#/var/etc/titan/skyuk.dict#17#48#64
+133076#2#/var/etc/titan/skyuk.dict#17#48#49#50#51#52#53#54#55#64#65#66#67#68#69#70#71
 
 #skyuk 28.4
-133076#2#/var/etc/titan/skyuk.dict#17#48#64
+133076#2#/var/etc/titan/skyuk.dict#17#48#49#50#51#52#53#54#55#64#65#66#67#68#69#70#71

titan/titan/extepg.h

@@ -662 +662 @@
         }
 
-        ret = sscanf(line, "%llu#%d#%[^#]#%d#%d#%d", &newnode->transponderid, &newnode->type, file, &newnode->channelpid, &newnode->titlepid, &newnode->summarypid);
-        if(ret != 6)
+        ret = sscanf(line, "%llu#%d#%[^#]#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d", &newnode->transponderid, &newnode->type, file, &newnode->channelpid, \
+                &newnode->titlepid[0], &newnode->titlepid[1], &newnode->titlepid[2], &newnode->titlepid[3], \
+                &newnode->titlepid[4], &newnode->titlepid[5], &newnode->titlepid[6], &newnode->titlepid[7], \
+                &newnode->summarypid[0], &newnode->summarypid[1], &newnode->summarypid[2], &newnode->summarypid[3], \
+                &newnode->summarypid[4], &newnode->summarypid[5], &newnode->summarypid[6], &newnode->summarypid[7]);
+        if(ret != 20)
         {
                 if(count > 0)
@@ -1213 +1217 @@
 int readmhw(struct stimerthread* self, struct channel* chnode, struct dvbdev* fenode, int flag)
 {
-        int ret = 0, channelcount = 0;
+        int ret = 0, channelcount = 0, i = 0;
         unsigned char* channelbuf = NULL;
         struct extepgconfig* extepgconfignode = NULL;
@@ -1253 +1257 @@
         }
 
-        ret = readmhwtitle(self, fenode, chnode, channelbuf, channelcount, extepgconfignode->titlepid, flag);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readmhwtitle(self, fenode, chnode, channelbuf, channelcount, extepgconfignode->titlepid[i], flag);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {
@@ -1261 +1272 @@
         }
 
-        ret = readmhwsummary(self, fenode, extepgconfignode->summarypid);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readmhwsummary(self, fenode, extepgconfignode->summarypid[i]);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {
@@ -1702 +1720 @@
 int readmhw2(struct stimerthread* self, struct channel* chnode, struct dvbdev* fenode, int flag)
 {
-        int ret = 0;
+        int ret = 0, i = 0;
         unsigned char* channelbuf = NULL;
         struct extepgconfig* extepgconfignode = NULL;
@@ -1742 +1760 @@
         }
 
-        ret = readmhw2title(self, fenode, chnode, channelbuf, extepgconfignode->titlepid, flag);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readmhw2title(self, fenode, chnode, channelbuf, extepgconfignode->titlepid[i], flag);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {
@@ -1750 +1775 @@
         }
 
-        ret = readmhw2summary(self, fenode, extepgconfignode->summarypid);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readmhw2summary(self, fenode, extepgconfignode->summarypid[i]);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {
@@ -2262 +2294 @@
 int readopentv(struct stimerthread* self, struct channel* chnode, struct dvbdev* fenode, int flag)
 {
-        int ret = 0;
+        int ret = 0, i = 0;
         unsigned char* channelbuf = NULL;
         struct extepgconfig* extepgconfignode = NULL;
@@ -2309 +2341 @@
         }
 
-        ret = readopentvtitle(self, fenode, chnode, channelbuf, extepgconfignode->titlepid, flag);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readopentvtitle(self, fenode, chnode, channelbuf, extepgconfignode->titlepid[i], flag);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {
@@ -2317 +2356 @@
         }
 
-        ret = readopentvsummary(self, fenode, extepgconfignode->summarypid);
+        ret = 1;
+        for(i = 0; i < 8; i++)
+        {
+                if(i < 0) continue;
+                if(self->aktion == STOP || self->aktion == PAUSE) break;
+                int tmpret = readopentvsummary(self, fenode, extepgconfignode->summarypid[i]);
+                if(tmpret == 0) ret = 0;
+        }
         if(ret != 0 || self->aktion == STOP || self->aktion == PAUSE)
         {

titan/titan/struct.h

@@ -1645 +1645 @@
         char* file;
         int channelpid;
-        int titlepid;
-        int summarypid;
+        int titlepid[8];
+        int summarypid[8];
         struct extepgconfig* next;
 };