Changeset 36275

Timestamp:

11/21/15 16:19:31 (7 years ago)

Author:

obi

Message:

optimize create auto transponder syntax

Location:

titan/titan

Files:

• global.h (modified) (8 diffs)
• menu.h (modified) (1 diff)
• titan.c (modified) (1 diff)

titan/titan/global.h

@@ -6699 +6699 @@
 
 //      free(tmpstr), tmpstr = NULL;
-        if(textbox(_("Message"), _("Transponder/Satellite Convert done, please use channel search on next Boot.\nYour System will reboot !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
-        {       
-                //write only config file
-                system("sync");
-                writeallconfig(3);
-                oshutdown(2,2);
-                system("init 6");
-        }
+        textbox(_("Message"), _("Transponder/Satellite Convert done, please use channel search.\n\nTitan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 800, 200, 0, 0);
+        //sync usb
+        system("sync");
+        //enable autoscan after guirestart
+        addconfig("autoscan", "1");
+        //write only config file
+        writeallconfig(3);
+        //gui restart and write no config
+        oshutdown(3, 2);
 }
 
@@ -6896 +6897 @@
                                 line = ostrcat(line, "#", 1, 0);
 
-// not needed
-//                              if(checkbox("UFS910") == 1)
-//                                      line = ostrcat(line, "1", 1, 0); //pilot
-//                              else
+                                if(checkbox("UFS910") == 1)
+                                        line = ostrcat(line, "1", 1, 0); //pilot
+                                else
                                         line = ostrcat(line, "2", 1, 0); //pilot
                                 line = ostrcat(line, "#", 1, 0);
 
-//                              if(checkbox("UFS910") == 1)
-//                                      line = ostrcat(line, "0", 1, 0); //rolloff
-//                              else
+                                if(checkbox("UFS910") == 1)
+                                        line = ostrcat(line, "0", 1, 0); //rolloff
+                                else
                                         line = ostrcat(line, "3", 1, 0); //rolloff
                                 line = ostrcat(line, "#", 1, 0);
@@ -6955 +6955 @@
 }
 
-void createfav()
-{
-        struct skin* load = getscreen("loading");
-        drawscreen(load, 0, 0);
-
-        system("rm -rf /mnt/settings/bouquets*");
-        system("cp -a /etc/titan.restore/mnt/settings/bouquets* /mnt/settings");
-
-        if(textbox(_("Message"), _("Standard favorites have been successfully applied.\nYour System will reboot !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1000, 200, 0, 0) == 1)
-        {
-                //write only config file
-                system("sync");
-                writeallconfig(3);
-                oshutdown(2,2);
-                system("init 6");
-        }
-}
-
 char* system_infos(int mode)
 {
@@ -7221 +7203 @@
         if(textbox(_("Message"), _("Start Restore Default Bouquets ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
         {
+                struct skin* load = getscreen("loading");
+                drawscreen(load, 0, 0);
+        
                 system("rm -f /mnt/settings/bouquets.* > /dev/null 2>&1");
-                system("cp -a /etc/titan.restore/mnt/settings/bouquets.cfg /mnt/settings/bouquets.cfg > /dev/null 2>&1");
-                system("cp -a /etc/titan.restore/mnt/settings/bouquets.*.tv /mnt/settings > /dev/null 2>&1");
-                system("cp -a /etc/titan.restore/mnt/settings/bouquets.*.radio /mnt/settings > /dev/null 2>&1");
+                system("cp -a /etc/titan.restore/mnt/settings/bouquets* /mnt/settings > /dev/null 2>&1");
+
                 textbox(_("Message"), _("Titan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                oshutdown(3, 0);
+                //sync usb
+                system("sync");
+                //write only config file
+                writeallconfig(3);
+                //gui restart and write no config
+                oshutdown(3, 2);
         }
 }
@@ -7234 +7223 @@
         if(textbox(_("Message"), _("Start Restore Default Channel Settings ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
         {
+                struct skin* load = getscreen("loading");
+                drawscreen(load, 0, 0);
+        
                 system("rm -rf /mnt/settings/* > /dev/null 2>&1");
                 system("cp -a /etc/titan.restore/mnt/settings/* /mnt/settings > /dev/null 2>&1");
+
                 textbox(_("Message"), _("Titan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                oshutdown(3, 0);
+                //sync usb
+                system("sync");
+                //write only config file
+                writeallconfig(3);
+                //gui restart and write no config
+                oshutdown(3, 2);
         }
 }
@@ -7245 +7243 @@
         if(textbox(_("Message"), _("Start Restore Default Providers ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
         {
+                struct skin* load = getscreen("loading");
+                drawscreen(load, 0, 0);
+        
                 system("rm -f /mnt/settings/provider > /dev/null 2>&1");
                 system("cp -a /etc/titan.restore/mnt/settings/provider /mnt/settings > /dev/null 2>&1");
+
                 textbox(_("Message"), _("Titan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                oshutdown(3, 0);
+                //sync usb
+                system("sync");
+                //write only config file
+                writeallconfig(3);
+                //gui restart and write no config
+                oshutdown(3, 2);
         }
 }
@@ -7256 +7263 @@
         if(textbox(_("Message"), _("Start Restore Default Channels ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
         {
+                struct skin* load = getscreen("loading");
+                drawscreen(load, 0, 0);
+        
                 system("rm -f /mnt/settings/channel > /dev/null 2>&1");
                 system("cp -a /etc/titan.restore/mnt/settings/channel /mnt/settings > /dev/null 2>&1");
+
                 textbox(_("Message"), _("Titan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                oshutdown(3, 0);
+                //sync usb
+                system("sync");
+                //write only config file
+                writeallconfig(3);
+                //gui restart and write no config
+                oshutdown(3, 2);
         }
 }
@@ -7267 +7283 @@
         if(textbox(_("Message"), _("Start Restore Default Sats ?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
         {
+                struct skin* load = getscreen("loading");
+                drawscreen(load, 0, 0);
+        
                 system("rm -f /mnt/settings/satellites > /dev/null 2>&1");
                 system("cp -a /etc/titan.restore/mnt/settings/satellites /mnt/settings > /dev/null 2>&1");
+
                 textbox(_("Message"), _("Titan will be restarted!"), _("OK"), getrcconfigint("rcok", NULL), NULL, 0, NULL, 0, NULL, 0, 600, 200, 0, 0);
-                oshutdown(3, 0);
+                //sync usb
+                system("sync");
+                //write only config file
+                writeallconfig(3);
+                //gui restart and write no config
+                oshutdown(3, 2);
         }
 }

titan/titan/menu.h

@@ -692 +692 @@
         {
                 if(check == 1) return 0;
-                createfav();
+                setdefaultbouquets();
         }
         else if(ostrcmp("autosearch", menuentry->name) == 0)

titan/titan/titan.c

@@ -1009 +1009 @@
                 }
         }
-                        
+
+        if(getconfigint("autoscan", NULL) == 1)
+        {
+                status.updatevfd = PAUSE;
+                resettvpic();
+                screenscanconfig(1);
+                resettvpic();
+                writevfd("");
+                status.updatevfd = START;
+                drawscreen(skin, 0, 0);
+                addconfig("autoscan", "0");
+        }
+                
         //first wizzard
         if(getconfigint("nofirstwizzard", NULL) < 2)