Changeset 18548


Ignore:
Timestamp:
11/11/12 21:18:09 (11 years ago)
Author:
nit
Message:

[titan] fix transponderid

Location:
titan/titan
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/epg.h

    r18543 r18548  
    11981198        int serviceid = HILO(evtlink->service_id);
    11991199       
    1200         transponderid = (onid << 16) | tid;
     1200        transponderid = ((onid << 16) | tid) & 0xffffffff;
    12011201
    12021202        if(chnode != NULL && chnode->transponder != NULL)
     
    14391439                        return;
    14401440               
    1441                 transponderid = (HILO(eit->original_network_id) << 16) | HILO(eit->transport_stream_id);
     1441                transponderid = ((HILO(eit->original_network_id) << 16) | HILO(eit->transport_stream_id)) & 0xffffffff;
    14421442                if(chnode->transponder != NULL)
    14431443                {
  • titan/titan/scan.h

    r18538 r18548  
    9696        if(frequency > 15000000) return NULL;
    9797
    98         id = (onid << 16) | transportid;
     98        id = ((onid << 16) | transportid) & 0xffffffff;
    9999
    100100        if(gettransponder(id) == NULL)
     
    240240        onid = (buf[8] << 8) | buf[9];
    241241       
    242         transponderid = (onid << 16) | tid;
     242        transponderid = ((onid << 16) | tid) & 0xffffffff;
    243243        if(fenode->feinfo->type == FE_QAM)
    244244                transponderid = transponderid | ((uint64_t)1 << 32);
     
    361361        onid = (buf[8] << 8) | buf[9];
    362362       
    363         transponderid = (onid << 16) | tid;
     363        transponderid = ((onid << 16) | tid) & 0xffffffff;
    364364
    365365        if(fenode->feinfo->type == FE_QAM)
Note: See TracChangeset for help on using the changeset viewer.