summaryrefslogtreecommitdiff
path: root/patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base
diff options
context:
space:
mode:
authorLars Heer <l.heer@gmx.de>2013-09-18 05:50:03 +0200
committerLars Heer <l.heer@gmx.de>2013-09-18 05:50:03 +0200
commitccf6e0f9c6b0481ed13e0f4794e3fbead750f385 (patch)
treeed86efb54f7ee41edfba5c89ca519b5fd10aa0d5 /patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base
downloadvdr-plugin-mcli-ccf6e0f9c6b0481ed13e0f4794e3fbead750f385.tar.gz
vdr-plugin-mcli-ccf6e0f9c6b0481ed13e0f4794e3fbead750f385.tar.bz2
added vdr-plugin-mcli-0.0.1+svn20120927
Diffstat (limited to 'patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base')
-rw-r--r--patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base b/patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base
new file mode 100644
index 0000000..3d1bea4
--- /dev/null
+++ b/patches/.svn/text-base/vdr-1.6-section-read-abstraction.patch.svn-base
@@ -0,0 +1,38 @@
+--- ../vdr-1.6.0/device.c 2009-01-26 20:26:49.000000000 +0100
++++ device.c 2009-01-26 23:12:59.000000000 +0100
+@@ -674,6 +680,11 @@
+ return -1;
+ }
+
++int cDevice::ReadFilter(int Handle, void *Buffer, size_t Length)
++{
++ return safe_read(Handle, Buffer, Length);
++}
++
+ void cDevice::CloseFilter(int Handle)
+ {
+ close(Handle);
+--- ../vdr-1.6.0/device.h 2009-01-26 20:26:49.000000000 +0100
++++ device.h 2009-01-26 23:12:41.000000000 +0100
+@@ -317,6 +317,10 @@
+ ///< Opens a file handle for the given filter data.
+ ///< A derived device that provides section data must
+ ///< implement this function.
++ virtual int ReadFilter(int Handle, void *Buffer, size_t Length);
++ ///< Read from a handle for the given filter data.
++ ///< a derived class need not implement this function, because this
++ ///< is done by the default implementation.
+ virtual void CloseFilter(int Handle);
+ ///< Closes a file handle that has previously been opened
+ ///< by OpenFilter(). If this is as simple as calling close(Handle),
+--- ../vdr-1.6.0/sections.c 2007-10-14 14:52:07.000000000 +0200
++++ sections.c 2009-01-26 23:14:00.000000000 +0100
+@@ -198,7 +198,7 @@
+ if (fh) {
+ // Read section data:
+ unsigned char buf[4096]; // max. allowed size for any EIT section
+- int r = safe_read(fh->handle, buf, sizeof(buf));
++ int r = device->ReadFilter(fh->handle, buf, sizeof(buf));
+ if (!DeviceHasLock)
+ continue; // we do the read anyway, to flush any data that might have come from a different transponder
+ if (r > 3) { // minimum number of bytes necessary to get section length