Changeset 24719 for titan


Ignore:
Timestamp:
11/02/13 18:29:47 (10 years ago)
Author:
nit
Message:

fix

Location:
titan/titan
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • titan/titan/channel.h

    r24714 r24719  
    342342}
    343343
    344 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)
     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)
    345345{
    346346        struct channel* chnode = NULL;
     
    368368        tmpstr = ostrcat(tmpstr, "#", 1, 0);
    369369        tmpstr = ostrcat(tmpstr, oitoa(protect), 1, 1);
     370        tmpstr = ostrcat(tmpstr, "#", 1, 0);
     371        tmpstr = ostrcat(tmpstr, oitoa(pcrpid), 1, 1);
    370372
    371373        chnode = addchannel(tmpstr, 1, NULL);
  • titan/titan/header.h

    r24718 r24719  
    372372//channel.h
    373373int writechannel(const char *filename);
    374 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);
     374struct 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);
    375375void delchannelbytransponder(uint64_t transponderid);
    376376struct channel* gettmpchannel();
  • titan/titan/hwtest.h

    r22821 r24719  
    7070        int serviceid = 0;
    7171        int8_t videocodec = 0, audiocodec = 0;
    72         int16_t videopid = 0, audiopid = 0;
     72        int16_t videopid = 0, audiopid = 0, pcrpid = 0;
    7373                               
    7474        char* tmpstr = NULL, *tmpstr1 = NULL;
     
    9696                                else
    9797                                {
    98                                         int ret = sscanf(tmpstr1, "%d#%"SCNu8"#%"SCNu8"#%"SCNu16"#%"SCNu16, &serviceid, &videocodec, &audiocodec, &videopid, &audiopid);
    99                                         if(ret != 5)
     98                                        int ret = sscanf(tmpstr1, "%d#%"SCNu8"#%"SCNu8"#%"SCNu16"#%"SCNu16"#%"SCNu16, &serviceid, &videocodec, &audiocodec, &videopid, &audiopid, &pcrpid);
     99                                        if(ret != 6)
    100100                                                textbox(_("Message"), _("testchannel entry not ok"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 0, 0);                       
    101101                                        else
    102102                                        {
    103                                                 chnode = createchannel("testchannel", tpid, 0, serviceid, 99, 0, videocodec, audiocodec, videopid, audiopid, 0);
     103                                                chnode = createchannel("testchannel", tpid, 0, serviceid, 99, 0, videocodec, audiocodec, videopid, audiopid, 0, pcrpid);
    104104                                                if(chnode == NULL)
    105105                                                        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/player.h

    r24101 r24719  
    122122               
    123123                delchannel(serviceid, 0, 1);
    124                 chnode = createchannel("player", 0, 0, serviceid, 99, 0, -1, -1, -1, -1, 0);
     124                chnode = createchannel("player", 0, 0, serviceid, 99, 0, -1, -1, -1, -1, 0, -1);
    125125                if(chnode != NULL) chnode->pmtpid = pmtpid;
    126126        }
  • titan/titan/scan.h

    r24284 r24719  
    12931293                if(chnode == NULL)
    12941294                {
    1295                         if(createchannel(node->param2, transponderid, providerid, serviceid, servicetype, 0, -1, -1, -1, -1, 0) != NULL)
     1295                        if(createchannel(node->param2, transponderid, providerid, serviceid, servicetype, 0, -1, -1, -1, -1, 0, -1) != NULL)
    12961296                                node->fontcol = convertcol("deaktivcol");
    12971297                }
Note: See TracChangeset for help on using the changeset viewer.