From e4b4903d2401bcdfc6fd27836c0ff93fd895cbc8 Mon Sep 17 00:00:00 2001 From: Andreas Mair Date: Tue, 12 Apr 2011 12:30:01 +0200 Subject: Fix using the VDR cutter. --- HISTORY | 2 +- tools.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index d3ae199..abe7c87 100644 --- a/HISTORY +++ b/HISTORY @@ -7,7 +7,7 @@ VDR Plugin 'extrecmenu' Revision History - [amair] Merged following changes from v1.3-devel head (Submitted by Joe_D @vdr-portal.de). - [amair] Lifetime and priority for TS recordings can be edited again. - [amair] Use international characters for renaming recordings and creating directories like VDR. -- [amair] Don't use the VDR cutter by default as this crashes VDR (Can be enabled by defining USE_VDR_CUTTER). +- [amair] Use the VDR cutter by default if VDR >= 1.7.16. - [amair] Updated Italian translation (Submitted by Diego Pierotto). - [amair] Enable support for PIN plugin if USE_PINPLUGIN is set to "1" in Make.config. - [amair] Reorganiced contrib directory. diff --git a/tools.c b/tools.c index e6d784a..fe7fe6e 100644 --- a/tools.c +++ b/tools.c @@ -13,6 +13,10 @@ #include "tools.h" #include "mymenusetup.h" +#if VDRVERSNUM > 10715 +# define USE_VDR_CUTTER +#endif + using namespace std; extern bool VfatFileSytem; @@ -309,8 +313,8 @@ void WorkerThread::Action() if(!CutRecording(cutteritem->FileName().c_str())) #else if (!cCutter::Start(cutteritem->FileName().c_str())) - Skins.QueueMessage(mtError,tr("Can't start editing process!")); #endif + Skins.QueueMessage(mtError,tr("Can't start editing process!")); #else // create filename for edited recording, check for recordings with this name, if exists -> delete recording // (based upon VDR's code (cutter.c)) -- cgit v1.2.3