Changeset 24218

Timestamp:

10/12/13 03:33:37 (9 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/scan.h (modified) (9 diffs)

titan/titan/scan.h

@@ -1393 +1393 @@
 }
 
-void screenscan(struct transponder* transpondernode, struct skin* mscan, char* tuner, int scantype, int orbitalpos, unsigned int frequency, int inversion, unsigned int symbolrate, int polarization, int fec, int modulation, int rolloff, int pilot, int networkscan, int onlyfree, int clear, int blindscan, int ichangename, int system, int favtype, int timeout)
+void screenscan(struct transponder* transpondernode, struct skin* mscan, char* tuner, int scantype, int orbitalpos, unsigned int frequency, int inversion, unsigned int symbolrate, int polarization, int fec, int modulation, int rolloff, int pilot, int networkscan, int onlyfree, int clear, int blindscan, int ichangename, int system, int favtype, int emptybouquet, int timeout)
 {
         int rcret = 0, tpmax = 0, i = 0, alladded = 0;
@@ -1637 +1637 @@
         if(clear == 1)
         {
-                //TODO: Auswahl Bouquet
-                // EXIT = keine änderung vornehmen
+                // keine änderung vornehmen
                 // delunusedbouquetchannels(1);
                 
-                // erneuern = unbenutzte einträge löschen
+                // unbenutzte einträge löschen
                 // delunusedbouquetchannels(0);
-                
-                // löschen = da legt der glaube keine an und löscht sie
-                // freemainbouquet();
-                
-                // neuerstellen = da legt der einfach die provider 1:1 als bouget an
-                /*
-                freemainbouquet();
-                struct provider *pnode = provider;
-                
-                while(pnode != NULL)
-                {
-                        provider2bouquet(pnode->providerid);
-                        pnode = pnode->next;
-                }
-        
-                rcret = textbox(_("Message"), _("Bouquet\n\nRenew Bouquet = Red\nDelete all Bouquet = Green\nProvider to Bouquet = Yellow"), _("EXIT"), getrcconfigint("rcexit", NULL), _("RENEW"), getrcconfigint("rcred", NULL), _("DELETE"), getrcconfigint("rcgreen", NULL), _("NEW"), getrcconfigint("rcyellow", NULL), 600, 400, 0, 0);
-                if(rcret == 2)
-                        delunusedbouquetchannels(0);
-
-                else if(rcret == 3)
-                        freemainbouquet(1);
-                else if(rcret == 4)
+
+                // favtype 0 = unchanged
+                // favtype 1 = create new
+                // favtype 2 = delete
+
+                if(favtype == 1)
                 {
                         freemainbouquet(1);
@@ -1675 +1658 @@
                         }
                 }
-                else
-                        delunusedbouquetchannels(1);
+                else if(favtype == 2)
+                        freemainbouquet(1);
+
+// needed, remove emthy bouquets proc
+//              if(emptybouquet == 1)
+//                      delunusedbouquets();
                 
                 if(textbox(_("Message"), _("Do you want to delete all unused Bouquetentrys?"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0) == 1)
@@ -1682 +1669 @@
                 else
                         delunusedbouquetchannels(1);
-                */
-
-                if(favtype == 0)
-                        delunusedbouquetchannels(0);
-                else if(favtype == 1)
-                        delunusedbouquetchannels(1);
-                else if(favtype == 2)
-                {
-                        freemainbouquet(1);
-                        struct provider *pnode = provider;
-                        
-                        while(pnode != NULL)
-                        {
-                                provider2bouquet(pnode->providerid);
-                                pnode = pnode->next;
-                        }
-// remove unused favs ARD-SR
-                        delunusedbouquetchannels(0);
-                }
-                else if(favtype == 3)
-                        freemainbouquet(1);
         }
         delmarkedscreennodes(scan, 1);
@@ -1870 +1836 @@
         int iinversion = -1, ipolarization = -1;
         int ifec = -1, imodulation = -1, irolloff = -1, ipilot = -1, isystem = -1;
-        int inetworkscan = -1, ionlyfree = -1, iclear = -1, iblindscan = -1, ichangename = -1, ifavtype = -1;
+        int inetworkscan = -1, ionlyfree = -1, iclear = -1, iblindscan = -1, ichangename = -1, ifavtype = -1, iemptybouquet = -1;
         int i = 0, treffer = 0, tunercount = 0;
         struct skin* scan = getscreen("manualscan");
@@ -1899 +1865 @@
         struct skin* changename = getscreennode(scan, "changename");
         struct skin* favtype = getscreennode(scan, "favtype");
+        struct skin* emptybouquet = getscreennode(scan, "emptybouquet");
         
         struct skin* b4 = getscreennode(scan, "b4");
@@ -2285 +2252 @@
 
         //favtype
-        addchoicebox(favtype, "0", _("Renew"));
-        addchoicebox(favtype, "1", _("Unchanged"));
-        addchoicebox(favtype, "2", _("Provider"));
-        addchoicebox(favtype, "3", _("Delete"));
+        addchoicebox(favtype, "0", _("Unchanged"));
+        addchoicebox(favtype, "1", _("Create new"));
+        addchoicebox(favtype, "2", _("Delete All"));
+
+        //emptybouquet
+        addchoicebox(emptybouquet, "0", _("no"));
+        addchoicebox(emptybouquet, "1", _("yes"));
 
         drawscreen(scan, 2, 0);
@@ -2330 +2300 @@
                 if(changename->ret != NULL) ichangename = atoi(changename->ret);
                 if(favtype->ret != NULL) ifavtype = atoi(favtype->ret);
+                if(emptybouquet->ret != NULL) iemptybouquet = atoi(emptybouquet->ret);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -2352 +2323 @@
                 {
                         clearscreen(scan);
-                        screenscan(tpnode, scan->child, tuner->ret, iscantype, isat, ifrequency, iinversion, isymbolrate, ipolarization, ifec, imodulation, irolloff, ipilot, inetworkscan, ionlyfree, iclear, iblindscan, ichangename, isystem, ifavtype, 5000000);
+                        screenscan(tpnode, scan->child, tuner->ret, iscantype, isat, ifrequency, iinversion, isymbolrate, ipolarization, ifec, imodulation, irolloff, ipilot, inetworkscan, ionlyfree, iclear, iblindscan, ichangename, isystem, ifavtype, iemptybouquet, 5000000);
                         drawscreen(scan, 0, 0);
                 }