Changeset 31663

Timestamp:

12/09/14 22:32:56 (8 years ago)

Author:

obi

Message:

fix

Location:

titan/titan

Files:

• global.h (modified) (2 diffs)
• record.h (modified) (5 diffs)
• rectimer.h (modified) (1 diff)

titan/titan/global.h

@@ -6699 +6699 @@
 char* getmoviedev()
 {
-        char* tmpstr = NULL;
-        char* buf = NULL;
+        char* tmpstr = NULL, *buf = NULL;
+
         tmpstr = readfiletomem("/tmp/.moviedev", 1);
         printf("tmpstr: %s\n", tmpstr);
@@ -6718 +6718 @@
         dev = getmoviedev();
         if(dev == NULL)
-        {
                 cmd = ostrcat("ls -al ", getconfig("rec_path", NULL), 0, 0);
-                cmd = ostrcat(cmd, " >/dev/null", 1, 0);
-        }
         else
                 cmd = ostrcat("sdparm -C START /dev/", dev, 0, 0);
 
+//      cmd = ostrcat(cmd, " >/dev/null", 1, 0);
         printf("cmd: %s\n", cmd);
         system(cmd);

titan/titan/record.h

@@ -889 +889 @@
         struct transponder* tpnode = NULL;
         int input = DMX_IN_FRONTEND;
+
+        wakeup_record_device();
 
         if(chnode == NULL && filefd < 0)
@@ -1439 +1441 @@
         struct stimerthread *recthumbfirstthread = NULL;
 
-        struct skin* load = getscreen("loading");
-        drawscreen(load, 0, 0);
-        wakeup_record_device();
-        clearscreen(load);
-        
         while(servicenode != NULL)
         {
@@ -1513 +1510 @@
                 if(ostrcmp(mbox->name, _("add recording (stop after current event)")) == 0)
                 {
-                        wakeup_record_device();
                         epgnode = getepgbytime(status.aktservice->channel, time(NULL) + 60);
 #ifndef SIMULATE
@@ -1527 +1523 @@
                 if(ostrcmp(mbox->name, _("add recording (indefinitely)")) == 0)
                 {
-                        wakeup_record_device();
                         ret = recordstart(status.aktservice->channel, -1, 0, RECDIRECT, 0, NULL);
                         newstart = 1;
@@ -1537 +1532 @@
                         if(ret1 > 0)
                         {
-                                wakeup_record_device();
                                 ret = recordstart(status.aktservice->channel, -1, 0, RECDIRECT, time(NULL) + (ret1 * 60), NULL);
                                 newstart = 1;

titan/titan/rectimer.h

@@ -539 +539 @@
                         else
                         {
-printf("########################################\n");
-printf("sdparm -C START /dev/sda\n");
-system("sdparm -C START /dev/sda");
-printf("########################################\n");
-
-                                char* moviedev = getmoviedev();
-                                if(moviedev != NULL)
-                                        hddwakeup(moviedev);
-                                free(moviedev), moviedev = NULL;
-                                 
-                                //workaround for standby recording
-                                char* cmd = NULL;
-                                cmd = ostrcat("ls -al ", getconfig("rec_path", NULL), 0, 0);
-//                              cmd = ostrcat(cmd, " >/dev/null", 1, 0);
-                                printf("cmd: %s\n", cmd);
-                                system(cmd);
-                                free(cmd), cmd = NULL;
-printf("########################################\n");
-/*
-                                sleep(5);
-                                cmd = NULL;
-                                cmd = ostrcat("ls -al ", getconfig("rec_path", NULL), 0, 0);
-//                              cmd = ostrcat(cmd, " >/dev/null", 1, 0);
-                                printf("cmd: %s\n", cmd);
-                                system(cmd);
-                                free(cmd), cmd = NULL;
-
-
-printf("########################################\n");
-
-printf("fdisk -l\n");
-system("fdisk -l");
-printf("########################################\n");
-
-printf("ls -al /media/\n");
-system("ls -al /media/");
-printf("########################################\n");
-
-printf("ls -al /media/hdd/\n");
-system("ls -al /media/hdd/");
-printf("########################################\n");
-
-printf("ls -al /media/hdd/movie/\n");
-system("ls -al /media/hdd/movie/");
-printf("########################################\n");
-
-printf("fdisk -l\n");
-system("fdisk -l");
-printf("########################################\n");
-
-printf("ls -al /media/\n");
-system("ls -al /media/");
-printf("########################################\n");
-
-printf("ls -al /media/hdd/\n");
-system("ls -al /media/hdd/");
-printf("########################################\n");
-
-printf("ls -al /media/hdd/movie/\n");
-system("ls -al /media/hdd/movie/");
-printf("########################################\n");
-
-printf("ls -al /media/autofs/\n");
-system("ls -al /media/autofs/");
-printf("########################################\n");
-
-printf("ls -al /media/autofs/sda1/\n");
-system("ls -al /media/autofs/sda1/");
-printf("########################################\n");
-*/
-                                // workaround end       
                                 ret = recordstart(chnode, -1, 0, RECTIMER, node->end, node);
                                 if(ret == 14) ret = 0;