mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo

Browse Source 
Conflicts:
	src/neutrino.cpp
This commit is contained in:
[CST] Bas
2012-10-16 10:54:47 +08:00
parent 00e9ba9467 b461483f2f
commit f0ce9aa6bb
31 changed files with 360 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/record.cpp
View File

@@ -231,8 +231,8 @@ bool CRecordInstance::Stop(bool remove_event)
CCamManager::getInstance()->Stop(channel_id, CCamManager::RECORD);
if((autoshift && g_settings.auto_delete) /* || autoshift_delete*/) {
snprintf(buf,sizeof(buf), "nice -n 20 rm -f \"%s.ts\" &", filename);
system(buf);
snprintf(buf,sizeof(buf), "\"%s.ts\"", filename);
my_system("nice", "-n20", "rm", "-f", buf);
snprintf(buf,sizeof(buf), "%s.xml", filename);
//autoshift_delete = false;
unlink(buf);
@@ -575,6 +575,8 @@ record_error_msg_t CRecordInstance::MakeFileName(CZapitChannel * channel)
return RECORD_INVALID_DIRECTORY;
/* fallback to g_settings.network_nfs_recordingdir */
Directory = std::string(g_settings.network_nfs_recordingdir);
}else{
return RECORD_INVALID_DIRECTORY;
}
}