Changeset 10840

Timestamp:

10/31/11 05:48:13 (11 years ago)

Author:

nit

Message:

[titan] change servicetype on switch to radiochannel (webif)

Location:

titan/titan

Files:

• httpdfunc.h (modified) (3 diffs)
• struct.h (modified) (1 diff)

titan/titan/httpdfunc.h

@@ -672 +672 @@
 char* webswitch(char* param)
 {
+        if(status.channelswitch == 1) goto end;
+
         int ret = 0;
         char* param1 = NULL, *param2 = NULL;
         struct channel* chnode = NULL;
-
-        if(param == NULL) return NULL;
+        int tmpservicetype = status.servicetype;
+
+        if(param == NULL) goto end;
 
         //create param1
@@ -688 +691 @@
         }
 
-        if(param1 == NULL) return NULL;
+        if(param1 == NULL && param2 == NULL) goto end;
 
         chnode = getchannel(atoi(param), atoi(param1));
@@ -695 +698 @@
                 ret = channelnottunable(chnode);
                 if(ret == 0)
+                {
+                        status.servicetype = chnode->servicetype;
                         ret = servicestart(chnode, NULL, 0);
+                        if(ret != 20 && ret != 21 && ret != 22)
                         {
-                                if(param2 != NULL && 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;
+                }
+        }
+
+end:
         return webgetaktservice();
 }

titan/titan/struct.h

@@ -766 +766 @@
 struct status
 {
+        //set to 1 if channellist or channelnr open
+        int channelswitch;
         //deaktivates child protect if greater then akttime
         time_t protecttime;