frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved any locking from cutter.c into recording.c

Browse Source
This commit is contained in:
Klaus Schmidinger
2018-01-16 14:11:40 +01:00
parent e7936c8595
commit ae41be85c8
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
recording.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 4.16 2018/01/16 11:09:26 kls Exp $
* $Id: recording.c 4.17 2018/01/16 14:07:04 kls Exp $
*/
#include "recording.h"
@@ -1908,6 +1908,7 @@ bool cRecordingsHandlerEntry::Active(cRecordings *Recordings)
// Now check if there is something to start:
if ((Usage() & ruPending) != 0) {
if ((Usage() & ruCut) != 0) {
Recordings->AddByName(FileNameDst(), false);
cutter = new cCutter(FileNameSrc());
cutter->Start();
}
@@ -1932,6 +1933,14 @@ bool cRecordingsHandlerEntry::Active(cRecordings *Recordings)
void cRecordingsHandlerEntry::Cleanup(cRecordings *Recordings)
{
if ((usage & ruCut)) { // this was a cut operation...
if (cutter) { // ...which had not yet ended
delete cutter;
cutter = NULL;
}
cVideoDirectory::RemoveVideoFile(fileNameDst);
Recordings->DelByName(fileNameDst);
}
if ((usage & (ruMove | ruCopy)) // this was a move/copy operation...
&& ((usage & ruPending) // ...which had not yet started...
|| copier // ...or not yet finished...