Changeset 16303
- Timestamp:
- 06/06/12 18:08:10 (12 years ago)
- Location:
- titan/titan
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/channel.h
r16286 r16303 58 58 { 59 59 debug(1000, "in"); 60 struct channel *node = channel;61 60 62 61 m_lock(&status.channelmutex, 5); 62 struct channel *node = channel; 63 63 64 while(node != NULL) 64 65 { … … 279 280 { 280 281 //debug(1000, "in"); 281 struct channel *newnode = NULL, *prev = NULL, *node = channel;282 struct channel *newnode = NULL, *prev = NULL, *node = NULL; 282 283 char *name = NULL; 283 284 int ret = 0; … … 328 329 329 330 m_lock(&status.channelmutex, 5); 331 node = channel; 330 332 331 333 modifychannelcache(newnode->serviceid, newnode->transponderid, newnode); … … 444 446 debug(1000, "in"); 445 447 int ret = 1; 446 struct channel *node = channel, *prev = channel;447 448 struct provider* providernode = NULL; 448 449 449 450 m_lock(&status.channelmutex, 5); 451 struct channel *node = channel, *prev = channel; 450 452 451 453 while(node != NULL) … … 567 569 debug(1000, "in"); 568 570 FILE *fd = NULL; 569 struct channel *node = channel;571 struct channel *node = NULL; 570 572 int ret = 0; 571 573 … … 578 580 579 581 m_lock(&status.channelmutex, 5); 582 node = channel; 583 580 584 while(node != NULL) 581 585 { -
titan/titan/dmxdev.h
r15914 r16303 31 31 debug(1000, "in"); 32 32 int fd = -1; 33 struct dvbdev* node = dvbdev;34 33 35 34 if(fenode == NULL) return NULL; 36 35 37 36 m_lock(&status.dmxdevmutex, 9); 37 struct dvbdev* node = dvbdev; 38 38 39 39 while(node != NULL) -
titan/titan/linkedchannel.h
r11897 r16303 64 64 if(status.aktservice->channel != NULL) 65 65 { 66 m_lock(&status.linkedchannelmutex, 14); 66 67 if(status.aktservice->channel->linkedchannel == NULL) 67 68 { … … 83 84 } 84 85 85 m_lock(&status.linkedchannelmutex, 14);86 86 if(node == NULL) 87 87 node = status.aktservice->channel->linkedchannel; -
titan/titan/mediadb.h
r16293 r16303 200 200 struct mediadbfilter* addmediadbfilter(struct mediadb* mnode, int count, struct mediadbfilter* last) 201 201 { 202 struct mediadbfilter *newnode = NULL, *prev = NULL, *node = mediadbfilter; 202 m_lock(&status.mediadbmutex, 17); 203 204 struct mediadbfilter *newnode = NULL, *prev = NULL, *node = NULL; 203 205 204 206 if(mnode == NULL) return NULL; … … 215 217 216 218 m_lock(&status.mediadbmutex, 17); 219 node = mediadbfilter; 217 220 218 221 if(last == NULL) … … 250 253 struct mediadbcategory* addmediadbcategory(char* line, int type, int count, struct mediadbcategory* last, int flag) 251 254 { 252 struct mediadbcategory *newnode = NULL, *prev = NULL, *node = mediadbcategory;255 struct mediadbcategory *newnode = NULL, *prev = NULL, *node = NULL; 253 256 char* name = NULL; 254 257 int ret = 0; … … 299 302 300 303 if(flag == 0) m_lock(&status.mediadbmutex, 17); 304 node = mediadbcategory; 301 305 302 306 if(last == NULL) … … 408 412 { 409 413 //debug(1000, "in"); 410 struct mediadb *newnode = NULL, *prev = NULL, *node = mediadb, *nnode = NULL;414 struct mediadb *newnode = NULL, *prev = NULL, *node = NULL, *nnode = NULL; 411 415 int ret = 0, free1 = 0; 412 416 … … 542 546 543 547 if(flag == 0) m_lock(&status.mediadbmutex, 17); 548 node = mediadb; 544 549 545 550 if(last == NULL) … … 804 809 debug(1000, "in"); 805 810 int ret = 1; 806 struct mediadbfilter *node = mediadbfilter, *prev = mediadbfilter;807 811 808 812 m_lock(&status.mediadbmutex, 17); 813 struct mediadbfilter *node = mediadbfilter, *prev = mediadbfilter; 809 814 810 815 while(node != NULL) … … 845 850 debug(1000, "in"); 846 851 int ret = 1; 847 struct mediadbcategory *node = mediadbcategory, *prev = mediadbcategory;848 852 849 853 m_lock(&status.mediadbmutex, 17); 854 struct mediadbcategory *node = mediadbcategory, *prev = mediadbcategory; 850 855 851 856 while(node != NULL) … … 889 894 debug(1000, "in"); 890 895 int ret = 1; 891 struct mediadb *node = mediadb, *prev = mediadb;892 896 893 897 m_lock(&status.mediadbmutex, 17); 898 struct mediadb *node = mediadb, *prev = mediadb; 894 899 895 900 while(node != NULL) … … 977 982 debug(1000, "in"); 978 983 FILE *fd = NULL; 979 struct mediadbcategory *node = mediadbcategory;984 struct mediadbcategory *node = NULL; 980 985 int ret = 0; 981 986 … … 988 993 989 994 m_lock(&status.mediadbmutex, 17); 995 node = mediadbcategory; 990 996 991 997 while(node != NULL) … … 1010 1016 debug(1000, "in"); 1011 1017 FILE *fd = NULL; 1012 struct mediadb *node = mediadb;1018 struct mediadb *node = NULL; 1013 1019 int ret = 0; 1014 1020 … … 1021 1027 1022 1028 m_lock(&status.mediadbmutex, 17); 1029 node = mediadb; 1023 1030 1024 1031 while(node != NULL) … … 1475 1482 { 1476 1483 struct imdb* imdb = NULL; 1484 struct tmdb* tmdb = NULL; 1477 1485 1478 1486 //create imdb search name … … 1497 1505 } 1498 1506 #endif 1507 1499 1508 #ifdef SIMULATE 1500 1509 tmdb = gettmdb(imdb->id, 1, 1, 0); … … 1541 1550 #endif 1542 1551 imdb = NULL; 1552 1543 1553 #ifdef SIMULATE 1544 1554 freetmdb(tmdb); -
titan/titan/player.h
r16286 r16303 206 206 } 207 207 208 //TODO: warum der sleep? 208 209 usleep(500000); 209 210 m_lock(&status.tsseekmutex, 15); -
titan/titan/rectimer.h
r16286 r16303 325 325 { 326 326 int ret = 0; 327 struct rectimer* node = rectimer, *newnode = NULL;327 struct rectimer* node = NULL, *newnode = NULL; 328 328 struct channel* chnode = NULL; 329 329 time_t t = time(NULL), begin = 0, end = 0; 330 330 331 331 m_lock(&status.rectimermutex, 1); 332 node = rectimer; 332 333 333 334 while(node != NULL) … … 487 488 { 488 489 debug(1000, "in"); 489 struct rectimer *node = rectimer, *prev = rectimer; 490 491 if(flag == 0) 492 m_lock(&status.rectimermutex, 1); 490 491 if(flag == 0) m_lock(&status.rectimermutex, 1); 492 struct rectimer *node = rectimer, *prev = rectimer; 493 493 494 494 while(node != NULL) … … 595 595 debug(1000, "in"); 596 596 FILE *fd = NULL; 597 struct rectimer *node = rectimer;597 struct rectimer *node = NULL; 598 598 int ret = 0; 599 599 char* type = NULL; … … 603 603 604 604 if(flag == 0) m_lock(&status.rectimermutex, 1); 605 node = rectimer; 605 606 606 607 fd = fopen(filename, "w"); -
titan/titan/timerthread.h
r14039 r16303 24 24 { 25 25 debug(1000, "in"); 26 struct stimerthread *newnode = NULL, *prev = NULL, *node = stimerthread;26 struct stimerthread *newnode = NULL, *prev = NULL, *node = NULL; 27 27 28 28 newnode = (struct stimerthread*)malloc(sizeof(struct stimerthread)); … … 43 43 44 44 m_lock(&status.timerthreadmutex, 6); 45 node = stimerthread; 46 45 47 if(last == NULL) 46 48 {
Note: See TracChangeset
for help on using the changeset viewer.