summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorschmirl <schmirl>2008-04-08 14:18:15 +0000
committerschmirl <schmirl>2008-04-08 14:18:15 +0000
commit34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b (patch)
tree0cb0bc89b73cbb62cfda77aa5a06f7b80691e9d4 /patches
parent9c60fb4e42bce2fd3b6d7d9c011f1688cddd4394 (diff)
downloadvdr-plugin-streamdev-34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b.tar.gz
vdr-plugin-streamdev-34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b.tar.bz2
- added gettext support (thanks to Rolf Ahrenberg)
- added vdr-1.6.0-ignore_missing_cam patch - dropped obsolete respect_ca patch - removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)
Diffstat (limited to 'patches')
-rw-r--r--patches/respect_ca.diff43
-rw-r--r--patches/vdr-1.6.0-ignore_missing_cam.diff13
2 files changed, 13 insertions, 43 deletions
diff --git a/patches/respect_ca.diff b/patches/respect_ca.diff
deleted file mode 100644
index 8240b19..0000000
--- a/patches/respect_ca.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-# The cannels.conf ca field can be used to bind a channel to a specific
-# device. The streamdev-client does not consider this information, so
-# there's no way to keep VDR from using streamdev for a specific
-# channel. Apply this patch if you need this feature.
-#
-# This fix should probably become part of streamdev. However as it
-# changes the behaviour of streamdev, I decided to keep it as a separate
-# patch until there is something like a new official streamdev release.
-#
---- client/device.h.bak 2006-11-09 12:25:21.000000000 +0100
-+++ client/device.h 2006-11-09 12:26:57.000000000 +0100
-@@ -50,6 +50,7 @@
- cStreamdevDevice(void);
- virtual ~cStreamdevDevice();
-
-+ virtual int ProvidesCa(const cChannel *Channel) const;
- virtual bool ProvidesSource(int Source) const;
- virtual bool ProvidesTransponder(const cChannel *Channel) const;
- virtual bool ProvidesChannel(const cChannel *Channel, int Priority = -1,
---- client/device.c.bak 2006-11-09 12:23:24.000000000 +0100
-+++ client/device.c 2006-11-09 12:35:48.000000000 +0100
-@@ -57,6 +57,12 @@
- #endif
- }
-
-+int cStreamdevDevice::ProvidesCa(const cChannel *Channel) const
-+{
-+ // Encrypted is acceptable for now. Will ask the server later.
-+ return Channel->Ca() <= CA_DVB_MAX ? cDevice::ProvidesCa(Channel) : 1;
-+}
-+
- bool cStreamdevDevice::ProvidesSource(int Source) const {
- Dprintf("ProvidesSource, Source=%d\n", Source);
- return false;
-@@ -78,7 +84,7 @@
- if (ClientSocket.DataSocket(siLive) != NULL
- && TRANSPONDER(Channel, m_Channel))
- res = true;
-- else {
-+ else if (ProvidesCa(Channel)) {
- res = prio && ClientSocket.ProvidesChannel(Channel, Priority);
- ndr = true;
- }
diff --git a/patches/vdr-1.6.0-ignore_missing_cam.diff b/patches/vdr-1.6.0-ignore_missing_cam.diff
new file mode 100644
index 0000000..60d93bd
--- /dev/null
+++ b/patches/vdr-1.6.0-ignore_missing_cam.diff
@@ -0,0 +1,13 @@
+--- device.c.orig 2008-03-28 11:47:25.000000000 +0100
++++ device.c 2008-03-28 11:47:09.000000000 +0100
+@@ -375,8 +375,8 @@
+ }
+ }
+ }
+- if (!NumUsableSlots)
+- return NULL; // no CAM is able to decrypt this channel
++// if (!NumUsableSlots)
++// return NULL; // no CAM is able to decrypt this channel
+ }
+
+ bool NeedsDetachReceivers = false;