mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 23:42:58 +02:00
generate correct camask
Conflicts: src/driver/record.cpp
This commit is contained in:
@@ -336,13 +336,14 @@ bool CRecordInstance::Stop(bool remove_event)
|
||||
printf("%s: file %s.ts\n", __FUNCTION__, filename);
|
||||
SaveXml();
|
||||
/* Stop do close fd - if started */
|
||||
/* Stop do close fd - if started */
|
||||
record->Stop();
|
||||
|
||||
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
|
||||
|
||||
if(!autoshift)
|
||||
CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
|
||||
|
||||
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
|
||||
|
||||
if (autoshift && g_settings.timeshift_delete)
|
||||
CMoviePlayerGui::getInstance().deleteTimeshift();
|
||||
|
||||
|
@@ -217,12 +217,13 @@ void CStreamInstance::run()
|
||||
Send(r);
|
||||
}
|
||||
|
||||
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
|
||||
|
||||
#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);
|
||||
|
||||
printf("CStreamInstance::run: exiting %" PRIx64 " (%d fds)\n", channel_id, (int)fds.size());
|
||||
|
||||
|
Reference in New Issue
Block a user