Changeset 24226 for titan/titan

Timestamp:

10/12/13 12:26:10 (11 years ago)

Author:

obi

Message:

update channelscan

File:

• titan/titan/scan.h (modified) (8 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 emptybouquet, 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 unusedbouquetchannels, int timeout)
 {
         int rcret = 0, tpmax = 0, i = 0, alladded = 0;
@@ -1658 +1658 @@
                         delemptymainbouquet(1);
                 
-                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)
+                if(unusedbouquetchannels == 1)
                         delunusedbouquetchannels(0);
                 else
@@ -1829 +1829 @@
         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, iemptybouquet = -1;
+        int inetworkscan = -1, ionlyfree = -1, iclear = -1, iblindscan = -1, ichangename = -1, ifavtype = -1, iemptybouquet = -1, irmunusedbouquetchannels = -1;
         int i = 0, treffer = 0, tunercount = 0;
         struct skin* scan = getscreen("manualscan");
@@ -1859 +1859 @@
         struct skin* favtype = getscreennode(scan, "favtype");
         struct skin* emptybouquet = getscreennode(scan, "emptybouquet");
+        struct skin* unusedbouquetchannels = getscreennode(scan, "unusedbouquetchannels");
         
         struct skin* b4 = getscreennode(scan, "b4");
@@ -1872 +1873 @@
         if(status.recording > 0 || status.streaming > 0)
         {
-                textbox(_("Message"), _("Scan is not allowed if record\nor stream is running !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);
+                textbox(_("Message"), _("Scan is not allowed if record or stream is running !"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 800, 200, 0, 0);
                 return;
         }
@@ -2253 +2254 @@
         addchoicebox(emptybouquet, "1", _("yes"));
 
+        //unusedbouquetchannels
+        addchoicebox(unusedbouquetchannels, "0", _("no"));
+        addchoicebox(unusedbouquetchannels, "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);
@@ -2294 +2299 @@
                 if(favtype->ret != NULL) ifavtype = atoi(favtype->ret);
                 if(emptybouquet->ret != NULL) iemptybouquet = atoi(emptybouquet->ret);
+                if(unusedbouquetchannels->ret != NULL) iunusedbouquetchannels = atoi(unusedbouquetchannels->ret);
 
                 if(rcret == getrcconfigint("rcexit", NULL)) break;
@@ -2316 +2322 @@
                 {
                         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, 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, iunusedbouquetchannels, 5000000);
                         drawscreen(scan, 0, 0);
                 }