Changeset 15567
- Timestamp:
- 05/08/12 23:28:34 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/channellist.h
r15558 r15567 2 2 #define CHANNELLIST_H 3 3 4 int selectchannel(struct skin* listbox )4 int selectchannel(struct skin* listbox, int sid, unsigned long tid) 5 5 { 6 6 struct skin* node = listbox; … … 12 12 13 13 if(status.servicetype == 0) 14 chnode = getchannel(getconfigint("serviceid", NULL), getconfiglu("transponderid", NULL)); 14 { 15 if(sid != 0 && tid != 0) 16 chnode = getchannel(sid, tid); 17 else 18 chnode = getchannel(getconfigint("serviceid", NULL), getconfiglu("transponderid", NULL)); 19 } 15 20 else 16 chnode = getchannel(getconfigint("rserviceid", NULL), getconfiglu("rtransponderid", NULL)); 21 { 22 if(sid != 0 && tid != 0) 23 chnode = getchannel(sid, tid); 24 else 25 chnode = getchannel(getconfigint("rserviceid", NULL), getconfiglu("rtransponderid", NULL)); 26 } 17 27 18 28 if(chnode == NULL) … … 517 527 aktlist = (void*)mainbouquetnode; 518 528 showbouquetchannel(channellist, listbox, channeltimeline, mainbouquetnode->bouquet, flag); 519 selectchannel(listbox );529 selectchannel(listbox, 0, 0); 520 530 } 521 531 } … … 530 540 aktlist = (void*)(int)tmpstr[6]; 531 541 showazchannel(channellist, listbox, (int)tmpstr[6], flag); 532 selectchannel(listbox );542 selectchannel(listbox, 0, 0); 533 543 } 534 544 else if(ostrncmp("(SAT)-", tmpstr, 6) == 0 && strlen(tmpstr) > 6) … … 543 553 aktlist = (void*)satnode; 544 554 showsatchannel(channellist, listbox, satnode, flag); 545 selectchannel(listbox );555 selectchannel(listbox, 0, 0); 546 556 } 547 557 else if(ostrncmp("(PROVIDER)-", tmpstr, 11) == 0 && strlen(tmpstr) > 6) … … 556 566 aktlist = (void*)providernode; 557 567 showproviderchannel(channellist, listbox, providernode, flag); 558 selectchannel(listbox );568 selectchannel(listbox, 0, 0); 559 569 } 560 570 else … … 563 573 list = ALLCHANNEL; 564 574 showallchannel(channellist, listbox, flag); 565 selectchannel(listbox );575 selectchannel(listbox, 0, 0); 566 576 } 567 577 … … 648 658 if(rcret == getrcconfigint("rcmenu", NULL)) 649 659 { 660 int sid = 0; 661 unsigned long tid = 0; 662 if((list == ALLCHANNEL || list == SATCHANNEL || list == PROVIDERCHANNEL || list == AZCHANNEL || list == BOUQUETCHANNEL) && listbox->select->handle != NULL) 663 { 664 sid = ((struct channel*)listbox->select->handle)->serviceid; 665 tid = ((struct channel*)listbox->select->handle)->transponderid; 666 } 667 650 668 status.markmodus = 0; 651 669 movesel = NULL; … … 660 678 addscreenrc(channellist, listbox); 661 679 if(listmode == NOMODE && flag == 3) flag = 0; 680 662 681 if(nochanneltitle == 0) changechanneltitle(channellist, listmode, &oldtitle); 663 682 … … 665 684 delmarkedscreennodes(channellist, 2); 666 685 recalclist(list, aktlist, listmode, channellist, listbox, channeltimeline); 667 selectchannel(listbox );686 selectchannel(listbox, sid, tid); 668 687 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 669 688 drawscreen(channellist, 0); … … 895 914 delmarkedscreennodes(channellist, 2); 896 915 showallchannel(channellist, listbox, flag); 897 selectchannel(listbox );916 selectchannel(listbox, 0, 0); 898 917 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 899 918 drawchannellist(channellist, list, listbox); … … 1119 1138 showbouquetchannel(channellist, listbox, channeltimeline, (struct bouquet*)listbox->select->handle, flag); 1120 1139 delmarkedscreennodes(channellist, 2); 1121 selectchannel(listbox );1140 selectchannel(listbox, 0, 0); 1122 1141 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 1123 1142 drawchannellist(channellist, list, listbox); … … 1191 1210 showsatchannel(channellist, listbox, (struct sat*)listbox->select->handle, flag); 1192 1211 delmarkedscreennodes(channellist, 2); 1193 selectchannel(listbox );1212 selectchannel(listbox, 0, 0); 1194 1213 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 1195 1214 drawchannellist(channellist, list, listbox); … … 1255 1274 showazchannel(channellist, listbox, (int)listbox->select->handle, flag); 1256 1275 delmarkedscreennodes(channellist, 2); 1257 selectchannel(listbox );1276 selectchannel(listbox, 0, 0); 1258 1277 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 1259 1278 drawchannellist(channellist, list, listbox); … … 1327 1346 showproviderchannel(channellist, listbox, (struct provider*) listbox->select->handle, flag); 1328 1347 delmarkedscreennodes(channellist, 2); 1329 selectchannel(listbox );1348 selectchannel(listbox, 0, 0); 1330 1349 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 1331 1350 drawchannellist(channellist, list, listbox); … … 1336 1355 { 1337 1356 if(list == AZLIST) continue; 1357 1358 int sid = 0; 1359 unsigned long tid = 0; 1360 if((list == ALLCHANNEL || list == SATCHANNEL || list == PROVIDERCHANNEL || list == AZCHANNEL || list == BOUQUETCHANNEL) && listbox->select->handle != NULL) 1361 { 1362 sid = ((struct channel*)listbox->select->handle)->serviceid; 1363 tid = ((struct channel*)listbox->select->handle)->transponderid; 1364 } 1365 1338 1366 clearscreen(channellist); 1339 1367 if(listbox->select != NULL) … … 1356 1384 delmarkedscreennodes(channellist, 2); 1357 1385 recalclist(list, aktlist, listmode, channellist, listbox, channeltimeline); 1358 selectchannel(listbox );1386 selectchannel(listbox, sid, tid); 1359 1387 changebutton(listmode, b1, b2, b3, b4, b5, b6, b7, b8, b9); 1360 1388 drawscreen(channellist, 0);
Note: See TracChangeset
for help on using the changeset viewer.