Changeset 10750

Timestamp:

10/28/11 13:25:55 (11 years ago)

Author:

nit

Message:

[titan] add epgheight= to skinconfig

File:

• titan/titan/gmultiepg.h (modified) (16 diffs)

titan/titan/gmultiepg.h

@@ -80 +80 @@
 
 
-int calcgmultiepg(struct channel* tmpchannel, struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int zoom, time_t akttime, struct channel* aktchannel, int linecol1, int linecol2, int* aktline, struct skin** pchnode, struct skin** pchnode1)
+int calcgmultiepg(struct channel* tmpchannel, struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int zoom, time_t akttime, struct channel* aktchannel, int linecol1, int linecol2, int* aktline, struct skin** pchnode, struct skin** pchnode1, int height)
 {
         int treffer = 0, gridbr = 0, aktcol = 0;
@@ -92 +92 @@
                 if(chnode != NULL)
                 {
-                        chnode->height = 35;
+                        chnode->height = height;
                         changetext(chnode, tmpchannel->name);
                         epgnode = getepgakt(tmpchannel);
@@ -125 +125 @@
                                         gridbr = 1;
                                         treffer = 1;
-                                        chnode1->height = 35;
+                                        chnode1->height = height;
                                         chnode1->width = ((epgnode->endtime - epgnode->starttime) / 60) * zoom;
                                         chnode1->posx = ((epgnode->starttime - akttime) / 60) * zoom;
@@ -167 +167 @@
                                         if(gridbr == 0) chnode1->type = GRIDBR;
                                         gridbr = 1;
-                                        chnode1->height = 35;
+                                        chnode1->height = height;
                                         chnode1->deaktivcol = 1;
                                 }
@@ -182 +182 @@
 int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int zoom, time_t akttime, struct channel* aktchannel)
 {
-        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
+        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
         struct skin* chnode = NULL, *chnode1 = NULL;
         struct channel* tmpchannel = channel;
@@ -188 +188 @@
         linecol1 = convertcol("epgcol1");
         linecol2 = convertcol("epgcol2");
+        height = getskinconfigint("epgheight", NULL);
+        if(height == 0) height = 35;
 
         if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
@@ -194 +196 @@
         while(tmpchannel != NULL)
         { 
-                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
+                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
                         treffer = 1;
                 tmpchannel = tmpchannel->next;
@@ -203 +205 @@
 int showbouquetgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct bouquet* firstbouquet, int zoom, time_t akttime, struct channel* aktchannel)
 {
-        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
+        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
         struct skin* chnode = NULL, *chnode1 = NULL;
         struct bouquet* tmpbouquet = firstbouquet;
@@ -209 +211 @@
         linecol1 = convertcol("epgcol1");
         linecol2 = convertcol("epgcol2");
+        height = getskinconfigint("epgheight", NULL);
+        if(height == 0) height = 35;
 
         if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
@@ -215 +219 @@
         while(tmpbouquet != NULL)
         {
-                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
+                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
                         treffer = 1;
                 tmpbouquet = tmpbouquet->next;
@@ -224 +228 @@
 int showprovidergmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct provider* providernode, int zoom, time_t akttime, struct channel* aktchannel)
 {
-        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
+        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
         struct skin* chnode = NULL, *chnode1 = NULL;
         struct channel* tmpchannel = channel;
 
+        linecol1 = convertcol("epgcol1");
+        linecol2 = convertcol("epgcol2");
+        height = getskinconfigint("epgheight", NULL);
+        if(height == 0) height = 35;
+
         if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
 
@@ -234 +243 @@
                 if(tmpchannel->provider == providernode)
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
                                 treffer = 1;
                 }
@@ -244 +253 @@
 int showsatgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct sat* satnode, int zoom, time_t akttime, struct channel* aktchannel)
 {
-        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
+        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
         struct skin* chnode = NULL, *chnode1 = NULL;
         struct channel* tmpchannel = channel;
         
         if(satnode == NULL) return 1;
+
+        linecol1 = convertcol("epgcol1");
+        linecol2 = convertcol("epgcol2");
+        height = getskinconfigint("epgheight", NULL);
+        if(height == 0) height = 35;
+
         if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
 
@@ -255 +270 @@
                 if(tmpchannel->transponder != NULL && tmpchannel->transponder->orbitalpos == satnode->orbitalpos)
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
                                 treffer = 1;
                 }
@@ -265 +280 @@
 int showazgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int character, int zoom, time_t akttime, struct channel* aktchannel)
 {
-        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
+        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
         struct skin* chnode = NULL, *chnode1 = NULL;
         struct channel* tmpchannel = channel;
 
+        linecol1 = convertcol("epgcol1");
+        linecol2 = convertcol("epgcol2");
+        height = getskinconfigint("epgheight", NULL);
+        if(height == 0) height = 35;
+
         if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
 
@@ -275 +295 @@
                 if(tmpchannel->name != NULL && (tmpchannel->name[0] == character || tmpchannel->name[0] == character + 32))
                 {
-                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
+                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
                                 treffer = 1;
                 }