mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

generate correct camask

Browse Source 
Conflicts:
	src/driver/record.cpp
This commit is contained in:
DboxOldie
2021-01-23 23:18:06 +01:00
committed by Thilo Graf
parent e6cc52942b
commit 4fb1d19406
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver/record.cpp
View File

@@ -336,13 +336,14 @@ bool CRecordInstance::Stop(bool remove_event)
printf("%s: file %s.ts\n", __FUNCTION__, filename); printf("%s: file %s.ts\n", __FUNCTION__, filename);
SaveXml(); SaveXml();
/* Stop do close fd - if started */ /* Stop do close fd - if started */
/* Stop do close fd - if started */
record->Stop(); record->Stop();
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if(!autoshift) if(!autoshift)
CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing CFEManager::getInstance()->unlockFrontend(frontend, true);//FIXME testing
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if (autoshift && g_settings.timeshift_delete) if (autoshift && g_settings.timeshift_delete)
CMoviePlayerGui::getInstance().deleteTimeshift(); CMoviePlayerGui::getInstance().deleteTimeshift();

3
src/driver/streamts.cpp
View File

@@ -217,12 +217,13 @@ void CStreamInstance::run()
Send(r); Send(r);
} }
CCamManager::getInstance()->Stop(channel_id, CCamManager::STREAM);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if(frontend) if(frontend)
CFEManager::getInstance()->unlockFrontend(frontend); CFEManager::getInstance()->unlockFrontend(frontend);
//CZapit::getInstance()->SetRecordMode(false); //CZapit::getInstance()->SetRecordMode(false);
#endif #endif
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());