mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 07:51:19 +02:00
streamts.cpp: pick ARM streaming from DDT (thx DboxOldie)
This commit is contained in:
@@ -203,12 +203,25 @@ void CStreamInstance::run()
|
|||||||
|
|
||||||
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
|
CCamManager::getInstance()->Start(channel_id, CCamManager::STREAM);
|
||||||
|
|
||||||
|
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||||
|
CFrontend *live_fe = CZapit::getInstance()->GetLiveFrontend();
|
||||||
|
if(live_fe)
|
||||||
|
CFEManager::getInstance()->unlockFrontend(live_fe);
|
||||||
|
if(frontend)
|
||||||
|
CFEManager::getInstance()->lockFrontend(frontend);
|
||||||
|
//CZapit::getInstance()->SetRecordMode(true);
|
||||||
|
#endif
|
||||||
while (running) {
|
while (running) {
|
||||||
ssize_t r = dmx->Read(buf, IN_SIZE, 100);
|
ssize_t r = dmx->Read(buf, IN_SIZE, 100);
|
||||||
if (r > 0)
|
if (r > 0)
|
||||||
Send(r);
|
Send(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||||
|
if(frontend)
|
||||||
|
CFEManager::getInstance()->unlockFrontend(frontend);
|
||||||
|
//CZapit::getInstance()->SetRecordMode(false);
|
||||||
|
#endif
|
||||||
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
|
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
|
||||||
|
|
||||||
printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());
|
printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());
|
||||||
@@ -359,7 +372,11 @@ CFrontend * CStreamManager::FindFrontend(CZapitChannel * channel)
|
|||||||
for (std::set<CFrontend*>::iterator ft = frontends.begin(); ft != frontends.end(); ++ft)
|
for (std::set<CFrontend*>::iterator ft = frontends.begin(); ft != frontends.end(); ++ft)
|
||||||
CFEManager::getInstance()->unlockFrontend(*ft);
|
CFEManager::getInstance()->unlockFrontend(*ft);
|
||||||
|
|
||||||
|
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
|
||||||
|
if (unlock && !frontend)
|
||||||
|
#else
|
||||||
if (unlock)
|
if (unlock)
|
||||||
|
#endif
|
||||||
CFEManager::getInstance()->unlockFrontend(live_fe);
|
CFEManager::getInstance()->unlockFrontend(live_fe);
|
||||||
|
|
||||||
CFEManager::getInstance()->Unlock();
|
CFEManager::getInstance()->Unlock();
|
||||||
|
Reference in New Issue
Block a user