Changeset 18557
- Timestamp:
- 11/12/12 22:39:52 (11 years ago)
- Location:
- titan/titan
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/epg.h
r18548 r18557 1436 1436 if(eitlen == 0 || chnode == NULL) 1437 1437 return; 1438 if( chnode == status.aktservice->channel && status.aktservice->type != CHANNEL)1438 if(flag == 0 && chnode == status.aktservice->channel && status.aktservice->type != CHANNEL) 1439 1439 return; 1440 1440 … … 1720 1720 1721 1721 akttime = time(NULL); 1722 if(chnode == NULL) 1723 { 1724 if(status.aktservice->channel != NULL && status.aktservice->channel->transponder != NULL && status.aktservice->channel->transponder->lastepg > akttime && status.aktservice->channel->epg != NULL) 1725 { 1726 debug(400, "skip epg read (%ld < %ld)", akttime, status.aktservice->channel->transponder->lastepg); 1727 skip = (status.aktservice->channel->transponder->lastepg - akttime) * 2; 1728 } 1729 } 1730 else 1731 { 1732 if(chnode->transponder != NULL && chnode->transponder->lastepg > akttime && chnode->epg != NULL) 1733 { 1734 debug(400, "skip epg read (%ld < %ld)", akttime, chnode->transponder->lastepg); 1735 skip = (chnode->transponder->lastepg - akttime) * 2; 1736 } 1722 if(chnode == NULL) chnode = status.aktservice->channel; 1723 1724 if(chnode != NULL && chnode->transponder != NULL && chnode->transponder->lastepg > akttime && chnode->epg != NULL) 1725 { 1726 debug(400, "skip epg read (%ld < %ld)", akttime, chnode->transponder->lastepg); 1727 skip = (chnode->transponder->lastepg - akttime) * 2; 1737 1728 } 1738 1729 … … 1760 1751 if(fenode == NULL) 1761 1752 { 1762 debug(400, "no frontend dev in aktservice");1753 debug(400, "no frontend dev in service"); 1763 1754 free(buf); 1764 1755 return 1; … … 1825 1816 debug(400, "epg no more new data, wait for next run"); 1826 1817 1827 if(chnode == NULL) 1828 { 1829 if(status.aktservice->channel != NULL && status.aktservice->channel->transponder != NULL) 1830 status.aktservice->channel->transponder->lastepg = time(NULL) + 7700; 1831 } 1832 else if(chnode->transponder != NULL) 1818 if(chnode == NULL && chnode->transponder != NULL) 1833 1819 chnode->transponder->lastepg = time(NULL) + 7700; 1834 1820 … … 1965 1951 } 1966 1952 1967 readeit(self, NULL, NULL, 0); 1953 if(status.epgscanlistthread == NULL) 1954 readeit(self, NULL, NULL, 0); 1968 1955 1969 1956 debug(400, "end epg thread on aktiv channel"); -
titan/titan/epgscan.h
r18431 r18557 173 173 174 174 end: 175 status.epgscanlistthread = NULL;176 175 epgscanlistclearscantime(); 177 176 … … 181 180 fclose(fd); 182 181 } 182 status.epgscanlistthread = NULL; 183 183 debug(400, "epgscan thread end"); 184 184 } -
titan/titan/standby.h
r18206 r18557 6 6 int rcret = 0, voltoff = 1; 7 7 struct skin* standbyscreen = getscreen("standby"); 8 struct stimerthread *epgscan = NULL;9 8 char* loctime = NULL, *tmpstr = NULL; 10 9 time_t lastrun = 0; … … 65 64 //start epg scanlist 66 65 lastrun = time(NULL); 67 epgscan = addtimer(&epgscanlistthread, START, 1000, 1, NULL, NULL, NULL); 66 if(status.epgscanlistthread == NULL) 67 status.epgscanlistthread = addtimer(&epgscanlistthread, START, 1000, 1, NULL, NULL, NULL); 68 68 } 69 69 free(loctime); loctime = 0; 70 70 } 71 71 72 if( gettimer(epgscan)!= NULL)72 if(status.epgscanlistthread != NULL) 73 73 { 74 74 int i = 0; 75 epgscan->aktion = STOP;76 while( gettimer(epgscan) != NULL && epgscan->status != DEACTIVE)75 status.epgscanlistthread->aktion = STOP; 76 while(status.epgscanlistthread != NULL) 77 77 { 78 78 usleep(100000);
Note: See TracChangeset
for help on using the changeset viewer.