Changeset 24223

Timestamp:

10/12/13 11:13:07 (9 years ago)

Author:

nit

Message:

[titan] add flag to copy only provider/sat with channel

Location:

titan/titan

Files:

• channellist.h (modified) (2 diffs)
• provider.h (modified) (4 diffs)
• sat.h (modified) (4 diffs)
• scan.h (modified) (1 diff)

titan/titan/channellist.h

@@ -910 +910 @@
                                 if(list == PROVIDERLIST)
                                 {
-                                        if(provider2bouquet(((struct provider*)listbox->select->handle1)->providerid) == 0)
+                                        if(provider2bouquet(((struct provider*)listbox->select->handle1)->providerid, 0) == 0)
                                                 textbox(_("Message"), _("Copy providerlist successfull"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
                                         else
@@ -917 +917 @@
                                 else if(list == SATLIST)
                                 {
-                                        if(sat2bouquet(((struct sat*)listbox->select->handle1)->orbitalpos) == 0)
+                                        if(sat2bouquet(((struct sat*)listbox->select->handle1)->orbitalpos, 0) == 0)
                                                 textbox(_("Message"), _("Copy satlist successfull"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 10, 0);
                                         else

titan/titan/provider.h

@@ -393 +393 @@
 }
 
-int provider2bouquet(int providerid)
-{
+//flag 0: add all provider
+//flag 1: add only provider with channel
+int provider2bouquet(int providerid, int flag)
+{
+        int treffer = 0;
         struct provider* pnode = NULL;
         struct mainbouquet* mnode = NULL;
@@ -430 +433 @@
         }
         free(tmpstr); tmpstr = NULL;
-        free(path); path = NULL;
 
         if(mnode != NULL)
@@ -441 +443 @@
                                 tmpstr = ostrcat(tmpstr, "#", 1, 0);
                                 tmpstr = ostrcat(tmpstr, ollutoa(chnode->transponderid), 1, 1);
+                                treffer = 1;
                                 addbouquet(&mnode->bouquet, tmpstr, status.servicetype, 1, NULL);
                                 free(tmpstr); tmpstr = NULL;
@@ -447 +450 @@
                 }
         }
-
+        
+        if(treffer == 0 && flag == 1)
+                delmainbouquet(path, 1);
+ 
+        free(path); path = NULL;
         return 0;
 }

titan/titan/sat.h

@@ -472 +472 @@
 }
 
-int sat2bouquet(int orbitalpos)
-{
+//flag 0: add all provider
+//flag 1: add only provider with channel
+int sat2bouquet(int orbitalpos, int flag)
+{
+        int treffer = 0;
         struct sat* snode = NULL;
         struct mainbouquet* mnode = NULL;
@@ -509 +512 @@
         }
         free(tmpstr); tmpstr = NULL;
-        free(path); path = NULL;
 
         if(mnode != NULL)
@@ -520 +522 @@
                                 tmpstr = ostrcat(tmpstr, "#", 1, 0);
                                 tmpstr = ostrcat(tmpstr, ollutoa(chnode->transponderid), 1, 1);
+                                treffer = 1;
                                 addbouquet(&mnode->bouquet, tmpstr, status.servicetype, 1, NULL);
                                 free(tmpstr); tmpstr = NULL;
@@ -526 +529 @@
                 }
         }
-
+        
+        if(treffer == 0 && flag == 1)
+                delmainbouquet(path, 1);
+
+  free(path); path = NULL;
         return 0;
 }

titan/titan/scan.h

@@ -1648 +1648 @@
                         while(pnode != NULL)
                         {
-                                provider2bouquet(pnode->providerid);
+                                provider2bouquet(pnode->providerid, 1);
                                 pnode = pnode->next;
                         }