[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.18-2_ctvdr1-20-g18ee3d5
etobi
git at e-tobi.net
Fri Aug 19 22:37:31 UTC 2011
The following commit has been merged in the e-tobi branch:
commit 18ee3d58054d4d0c60de8b334d9e97c021b20ee3
Author: etobi <git at e-tobi.net>
Date: Fri Aug 19 23:46:27 2011 +0200
Updated opt-52_hard_link_cutter.dpatch
diff --git a/debian/changelog b/debian/changelog
index 5ff884a..0dc218f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ vdr (1.7.20-1~ctvdr1) unstable; urgency=low
* Updated opt-27_ttxtsubs.dpatch
* Updated opt-39_noepg.dpatch
* Updated opt-44_rotor.dpatch
+ * Updated opt-52_hard_link_cutter.dpatch
-- Tobias Grimm <etobi at debian.org> Fri, 19 Aug 2011 23:16:41 +0200
diff --git a/debian/patches/opt-52_hard_link_cutter.dpatch b/debian/patches/opt-52_hard_link_cutter.dpatch
index 0e866a8..1749080 100644
--- a/debian/patches/opt-52_hard_link_cutter.dpatch
+++ b/debian/patches/opt-52_hard_link_cutter.dpatch
@@ -15,9 +15,9 @@
## DP: possible to speed up editing recordings noticeably.
@DPATCH@
-diff -Naurp vdr-1.7.14/README-HLCUTTER vdr-1.7.14-cutter/README-HLCUTTER
---- vdr-1.7.14/README-HLCUTTER 1970-01-01 00:00:00.000000000 +0000
-+++ vdr-1.7.14-cutter/README-HLCUTTER 2010-03-14 17:35:55.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/README-HLCUTTER vdr/README-HLCUTTER
+--- vdr~/README-HLCUTTER 1970-01-01 01:00:00.000000000 +0100
++++ vdr/README-HLCUTTER 2011-08-19 23:13:24.000000000 +0200
@@ -0,0 +1,117 @@
+
+ VDR-HLCUTTER README
@@ -136,10 +136,10 @@ diff -Naurp vdr-1.7.14/README-HLCUTTER vdr-1.7.14-cutter/README-HLCUTTER
+
+
+SetBrokenLink may get lost on rare cases, this needs some more thoughts.
-diff -Naurp vdr-1.7.14/config.c vdr-1.7.14-cutter/config.c
---- vdr-1.7.14/config.c 2010-03-12 16:41:37.000000000 +0000
-+++ vdr-1.7.14-cutter/config.c 2010-03-14 17:43:56.000000000 +0000
-@@ -383,7 +383,9 @@ cSetup::cSetup(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.c vdr/config.c
+--- vdr~/config.c 2011-08-19 23:13:24.000000000 +0200
++++ vdr/config.c 2011-08-19 23:13:24.000000000 +0200
+@@ -392,7 +392,9 @@
FontSmlSize = 18;
FontFixSize = 20;
MaxVideoFileSize = MAXVIDEOFILESIZEDEFAULT;
@@ -149,7 +149,7 @@ diff -Naurp vdr-1.7.14/config.c vdr-1.7.14-cutter/config.c
DelTimeshiftRec = 0;
MinEventTimeout = 30;
MinUserInactivity = 300;
-@@ -573,7 +575,9 @@ bool cSetup::Parse(const char *Name, con
+@@ -609,7 +611,9 @@
else if (!strcasecmp(Name, "FontSmlSize")) FontSmlSize = atoi(Value);
else if (!strcasecmp(Name, "FontFixSize")) FontFixSize = atoi(Value);
else if (!strcasecmp(Name, "MaxVideoFileSize")) MaxVideoFileSize = atoi(Value);
@@ -159,7 +159,7 @@ diff -Naurp vdr-1.7.14/config.c vdr-1.7.14-cutter/config.c
else if (!strcasecmp(Name, "DelTimeshiftRec")) DelTimeshiftRec = atoi(Value);
else if (!strcasecmp(Name, "MinEventTimeout")) MinEventTimeout = atoi(Value);
else if (!strcasecmp(Name, "MinUserInactivity")) MinUserInactivity = atoi(Value);
-@@ -668,7 +672,9 @@ bool cSetup::Save(void)
+@@ -721,7 +725,9 @@
Store("FontSmlSize", FontSmlSize);
Store("FontFixSize", FontFixSize);
Store("MaxVideoFileSize", MaxVideoFileSize);
@@ -169,10 +169,10 @@ diff -Naurp vdr-1.7.14/config.c vdr-1.7.14-cutter/config.c
Store("DelTimeshiftRec", DelTimeshiftRec);
Store("MinEventTimeout", MinEventTimeout);
Store("MinUserInactivity", MinUserInactivity);
-diff -Naurp vdr-1.7.14/config.h vdr-1.7.14-cutter/config.h
---- vdr-1.7.14/config.h 2010-03-12 16:02:53.000000000 +0000
-+++ vdr-1.7.14-cutter/config.h 2010-03-14 17:38:29.000000000 +0000
-@@ -276,7 +276,9 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/config.h vdr/config.h
+--- vdr~/config.h 2011-08-19 23:13:24.000000000 +0200
++++ vdr/config.h 2011-08-19 23:13:24.000000000 +0200
+@@ -289,7 +289,9 @@
int FontSmlSize;
int FontFixSize;
int MaxVideoFileSize;
@@ -182,10 +182,10 @@ diff -Naurp vdr-1.7.14/config.h vdr-1.7.14-cutter/config.h
int DelTimeshiftRec;
int MinEventTimeout, MinUserInactivity;
time_t NextWakeupTime;
-diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
---- vdr-1.7.14/cutter.c 2010-01-02 13:08:08.000000000 +0000
-+++ vdr-1.7.14-cutter/cutter.c 2010-03-14 17:35:55.000000000 +0000
-@@ -78,6 +78,7 @@ void cCuttingThread::Action(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/cutter.c vdr/cutter.c
+--- vdr~/cutter.c 2011-08-19 23:13:24.000000000 +0200
++++ vdr/cutter.c 2011-08-19 23:13:24.000000000 +0200
+@@ -79,6 +79,7 @@
Mark = fromMarks.Next(Mark);
off_t FileSize = 0;
int CurrentFileNumber = 0;
@@ -193,7 +193,7 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
int LastIFrame = 0;
toMarks.Add(0);
toMarks.Save();
-@@ -96,12 +97,92 @@ void cCuttingThread::Action(void)
+@@ -97,12 +98,92 @@
// Read one frame:
@@ -292,7 +292,7 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
if (fromFile) {
int len = ReadFrame(fromFile, buffer, Length, sizeof(buffer));
if (len < 0) {
-@@ -118,19 +199,12 @@ void cCuttingThread::Action(void)
+@@ -119,19 +200,12 @@
break;
}
}
@@ -313,7 +313,7 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
toFile = toFileName->NextFile();
if (!toFile) {
error = "toFile 1";
-@@ -140,7 +214,7 @@ void cCuttingThread::Action(void)
+@@ -141,7 +215,7 @@
}
LastIFrame = 0;
@@ -322,7 +322,7 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
if (isPesRecording)
cRemux::SetBrokenLink(buffer, Length);
else
-@@ -148,7 +222,7 @@ void cCuttingThread::Action(void)
+@@ -149,7 +223,7 @@
cutIn = false;
}
}
@@ -331,7 +331,7 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
error = "safe_write";
break;
}
-@@ -183,7 +257,7 @@ void cCuttingThread::Action(void)
+@@ -184,7 +258,7 @@
}
}
else
@@ -340,29 +340,35 @@ diff -Naurp vdr-1.7.14/cutter.c vdr-1.7.14-cutter/cutter.c
}
}
Recordings.TouchUpdate();
-diff -Naurp vdr-1.7.14/menu.c vdr-1.7.14-cutter/menu.c
---- vdr-1.7.14/menu.c 2010-03-12 16:03:07.000000000 +0000
-+++ vdr-1.7.14-cutter/menu.c 2010-03-14 17:35:55.000000000 +0000
-@@ -3056,1 +3056,3 @@ cMenuSetupRecord::cMenuSetupRecord(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/menu.c vdr/menu.c
+--- vdr~/menu.c 2011-08-19 23:13:24.000000000 +0200
++++ vdr/menu.c 2011-08-19 23:13:24.000000000 +0200
+@@ -3465,7 +3465,9 @@
+ Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord)));
+ Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
+ Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
+ Add(new cMenuEditIntItem( tr("Setup.Recording$Max. recording size (GB)"), &data.MaxRecordingSize, MINRECORDINGSIZE, MAXRECORDINGSIZE));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
+ Add(new cMenuEditBoolItem(tr("Setup.Recording$Hard Link Cutter"), &data.HardLinkCutter));
-diff -Naurp vdr-1.7.14/recorder.c vdr-1.7.14-cutter/recorder.c
---- vdr-1.7.14/recorder.c 2010-01-29 16:37:22.000000000 +0000
-+++ vdr-1.7.14-cutter/recorder.c 2010-03-14 17:35:55.000000000 +0000
-@@ -87,7 +87,7 @@ bool cRecorder::RunningLowOnDiskSpace(vo
+ Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
+ Add(new cMenuEditBoolItem(tr("Setup.Recording$Show date"), &data.ShowRecDate));
+ Add(new cMenuEditBoolItem(tr("Setup.Recording$Show time"), &data.ShowRecTime));
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/recorder.c vdr/recorder.c
+--- vdr~/recorder.c 2011-08-19 21:49:49.000000000 +0200
++++ vdr/recorder.c 2011-08-19 23:14:09.000000000 +0200
+@@ -89,7 +89,7 @@
bool cRecorder::NextFile(void)
{
- if (recordFile && frameDetector->IndependentFrame()) { // every file shall start with an independent frame
+ if (recordFile) {
- if (fileSize > MEGABYTE(off_t(Setup.MaxVideoFileSize)) || RunningLowOnDiskSpace()) {
+ if (fileSize > fileName->MaxFileSize() || RunningLowOnDiskSpace()) {
recordFile = fileName->NextFile();
fileSize = 0;
}
-diff -Naurp vdr-1.7.14/recording.c vdr-1.7.14-cutter/recording.c
---- vdr-1.7.14/recording.c 2010-03-07 14:06:04.000000000 +0000
-+++ vdr-1.7.14-cutter/recording.c 2010-03-14 17:35:55.000000000 +0000
-@@ -1935,6 +1935,20 @@ cUnbufferedFile *cFileName::SetOffset(in
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/recording.c vdr/recording.c
+--- vdr~/recording.c 2011-08-19 23:13:24.000000000 +0200
++++ vdr/recording.c 2011-08-19 23:13:24.000000000 +0200
+@@ -2080,6 +2080,20 @@
return NULL;
}
@@ -383,10 +389,10 @@ diff -Naurp vdr-1.7.14/recording.c vdr-1.7.14-cutter/recording.c
cUnbufferedFile *cFileName::NextFile(void)
{
return SetOffset(fileNumber + 1);
-diff -Naurp vdr-1.7.14/recording.h vdr-1.7.14-cutter/recording.h
---- vdr-1.7.14/recording.h 2010-03-07 14:06:15.000000000 +0000
-+++ vdr-1.7.14-cutter/recording.h 2010-03-14 17:35:55.000000000 +0000
-@@ -220,9 +220,17 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/recording.h vdr/recording.h
+--- vdr~/recording.h 2011-08-19 23:13:24.000000000 +0200
++++ vdr/recording.h 2011-08-19 23:13:24.000000000 +0200
+@@ -233,9 +233,17 @@
// before the next independent frame, to have a complete Group Of Pictures):
#define MAXVIDEOFILESIZETS 1048570 // MB
#define MAXVIDEOFILESIZEPES 2000 // MB
@@ -405,7 +411,7 @@ diff -Naurp vdr-1.7.14/recording.h vdr-1.7.14-cutter/recording.h
struct tIndexTs;
class cIndexFileGenerator;
-@@ -271,6 +279,8 @@ public:
+@@ -288,6 +296,8 @@
cUnbufferedFile *Open(void);
void Close(void);
cUnbufferedFile *SetOffset(int Number, off_t Offset = 0); // yes, Number is int for easier internal calculating
@@ -414,9 +420,9 @@ diff -Naurp vdr-1.7.14/recording.h vdr-1.7.14-cutter/recording.h
cUnbufferedFile *NextFile(void);
};
-diff -Naurp vdr-1.7.14/videodir.c vdr-1.7.14-cutter/videodir.c
---- vdr-1.7.14/videodir.c 2008-02-16 13:00:03.000000000 +0000
-+++ vdr-1.7.14-cutter/videodir.c 2010-03-14 17:35:55.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/videodir.c vdr/videodir.c
+--- vdr~/videodir.c 2011-06-19 19:09:50.000000000 +0200
++++ vdr/videodir.c 2011-08-19 23:13:24.000000000 +0200
@@ -19,6 +19,9 @@
#include "recording.h"
#include "tools.h"
@@ -427,7 +433,7 @@ diff -Naurp vdr-1.7.14/videodir.c vdr-1.7.14-cutter/videodir.c
const char *VideoDirectory = VIDEODIR;
class cVideoDirectory {
-@@ -168,6 +171,120 @@ bool RemoveVideoFile(const char *FileNam
+@@ -168,6 +171,120 @@
return RemoveFileOrDir(FileName, true);
}
@@ -548,10 +554,10 @@ diff -Naurp vdr-1.7.14/videodir.c vdr-1.7.14-cutter/videodir.c
bool VideoFileSpaceAvailable(int SizeMB)
{
cVideoDirectory Dir;
-diff -Naurp vdr-1.7.14/videodir.h vdr-1.7.14-cutter/videodir.h
---- vdr-1.7.14/videodir.h 2008-02-16 12:53:11.000000000 +0000
-+++ vdr-1.7.14-cutter/videodir.h 2010-03-14 17:35:55.000000000 +0000
-@@ -19,6 +19,7 @@ cUnbufferedFile *OpenVideoFile(const cha
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr~/videodir.h vdr/videodir.h
+--- vdr~/videodir.h 2011-06-19 19:09:50.000000000 +0200
++++ vdr/videodir.h 2011-08-19 23:13:24.000000000 +0200
+@@ -19,6 +19,7 @@
int CloseVideoFile(cUnbufferedFile *File);
bool RenameVideoFile(const char *OldName, const char *NewName);
bool RemoveVideoFile(const char *FileName);
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list