Changeset 36337 for titan/titan
- Timestamp:
- 11/27/15 23:49:34 (8 years ago)
- Location:
- titan/titan
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/channel.h
r36326 r36337 56 56 { 57 57 m_lock(&status.channelmutex, 5); 58 58 struct channel *node = channel; 59 59 60 60 while(node != NULL) … … 279 279 } 280 280 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); 282 282 if(ret == 11) 283 283 { 284 284 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) 293 288 { 294 289 if(count > 0) … … 309 304 if(newnode->servicetype != 99) 310 305 { 311 newnode->transponder = gettransponder(newnode->transponderid , newnode->orbitalpos);306 newnode->transponder = gettransponder(newnode->transponderid); 312 307 newnode->provider = getprovider(newnode->providerid); 313 308 status.writechannel = 1; … … 347 342 } 348 343 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)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, int pcrpid) 350 345 { 351 346 struct channel* chnode = NULL; … … 375 370 tmpstr = ostrcat(tmpstr, "#", 1, 0); 376 371 tmpstr = ostrcat(tmpstr, oitoa(pcrpid), 1, 1); 377 tmpstr = ostrcat(tmpstr, "#", 1, 0);378 tmpstr = ostrcat(tmpstr, oitoa(orbitalpos), 1, 1);379 372 380 373 chnode = addchannel(tmpstr, 1, NULL); … … 438 431 439 432 m_lock(&status.channelmutex, 5); 440 433 struct channel *node = channel, *prev = channel; 441 434 442 435 while(node != NULL) … … 502 495 node->name = NULL; 503 496 504 505 497 free(node->hbbtvurl); 498 node->hbbtvurl = NULL; 506 499 507 500 free(node); … … 719 712 continue; 720 713 } 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); 722 715 if(ret < 0) 723 716 { -
titan/titan/header.h
r36320 r36337 429 429 //channel.h 430 430 int 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);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); 432 432 void delchannelbytransponder(uint64_t transponderid); 433 433 struct channel* gettmpchannel(); … … 438 438 439 439 //transponder.h 440 struct transponder* gettransponder(uint64_t transponderid , int orbitalpos);440 struct transponder* gettransponder(uint64_t transponderid); 441 441 int writetransponder(const char *filename); 442 442 void deltransponderbyorbitalpos(int orbitalpos); -
titan/titan/hwtest.h
r36320 r36337 109 109 else 110 110 { 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); 112 112 if(chnode == NULL) 113 113 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 54 54 { 55 55 if(chnode->transponder == NULL) 56 tpnode = gettransponder(chnode->transponderid , chnode->orbitalpos);56 tpnode = gettransponder(chnode->transponderid); 57 57 else 58 58 tpnode = chnode->transponder; -
titan/titan/player.h
r36320 r36337 154 154 155 155 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); 157 157 if(chnode != NULL) chnode->pmtpid = pmtpid; 158 158 } -
titan/titan/rectimer.h
r36320 r36337 98 98 if(dvbdevsim == NULL) return 0; 99 99 100 tpnode = gettransponder(recnode->transponderid , recnode->orbitalpos);100 tpnode = gettransponder(recnode->transponderid); 101 101 dvbnode = fegetfree(tpnode, 3, dvbdevsim); 102 102 if(dvbnode != NULL) … … 109 109 if((recnode->begin >= node->begin && recnode->begin < node->end) || (recnode->end >= node->begin && recnode->end < node->end)) 110 110 { 111 tpnode = gettransponder(node->transponderid , node->orbitalpos);111 tpnode = gettransponder(node->transponderid); 112 112 dvbnode = fegetfree(tpnode, 3, dvbdevsim); 113 113 if(dvbnode == NULL) -
titan/titan/service.h
r36320 r36337 122 122 { 123 123 if(chnode->transponder == NULL) 124 tpnode = gettransponder(chnode->transponderid , chnode->orbitalpos);124 tpnode = gettransponder(chnode->transponderid); 125 125 else 126 126 tpnode = chnode->transponder; … … 1020 1020 chnode = getchannel(65535, 0); 1021 1021 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); 1024 1024 status.aktservice->channel = chnode; 1025 1025 } -
titan/titan/struct.h
r36320 r36337 87 87 #endif 88 88 89 #define DRIVER " ini-800 - 3.14.2 r5 - 20150708"89 #define DRIVER "20150113" 90 90 #define OVERSION "1.69" 91 91 #define PROGNAME "titan" 92 92 #define COPYRIGHT "NIT" 93 93 #define CRONTRIBUT "obi, gost" 94 #define PLUGINVERSION 194 #define PLUGINVERSION 0 95 95 96 96 #define _(x) gettext(x) … … 541 541 int tpnew; 542 542 int tvcount; 543 int tpdel;544 543 int newtvcount; 545 544 int radiocount; … … 734 733 char* channellist; 735 734 int serviceid; 736 int orbitalpos;737 735 //0 = nothing 738 736 //1 = running … … 791 789 { 792 790 uint64_t transponderid; 793 int orbitalpos;794 791 struct transponder* tpnode; 795 792 struct transpondercache* next; … … 1141 1138 int16_t aitpid; 1142 1139 uint8_t protect; 1143 int orbitalpos;1144 1140 char* hbbtvurl; 1145 1141 struct transponder *transponder; … … 1568 1564 //node oled blinken 1569 1565 int skinblink; 1570 int deltransponder;1571 1566 } status; 1572 1567
Note: See TracChangeset
for help on using the changeset viewer.