Changeset 36069

Timestamp:

11/05/15 02:16:01 (8 years ago)

Author:

obi

Message:

update scan add delunused functions

Location:

titan/titan

Files:

• global.h (modified) (7 diffs)
• scan.h (modified) (9 diffs)

titan/titan/global.h

@@ -7457 +7457 @@
 void delunusedsat()
 {
+        debug(10, "delunusedsat: start");
         struct sat* node = sat;
         struct sat* prev = NULL;
@@ -7466 +7467 @@
                 
                 if(prev->scan != 1)
-                        delsat(prev);   
-        }
-
+                        delsat(prev->name);     
+        }
+        debug(10, "delunusedsat: end");
 }
 
 void delunusedtransponder()
 {
+        debug(10, "delunusedtransponder: start");
         struct transponder* node = transponder;
         struct transponder* prev = NULL;
@@ -7484 +7486 @@
                         deltransponder(prev);
         }
+        debug(10, "delunusedtransponder: end");
 }
 
 void delunusedchannel()
 {
+        debug(10, "delunusedchannel: start");
         struct channel* node = channel;
         struct channel* prev = NULL;
@@ -7499 +7503 @@
                         delchannel(prev->serviceid, prev->transponderid, 0);
         }
+        debug(10, "delunusedchannel: end");
 }
 
 void delunusedbouquet()
 {
+        debug(10, "delunusedbouquet: start");
         struct mainbouquet* mnode = mainbouquet;
         struct bouquet* first = NULL;
@@ -7521 +7527 @@
                 mnode = mnode->next;
         }
+        debug(10, "delunusedbouquet: end");
 }
 
 void delunusedepgchannel()
 {
+        debug(10, "delunusedepgchannel: start");
         struct epgscanlist* node = epgscanlist;
         struct epgscanlist* prev = NULL;
@@ -7535 +7543 @@
                         delepgscanlist(node->serviceid, node->transponderid);
         }
+        debug(10, "delunusedepgchannel: end");
 }
 
 void delunusedprovider()
 {
+        debug(10, "delunusedprovider: start");
         struct provider* node = provider;
         struct provider* prev = NULL;
@@ -7548 +7558 @@
                 delprovidernotused(prev);
         }
+        debug(10, "delunusedprovider: end");
 }
 

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 emptybouquet, int unusedbouquetchannels, int timeout, int flag)
+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 unusedbouquetchannels, int unusedsats, int unusedtransponder, int unusedchannels, int unusedprovider, int timeout, int flag)
 {
         int rcret = 0, tpmax = 0, i = 0, alladded = 0, endmsgshow = 0;
@@ -1507 +1507 @@
                         {
                                 freechannel(1);
-                                delunusedsat();
-                                delunusedtransponder();
-                                delunusedchannel();
-                                delunusedbouquet();
-                                delunusedepgchannel();
-                                delunusedprovider();
-                        }
-                }
+                                if(unusedsats == 1) delunusedsat();
+                                if(unusedtransponder == 1) delunusedtransponder();
+                                if(unusedchannels == 1) delunusedchannel();
+                                //if(unusedepgchannel == 1) delunusedepgchannel();
+                                if(unusedprovider == 1) delunusedprovider();
+                        }
+                }
+
                 satnode = sat;
                 while(satnode != NULL)
@@ -1695 +1695 @@
         resetsatscan();
         drawscreen(load, 0, 0);
-  sortchannel();
-  sortprovider();
-  clearscreen(load);
+        sortchannel();
+        sortprovider();
+        clearscreen(load);
 }
 
@@ -1859 +1859 @@
         int inetworkscan = -1, ionlyfree = -1, iclear = -1, iblindscan = -1, ichangename = -1;
         int ifavtype = -1, iemptybouquet = -1, iunusedbouquetchannels = -1;
+        int iunusedsats = -1, iunusedtransponder = -1, iunusedchannels = -1, iunusedprovider = -1;
+
         int i = 0, treffer = 0, tunercount = 0;
         
@@ -1895 +1897 @@
         struct skin* emptybouquet = getscreennode(scan, "emptybouquet");
         struct skin* unusedbouquetchannels = getscreennode(scan, "unusedbouquetchannels");
-        
+        struct skin* unusedsats = getscreennode(scan, "unusedsats");
+        struct skin* unusedtransponder = getscreennode(scan, "unusedtransponder");
+        struct skin* unusedchannels = getscreennode(scan, "unusedchannels");
+        struct skin* unusedprovider = getscreennode(scan, "unusedprovider");
+
         struct skin* b4 = getscreennode(scan, "b4");
         struct skin* b5 = getscreennode(scan, "b5");
@@ -2293 +2299 @@
         addchoicebox(unusedbouquetchannels, "1", _("yes"));
 
+        //unusedsats
+        addchoicebox(unusedsats, "0", _("no"));
+        addchoicebox(unusedsats, "1", _("yes"));
+
+        //unusedtransponder
+        addchoicebox(unusedtransponder, "0", _("no"));
+        addchoicebox(unusedtransponder, "1", _("yes"));
+
+        //unusedchannels
+        addchoicebox(unusedchannels, "0", _("no"));
+        addchoicebox(unusedchannels, "1", _("yes"));
+
+        //unusedprovider
+        addchoicebox(unusedprovider, "0", _("no"));
+        addchoicebox(unusedprovider, "1", _("yes"));
+
+
         drawscreen(scan, 2, 0);
         changescantype(scantype->ret, scan, listbox, tuner, sat, id, system, frequency, inversion, symbolrate, polarization, fec, modulation, rolloff, pilot, hp, lp, bandwidth, transmission, guardinterval, hierarchy, b4, b5, flag);
@@ -2302 +2325 @@
         {
                 addscreenrc(scan, tmp);
+
+                if(clear->ret != NULL && ostrcmp(clear->ret, "1") == 0)
+                {
+                        emptybouquet->hidden = NO;
+                        unusedbouquetchannels->hidden = NO;
+                        unusedsats->hidden = NO;
+                        unusedtransponder->hidden = NO;
+                        unusedchannels->hidden = NO;
+                        unusedprovider->hidden = NO;
+                }
+                else
+                {
+                        emptybouquet->hidden = YES;
+                        unusedbouquetchannels->hidden = YES;
+                        unusedsats->hidden = YES;
+                        unusedtransponder->hidden = YES;
+                        unusedchannels->hidden = YES;
+                        unusedprovider->hidden = YES;
+                }
+                drawscreen(scan, 0, 0);
+
                 rcret = waitrc(scan, 0, 0);
                 tmp = listbox->select;
@@ -2335 +2379 @@
                 if(emptybouquet->ret != NULL) iemptybouquet = atoi(emptybouquet->ret);
                 if(unusedbouquetchannels->ret != NULL) iunusedbouquetchannels = atoi(unusedbouquetchannels->ret);
+                if(unusedsats->ret != NULL) iunusedsats = atoi(unusedsats->ret);
+                if(unusedtransponder->ret != NULL) iunusedtransponder = atoi(unusedtransponder->ret);
+                if(unusedchannels->ret != NULL) iunusedchannels = atoi(unusedchannels->ret);
+                if(unusedprovider->ret != NULL) iunusedprovider = atoi(unusedprovider->ret);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -2357 +2405 @@
                 {
                         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, iemptybouquet, iunusedbouquetchannels, 5000000, flag);
+                        screenscan(tpnode, scan->child, tuner->ret, iscantype, isat, ifrequency, iinversion, isymbolrate, ipolarization, ifec, imodulation, irolloff, ipilot, inetworkscan, ionlyfree, iclear, iblindscan, ichangename, isystem, ifavtype, iemptybouquet, iunusedbouquetchannels, iunusedsats, iunusedtransponder, iunusedchannels, iunusedprovider, 5000000, flag);
                         drawscreen(scan, 0, 0);
                 }