Changeset 10750


Ignore:
Timestamp:
10/28/11 13:25:55 (11 years ago)
Author:
nit
Message:

[titan] add epgheight= to skinconfig

File:
1 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/gmultiepg.h

    r10723 r10750  
    8080
    8181
    82 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)
     82int 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)
    8383{
    8484        int treffer = 0, gridbr = 0, aktcol = 0;
     
    9292                if(chnode != NULL)
    9393                {
    94                         chnode->height = 35;
     94                        chnode->height = height;
    9595                        changetext(chnode, tmpchannel->name);
    9696                        epgnode = getepgakt(tmpchannel);
     
    125125                                        gridbr = 1;
    126126                                        treffer = 1;
    127                                         chnode1->height = 35;
     127                                        chnode1->height = height;
    128128                                        chnode1->width = ((epgnode->endtime - epgnode->starttime) / 60) * zoom;
    129129                                        chnode1->posx = ((epgnode->starttime - akttime) / 60) * zoom;
     
    167167                                        if(gridbr == 0) chnode1->type = GRIDBR;
    168168                                        gridbr = 1;
    169                                         chnode1->height = 35;
     169                                        chnode1->height = height;
    170170                                        chnode1->deaktivcol = 1;
    171171                                }
     
    182182int showallgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int zoom, time_t akttime, struct channel* aktchannel)
    183183{
    184         int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
     184        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
    185185        struct skin* chnode = NULL, *chnode1 = NULL;
    186186        struct channel* tmpchannel = channel;
     
    188188        linecol1 = convertcol("epgcol1");
    189189        linecol2 = convertcol("epgcol2");
     190        height = getskinconfigint("epgheight", NULL);
     191        if(height == 0) height = 35;
    190192
    191193        if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
     
    194196        while(tmpchannel != NULL)
    195197        {
    196                 if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
     198                if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
    197199                        treffer = 1;
    198200                tmpchannel = tmpchannel->next;
     
    203205int showbouquetgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct bouquet* firstbouquet, int zoom, time_t akttime, struct channel* aktchannel)
    204206{
    205         int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
     207        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
    206208        struct skin* chnode = NULL, *chnode1 = NULL;
    207209        struct bouquet* tmpbouquet = firstbouquet;
     
    209211        linecol1 = convertcol("epgcol1");
    210212        linecol2 = convertcol("epgcol2");
     213        height = getskinconfigint("epgheight", NULL);
     214        if(height == 0) height = 35;
    211215
    212216        if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
     
    215219        while(tmpbouquet != NULL)
    216220        {
    217                 if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
     221                if(calcgmultiepg(tmpbouquet->channel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
    218222                        treffer = 1;
    219223                tmpbouquet = tmpbouquet->next;
     
    224228int showprovidergmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct provider* providernode, int zoom, time_t akttime, struct channel* aktchannel)
    225229{
    226         int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
     230        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
    227231        struct skin* chnode = NULL, *chnode1 = NULL;
    228232        struct channel* tmpchannel = channel;
    229233
     234        linecol1 = convertcol("epgcol1");
     235        linecol2 = convertcol("epgcol2");
     236        height = getskinconfigint("epgheight", NULL);
     237        if(height == 0) height = 35;
     238
    230239        if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
    231240
     
    234243                if(tmpchannel->provider == providernode)
    235244                {
    236                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
     245                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
    237246                                treffer = 1;
    238247                }
     
    244253int showsatgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, struct sat* satnode, int zoom, time_t akttime, struct channel* aktchannel)
    245254{
    246         int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
     255        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
    247256        struct skin* chnode = NULL, *chnode1 = NULL;
    248257        struct channel* tmpchannel = channel;
    249258       
    250259        if(satnode == NULL) return 1;
     260
     261        linecol1 = convertcol("epgcol1");
     262        linecol2 = convertcol("epgcol2");
     263        height = getskinconfigint("epgheight", NULL);
     264        if(height == 0) height = 35;
     265
    251266        if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
    252267
     
    255270                if(tmpchannel->transponder != NULL && tmpchannel->transponder->orbitalpos == satnode->orbitalpos)
    256271                {
    257                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
     272                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
    258273                                treffer = 1;
    259274                }
     
    265280int showazgmepgchannel(struct skin* gmultiepg, struct skin* channellistbox, struct skin* listbox, int character, int zoom, time_t akttime, struct channel* aktchannel)
    266281{
    267         int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0;
     282        int treffer = 0, linecol1 = 0, linecol2 = 0, aktline = 0, height = 0;
    268283        struct skin* chnode = NULL, *chnode1 = NULL;
    269284        struct channel* tmpchannel = channel;
    270285
     286        linecol1 = convertcol("epgcol1");
     287        linecol2 = convertcol("epgcol2");
     288        height = getskinconfigint("epgheight", NULL);
     289        if(height == 0) height = 35;
     290
    271291        if(gmultiepg != NULL) delmarkedscreennodes(gmultiepg, 1);
    272292
     
    275295                if(tmpchannel->name != NULL && (tmpchannel->name[0] == character || tmpchannel->name[0] == character + 32))
    276296                {
    277                         if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1) == 1)
     297                        if(calcgmultiepg(tmpchannel, gmultiepg, channellistbox, listbox, zoom, akttime, aktchannel, linecol1, linecol2, &aktline, &chnode, &chnode1, height) == 1)
    278298                                treffer = 1;
    279299                }
Note: See TracChangeset for help on using the changeset viewer.