Changeset 36337 for titan/titan


Ignore:
Timestamp:
11/27/15 23:49:34 (8 years ago)
Author:
gost
Message:

fix

Location:
titan/titan
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/channel.h

    r36326 r36337  
    5656{
    5757        m_lock(&status.channelmutex, 5);
    58         struct channel *node = channel;
     58  struct channel *node = channel;
    5959 
    6060        while(node != NULL)
     
    279279        }
    280280
    281         ret = sscanf(line, "%[^#]#%llu#%d#%d#%d#%"SCNu8"#%"SCNu8"#%"SCNu8"#%"SCNu16"#%"SCNu16"#%"SCNu8"#%"SCNu16"#%d", name, &newnode->transponderid, &newnode->providerid, &newnode->serviceid, &newnode->servicetype, &newnode->flag, &newnode->videocodec, &newnode->audiocodec, &newnode->videopid, &newnode->audiopid, &newnode->protect, &newnode->pcrpid, &newnode->orbitalpos);
     281  ret = sscanf(line, "%[^#]#%llu#%d#%d#%d#%"SCNu8"#%"SCNu8"#%"SCNu8"#%"SCNu16"#%"SCNu16"#%"SCNu8"#%"SCNu16, name, &newnode->transponderid, &newnode->providerid, &newnode->serviceid, &newnode->servicetype, &newnode->flag, &newnode->videocodec, &newnode->audiocodec, &newnode->videopid, &newnode->audiopid, &newnode->protect, &newnode->pcrpid);
    282282        if(ret == 11)
    283283        {
    284284                newnode->pcrpid = -1;
    285                 ret++;
    286         }
    287         if(ret == 12)
    288         {
    289                 newnode->orbitalpos = 192;
    290                 ret++;
    291         }
    292         if(ret != 13 || getchannel(newnode->serviceid, newnode->transponderid) != NULL)
     285                ret++; 
     286        }
     287        if(ret != 12 || getchannel(newnode->serviceid, newnode->transponderid) != NULL)
    293288        {
    294289                if(count > 0)
     
    309304        if(newnode->servicetype != 99)
    310305        {
    311                 newnode->transponder = gettransponder(newnode->transponderid, newnode->orbitalpos);
     306                newnode->transponder = gettransponder(newnode->transponderid);
    312307                newnode->provider = getprovider(newnode->providerid);
    313308                status.writechannel = 1;
     
    347342}
    348343
    349 struct channel* createchannel(char* name, uint64_t transponderid, int providerid, int serviceid, int servicetype, int flag, int videocodec, int audiocodec, int videopid, int audiopid, int protect, int pcrpid, int orbitalpos)
     344struct channel* createchannel(char* name, uint64_t transponderid, int providerid, int serviceid, int servicetype, int flag, int videocodec, int audiocodec, int videopid, int audiopid, int protect, int pcrpid)
    350345{
    351346        struct channel* chnode = NULL;
     
    375370        tmpstr = ostrcat(tmpstr, "#", 1, 0);
    376371        tmpstr = ostrcat(tmpstr, oitoa(pcrpid), 1, 1);
    377         tmpstr = ostrcat(tmpstr, "#", 1, 0);
    378         tmpstr = ostrcat(tmpstr, oitoa(orbitalpos), 1, 1);
    379372
    380373        chnode = addchannel(tmpstr, 1, NULL);
     
    438431
    439432        m_lock(&status.channelmutex, 5);
    440         struct channel *node = channel, *prev = channel;
     433  struct channel *node = channel, *prev = channel;
    441434
    442435        while(node != NULL)
     
    502495                        node->name = NULL;
    503496     
    504                         free(node->hbbtvurl);
    505                         node->hbbtvurl = NULL;
     497      free(node->hbbtvurl);
     498      node->hbbtvurl = NULL;
    506499
    507500                        free(node);
     
    719712                        continue;
    720713                }
    721                 ret = fprintf(fd, "%s#%llu#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d\n", node->name, node->transponderid, node->providerid, node->serviceid, node->servicetype, node->flag, node->videocodec, node->audiocodec, node->videopid, node->audiopid, node->protect, node->pcrpid, node->orbitalpos);
     714                ret = fprintf(fd, "%s#%llu#%d#%d#%d#%d#%d#%d#%d#%d#%d#%d\n", node->name, node->transponderid, node->providerid, node->serviceid, node->servicetype, node->flag, node->videocodec, node->audiocodec, node->videopid, node->audiopid, node->protect, node->pcrpid);
    722715                if(ret < 0)
    723716                {
  • titan/titan/header.h

    r36320 r36337  
    429429//channel.h
    430430int writechannel(const char *filename);
    431 struct channel* createchannel(char* name, uint64_t transponderid, int providerid, int serviceid, int servicetype, int flag, int videocodec, int audiocodec, int videopid, int audiopid, int protect, int pcrpid, int orbitalpos);
     431struct channel* createchannel(char* name, uint64_t transponderid, int providerid, int serviceid, int servicetype, int flag, int videocodec, int audiocodec, int videopid, int audiopid, int protect, int pcrpid);
    432432void delchannelbytransponder(uint64_t transponderid);
    433433struct channel* gettmpchannel();
     
    438438
    439439//transponder.h
    440 struct transponder* gettransponder(uint64_t transponderid, int orbitalpos);
     440struct transponder* gettransponder(uint64_t transponderid);
    441441int writetransponder(const char *filename);
    442442void deltransponderbyorbitalpos(int orbitalpos);
  • titan/titan/hwtest.h

    r36320 r36337  
    109109                                        else
    110110                                        {
    111                                                 chnode = createchannel("testchannel", tpid, 0, serviceid, 99, 0, videocodec, audiocodec, videopid, audiopid, 0, pcrpid, 192);
     111                                                chnode = createchannel("testchannel", tpid, 0, serviceid, 99, 0, videocodec, audiocodec, videopid, audiopid, 0, pcrpid);
    112112                                                if(chnode == NULL)
    113113                                                        textbox(_("Message"), _("can't create new channel"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);                       
  • titan/titan/pip.h

    r36320 r36337  
    5454        {
    5555                if(chnode->transponder == NULL)
    56                         tpnode = gettransponder(chnode->transponderid, chnode->orbitalpos);
     56                        tpnode = gettransponder(chnode->transponderid);
    5757                else
    5858                        tpnode = chnode->transponder;
  • titan/titan/player.h

    r36320 r36337  
    154154                               
    155155                delchannel(serviceid, 0, 1);
    156                 chnode = createchannel("player", 0, 0, serviceid, 99, 0, -1, -1, -1, -1, 0, -1, 0);
     156                chnode = createchannel("player", 0, 0, serviceid, 99, 0, -1, -1, -1, -1, 0, -1);
    157157                if(chnode != NULL) chnode->pmtpid = pmtpid;
    158158        }
  • titan/titan/rectimer.h

    r36320 r36337  
    9898        if(dvbdevsim == NULL) return 0;
    9999
    100         tpnode = gettransponder(recnode->transponderid, recnode->orbitalpos);
     100        tpnode = gettransponder(recnode->transponderid);
    101101        dvbnode = fegetfree(tpnode, 3, dvbdevsim);
    102102        if(dvbnode != NULL)
     
    109109                        if((recnode->begin >= node->begin && recnode->begin < node->end) || (recnode->end >= node->begin && recnode->end < node->end))
    110110                        {
    111                                 tpnode = gettransponder(node->transponderid, node->orbitalpos);
     111                                tpnode = gettransponder(node->transponderid);
    112112                                dvbnode = fegetfree(tpnode, 3, dvbdevsim);
    113113                                if(dvbnode == NULL)
  • titan/titan/service.h

    r36320 r36337  
    122122        {
    123123                if(chnode->transponder == NULL)
    124                         tpnode = gettransponder(chnode->transponderid, chnode->orbitalpos);
     124                        tpnode = gettransponder(chnode->transponderid);
    125125                else
    126126                        tpnode = chnode->transponder;
     
    10201020        chnode = getchannel(65535, 0);
    10211021        if(chnode == NULL)
    1022                 //chnode = createchannel("HDMIIN", 0, 0, 65535, 99, 0, -1, -1, -1, -1, 0, -1, 0);
    1023                 chnode = createchannel("HDMIIN", 0, 0, 65535, 0, 0, -1, -1, -1, -1, 0, -1, 0);
     1022                //chnode = createchannel("HDMIIN", 0, 0, 65535, 99, 0, -1, -1, -1, -1, 0, -1);
     1023                chnode = createchannel("HDMIIN", 0, 0, 65535, 0, 0, -1, -1, -1, -1, 0, -1);
    10241024        status.aktservice->channel = chnode;
    10251025}
  • titan/titan/struct.h

    r36320 r36337  
    8787#endif
    8888
    89 #define DRIVER "ini-800 - 3.14.2 r5 - 20150708"
     89#define DRIVER "20150113"
    9090#define OVERSION "1.69"
    9191#define PROGNAME "titan"
    9292#define COPYRIGHT "NIT"
    9393#define CRONTRIBUT "obi, gost"
    94 #define PLUGINVERSION 1
     94#define PLUGINVERSION 0
    9595
    9696#define _(x) gettext(x)
     
    541541        int tpnew;
    542542        int tvcount;
    543         int tpdel;
    544543        int newtvcount;
    545544        int radiocount;
     
    734733        char* channellist;
    735734        int serviceid;
    736         int orbitalpos;
    737735        //0 = nothing
    738736        //1 = running
     
    791789{
    792790        uint64_t transponderid;
    793         int orbitalpos;
    794791        struct transponder* tpnode;
    795792        struct transpondercache* next;
     
    11411138        int16_t aitpid;
    11421139        uint8_t protect;
    1143         int orbitalpos;
    11441140        char* hbbtvurl;
    11451141        struct transponder *transponder;
     
    15681564        //node oled blinken
    15691565        int skinblink;
    1570         int deltransponder;
    15711566} status;
    15721567
Note: See TracChangeset for help on using the changeset viewer.