Changeset 36571
- Timestamp:
- 12/14/15 20:07:40 (8 years ago)
- Location:
- titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/plugins/tithek/tithek.h
r36570 r36571 1472 1472 #endif 1473 1473 #ifdef EPLAYER4 1474 #ifdef MIPSEL 1474 1475 // mipsel work, disable http direct streams without buffer, after 3mins no memory (memleak in player.h ?) 1475 1476 if(ostrncmp("http://", tmpstr1, 7)) 1477 #endif 1476 1478 addmenulist(&mlist, "Streaming Playback GST (default)", _("Streaming Playback GST (default)"), NULL, 0, 0); 1477 1479 #endif -
titan/titan/play.h
r36553 r36571 1484 1484 { 1485 1485 #ifdef EPLAYER3 1486 if(ostrstr(file, "http://") == file && ostrstr(file, ".m3u8") == NULL) 1487 { 1488 struct stimerthread* bufferstatus = addtimer(&screenplaybufferstatus, START, 1000, 1, NULL, NULL, NULL); 1489 rcret = playerstart(file); 1490 if(bufferstatus != NULL && gettimer(bufferstatus) != NULL) 1486 if(status.extplayer != 2) 1487 { 1488 if(ostrstr(file, "http://") == file && ostrstr(file, ".m3u8") == NULL) 1491 1489 { 1492 bufferstatus->aktion = STOP; 1493 usleep(100000); 1494 } 1490 struct stimerthread* bufferstatus = addtimer(&screenplaybufferstatus, START, 1000, 1, NULL, NULL, NULL); 1491 rcret = playerstart(file); 1492 if(bufferstatus != NULL && gettimer(bufferstatus) != NULL) 1493 { 1494 bufferstatus->aktion = STOP; 1495 usleep(100000); 1496 } 1497 } 1498 else 1499 rcret = playerstart(file); 1495 1500 } 1496 1501 else … … 1545 1550 { 1546 1551 rcret = waitrc(playinfobar, rcwait, 0); 1547 #ifdef MIPSEL 1548 if(waitofbuffer == 1 && status.prefillbuffer == 0 && status.cleaninfobar == 1) 1549 { 1550 drawscreen(skin, 0, 0); 1551 screenplayinfobar(file, showname, 0, playertype, flag); 1552 waitofbuffer = 0; 1553 status.cleaninfobar = 0; 1554 1555 } 1556 else if(waitofbuffer == 0 && status.prefillbuffer == 0 && status.cleaninfobar == 0) 1552 #ifdef EPLAYER3 1553 if(status.extplayer != 2) 1557 1554 { 1558 1555 playinfobarcount++; … … 1564 1561 screenplayinfobar(NULL, NULL, 1, playertype, flag); 1565 1562 } 1566 } 1567 #else 1568 playinfobarcount++; 1569 if(playinfobarstatus > 0) 1570 screenplayinfobar(file, showname, 0, playertype, flag); 1571 if(playinfobarstatus == 1 && playinfobarcount >= getconfigint("infobartimeout", NULL)) 1563 1564 if(waitofbuffer == 1 && status.prefillbuffer == 0) 1565 { 1566 screenplayinfobar(file, showname, 0, playertype, flag); 1567 waitofbuffer = 0; 1568 } 1569 } 1570 #endif 1571 #ifdef EPLAYER4 1572 if(status.extplayer != 1) 1572 1573 { 1573 playinfobarstatus = 0; 1574 screenplayinfobar(NULL, NULL, 1, playertype, flag); 1575 } 1576 1577 if(waitofbuffer == 1 && status.prefillbuffer == 0) 1578 { 1579 screenplayinfobar(file, showname, 0, playertype, flag); 1580 waitofbuffer = 0; 1574 if(waitofbuffer == 1 && status.prefillbuffer == 0 && status.cleaninfobar == 1) 1575 { 1576 drawscreen(skin, 0, 0); 1577 screenplayinfobar(file, showname, 0, playertype, flag); 1578 waitofbuffer = 0; 1579 status.cleaninfobar = 0; 1580 1581 } 1582 else if(waitofbuffer == 0 && status.prefillbuffer == 0 && status.cleaninfobar == 0) 1583 { 1584 playinfobarcount++; 1585 if(playinfobarstatus > 0) 1586 screenplayinfobar(file, showname, 0, playertype, flag); 1587 if(playinfobarstatus == 1 && playinfobarcount >= getconfigint("infobartimeout", NULL)) 1588 { 1589 playinfobarstatus = 0; 1590 screenplayinfobar(NULL, NULL, 1, playertype, flag); 1591 } 1592 } 1581 1593 } 1582 1594 #endif
Note: See TracChangeset
for help on using the changeset viewer.