Changeset 10849

Timestamp:

10/31/11 18:29:25 (11 years ago)

Author:

nit

Message:

[titan] add channelswitch to epg witch rcok

Location:

titan/titan

Files:

• channelbynr.h (modified) (1 diff)
• channellist.h (modified) (3 diffs)
• epg.h (modified) (2 diffs)
• gmultiepg.h (modified) (6 diffs)
• httpdfunc.h (modified) (2 diffs)
• play.h (modified) (1 diff)
• player.h (modified) (2 diffs)
• scan.h (modified) (1 diff)
• struct.h (modified) (2 diffs)
• titan.c (modified) (2 diffs)

titan/titan/channelbynr.h

@@ -65 +65 @@
                                         tmpstr = ostrcat(tmpstr, "(BOUQUET)-", 0, 0);
                                         tmpstr = ostrcat(tmpstr, mainbouquetnode->name, 1, 0);
-                                        if(status.servicetype == 0)
-                                        {
-                                                free(status.oldchannellist); status.oldchannellist = NULL;
-                                                status.oldchannellist = ostrcat(NULL, getconfig("channellist", NULL), 0, 0);
-                                                addconfig("channellist", tmpstr);
-                                        }
-                                        else
-                                        {
-                                                free(status.oldrchannellist); status.oldrchannellist = NULL;
-                                                status.oldchannellist = ostrcat(NULL, getconfig("rchannellist", NULL), 0, 0);
-                                                addconfig("rchannellist", tmpstr);
-                                        }
-                                        free(tmpstr); tmpstr = NULL;
                                 }
 
-                                ret = servicestart(bouquetnode->channel, NULL, 0);
+                                ret = servicestart(bouquetnode->channel, tmpstr, NULL, 0);
                                 servicecheckret(ret, 0);
+                                free(tmpstr); tmpstr = NULL;
                         }
                         break;

titan/titan/channellist.h

@@ -345 +345 @@
         struct skin* tmpskin;
         int rcret, ret, listmode, newmodus, list;
-        char* tmpstr, *tmpstr1;
-        void* movesel, *aktlist;
+        char* tmpstr = NULL, *tmpstr1 = NULL;
+        void* movesel = NULL, *aktlist = NULL;
         
         status.channelswitch = 1;
@@ -802 +802 @@
                                         break;
                                 }
-                                char* oldchannellist = NULL;
-                                if(status.servicetype == 0)
-                                        oldchannellist = ostrcat(NULL, getconfignotmp("channellist", NULL), 0, 0);
-                                else
-                                        oldchannellist = ostrcat(NULL, getconfignotmp("rchannellist", NULL), 0, 0);
 
                                 clearscreen(channellist);
                                 drawscreen(skin, 0);
-                                ret = servicestart((struct channel*)listbox->select->handle, NULL, 0);
-                                if(ret == 20 || ret == 21 || ret == 22)
-                                        free(oldchannellist);
+                                if(status.servicetype == 0)
+                                        ret = servicestart((struct channel*)listbox->select->handle, getconfig("channellist", NULL), NULL, 0);
                                 else
-                                {
-                                        writeconfigtmp();
-                                        free(status.oldchannellist);
-                                        status.oldchannellist = oldchannellist;
-                                }
-
+                                        ret = servicestart((struct channel*)listbox->select->handle, getconfig("rchannellist", NULL), NULL, 0);
                                 servicecheckret(ret, 0);
                                 break;
@@ -1109 +1098 @@
         delmarkedscreennodes(channellist, 2);
         delownerrc(channellist);
-        delconfigtmpall();
+        delconfigtmp("channellist");
+        delconfigtmp("rchannellist");
         clearscreen(channellist);
         if(newmodus == 1) goto start;

titan/titan/epg.h

@@ -105 +105 @@
                 status.screencalc = 0;
                 if((rcret == getrcconfigint("rcexit", NULL)) || (rcret == getrcconfigint("rcepg", NULL))) break;
-                if(rcret == getrcconfigint("rcok", NULL)) break;
                 if(rcret == getrcconfigint("rcinfo", NULL)) break;
+                if(rcret == getrcconfigint("rcok", NULL))
+                {
+                        servicecheckret(servicestart(chnode, NULL, NULL, 0), 0);
+                        break;
+                }
                 if(epgscreenconf == 1 && rcret == getrcconfigint("rcred", NULL))
                 {
@@ -259 +263 @@
                 rcret = waitrc(screenepg, 0, 0);
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
-                if(rcret == getrcconfigint("rcok", NULL)) break;
                 if(rcret == getrcconfigint("rcinfo", NULL)) break;
+                if(rcret == getrcconfigint("rcok", NULL))
+                {
+                        servicecheckret(servicestart(chnode, NULL, NULL, 0), 0);
+                        break;
+                }
                 if(rcret == getrcconfigint("rcright", NULL))
                 {

titan/titan/gmultiepg.h

@@ -68 +68 @@
         while(node != NULL)
         {
+                if(node->deaktivcol > -1)
+                {
+                        node = node->next;
+                        continue;
+                }
                 if(chnode == (struct channel*)node->handle)
                         return 0;
@@ -81 +86 @@
 int calcgmultiepg(struct channel* tmpchannel, struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int zoom, time_t akttime, struct channel* aktchannel, int linecol1, int linecol2, int* aktline, struct skin** pchnode, struct skin** pchnode1, int height)
 {
-        int treffer = 0, gridbr = 0, aktcol = 0;
+        int treffer = 0, gridbr = 0, aktcol = 0, nottuneable = 0;
         struct epg* epgnode = NULL;
         struct skin* chnode = NULL, *chnode1 = NULL;
@@ -87 +92 @@
         if(tmpchannel != NULL && tmpchannel->servicetype == status.servicetype)
         {
+                if(channelnottunable(tmpchannel) == 1) nottuneable = 1;
                 *pchnode = addlistbox(gmultiepg, channellistbox, *pchnode, 1);
                 chnode = *pchnode;
@@ -141 +147 @@
                                         chnode1->vspace = 2;
                                         chnode1->hspace = 2;
+                                        if(nottuneable == 1)
+                                                chnode1->deaktivcol = convertcol("deaktivcol");
                                         
                                         //TODO: record timeline
@@ -172 +180 @@
 
                         chnode->handle = (char*)tmpchannel;
-                        if(tmpchannel->transponder == NULL)
+                        if(nottuneable == 1)
                                 chnode->deaktivcol = convertcol("deaktivcol");
                 }
@@ -469 +477 @@
 
                 if((rcret == getrcconfigint("rcexit", NULL)) || (rcret == getrcconfigint("rcepg", NULL))) break;
-                if(rcret == getrcconfigint("rcok", NULL)) break;
                 if(rcret == getrcconfigint("rcinfo", NULL)) break;
+                if(rcret == getrcconfigint("rcok", NULL))
+                {
+                        servicecheckret(servicestart((struct channel*)listbox->select->handle, NULL, NULL, 0), 0);
+                        break;
+                }
                 
                 if(epgscreenconf == 3 && rcret == getrcconfigint("rcred", NULL))

titan/titan/httpdfunc.h

@@ -677 +677 @@
         char* param1 = NULL, *param2 = NULL;
         struct channel* chnode = NULL;
-        int tmpservicetype = status.servicetype;
 
         if(param == NULL) goto end;
@@ -698 +697 @@
                 ret = channelnottunable(chnode);
                 if(ret == 0)
-                {
-                        status.servicetype = chnode->servicetype;
-                        ret = servicestart(chnode, NULL, 0);
-                        if(ret != 20 && ret != 21 && ret != 22)
-                        {
-                                if(status.servicetype == 0)
-                                {
-                                        free(status.oldchannellist); status.oldchannellist = NULL;
-                                        status.oldchannellist = ostrcat(NULL, getconfig("channellist", NULL), 0, 0);
-                                        addconfig("channellist", param2);
-                                }
-                                else
-                                {
-                                        free(status.oldchannellist); status.oldchannellist = NULL;
-                                        status.oldchannellist = ostrcat(NULL, getconfig("rchannellist", NULL), 0, 0);
-                                        addconfig("rchannellist", param2);
-                                }
-                        }
-                        else
-                                status.servicetype = tmpservicetype;
-                }
+                        ret = servicestart(chnode, param2, NULL, 0);
         }
 

titan/titan/play.h

@@ -577 +577 @@
         }
 
-        servicestart(status.lastservice->channel, NULL, 0);
+        tmpstr = ostrcat(status.lastservice->channellist, NULL, 0, 0);
+        servicecheckret(servicestart(status.lastservice->channel, tmpstr, NULL, 0), 0);
+        free(tmpstr); tmpstr = NULL;
         status.updatevfd = START;
 

titan/titan/player.h

@@ -70 +70 @@
         if(flag == 1)
         {
-                ret = servicestart(chnode, NULL, 2);
+                ret = servicestart(chnode, NULL, NULL, 2);
                 if(ret != 0)
                 {
@@ -91 +91 @@
         if(flag == 0)
         {
-                ret = servicestart(chnode, NULL, 1);
+                ret = servicestart(chnode, NULL, NULL, 1);
                 if(ret != 0)
                 {

titan/titan/scan.h

@@ -1040 +1040 @@
         clearscreen(scan);
         resetsatscan();
-        servicestart(status.lastservice->channel, NULL, 0);
-}
+        tmpstr = ostrcat(status.lastservice->channellist, NULL, 0, 0);
+        servicecheckret(servicestart(status.lastservice->channel, tmpstr, NULL, 0), 0);
+        free(tmpstr); tmpstr = NULL;
+
 
 #endif

titan/titan/struct.h

@@ -717 +717 @@
 {
         int type;
+        char* channellist;
         struct dvbdev *fedev;
         struct dvbdev *dmxaudiodev;
@@ -779 +780 @@
         int picbordersize;
         int titlelinesize;
-        char* oldchannellist;
-        char* oldrchannellist;
         //0 border
         //1 fullbar

titan/titan/titan.c

@@ -237 +237 @@
                 free(status.dnsserver1);
                 free(status.dnsserver2);
-                free(status.oldchannellist);
-                free(status.oldrchannellist);
                 free(status.boxtype);
 
@@ -499 +497 @@
         //tune to channel
         if(status.servicetype == 0)
-                serviceret = servicestart(getchannel(getconfigint("serviceid", NULL), getconfigint("transponderid", NULL)), NULL, 0);
+                serviceret = servicestart(getchannel(getconfigint("serviceid", NULL), getconfigint("transponderid", NULL)), getconfig("channellist", NULL), NULL, 0);
         else
-                serviceret = servicestart(getchannel(getconfigint("rserviceid", NULL), getconfigint("rtransponderid", NULL)), NULL, 0);
+                serviceret = servicestart(getchannel(getconfigint("rserviceid", NULL), getconfigint("rtransponderid", NULL)), getconfig("rchannellist", NULL),  NULL, 0);
 
         ret = readscreen(getconfig("skinfile", NULL), 0, 0);