Changeset 17250

Timestamp:

07/21/12 02:44:47 (12 years ago)

Author:

nit

Message:

[titan] check if record is running an endtime changed

Location:

titan/titan

Files:

• record.h (modified) (2 diffs)
• rectimer.h (modified) (1 diff)
• service.h (modified) (3 diffs)
• struct.h (modified) (1 diff)

titan/titan/record.h

@@ -566 +566 @@
                                 delspezchar(chname, 1);
                         }
-                        moviename = strstrip(rectimernode->name);
-                        delspezchar(moviename, 1);
+                        if(rectimernode != NULL && rectimernode->name != NULL)
+                        {
+                                moviename = strstrip(rectimernode->name);
+                                delspezchar(moviename, 1);
+                        }
                         break;
                 default:
@@ -640 +643 @@
         servicenode->channel = chnode;
         servicenode->transponder = tpnode;
+        if(rectimernode != NULL) servicenode->rectimestamp = rectimernode->timestamp;
 
         if(filefd < 0)

titan/titan/rectimer.h

@@ -1259 +1259 @@
                                 }
                         }
+
+                        //check if record is running and change endtime
+                        char* service tmpservice = getservicebyrectimestamp(node->timestamp);
+                        if(tmpservice != NULL)
+                                tmpservice->recendtime = node->end;
                                 
                         if(newnode == 1 || flag == 1) node->disabled = 0;

titan/titan/service.h

@@ -540 +540 @@
 }
 
+struct service* getservicebyrectimestamp(time_t timestamp)
+{
+        if(timestamp == 0) return NULL;
+
+        m_lock(&status.servicemutex, 2);
+        struct service* snode = service;
+
+        while(snode != NULL)
+        {
+                if(snode->rectimestamp == timestamp)
+                {
+                        m_unlock(&status.servicemutex, 2);
+                        return snode;
+                }
+                snode = snode->next;
+        }
+        m_unlock(&status.servicemutex, 2);
+        return NULL;
+}
+
 struct service* getservicebyservice(struct service* node, int flag)
 {
@@ -553 +573 @@
                 }
                 snode = snode->next;
-
         }
         if(flag == 0) m_unlock(&status.servicemutex, 2);
@@ -574 +593 @@
                 }
                 snode = snode->next;
-
         }
         if(flag == 0) m_unlock(&status.servicemutex, 2);

titan/titan/struct.h

@@ -985 +985 @@
         int recsrcfd;
         time_t recendtime;
+        time_t rectimestamp;
         size_t reclastsync;
         off64_t rectotal;