summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-plugins/vdr-osdpip/files/vdr-osdpip.diff')
-rw-r--r--media-plugins/vdr-osdpip/files/vdr-osdpip.diff66
1 files changed, 0 insertions, 66 deletions
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip.diff b/media-plugins/vdr-osdpip/files/vdr-osdpip.diff
deleted file mode 100644
index 80fe038..0000000
--- a/media-plugins/vdr-osdpip/files/vdr-osdpip.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nru vdr-osdpip.org/osd.c vdr-osdpip/osd.c
---- vdr-osdpip.org/osd.c 2008-12-25 07:50:50.000000000 +0100
-+++ vdr-osdpip/osd.c 2008-12-25 10:36:44.000000000 +0100
-@@ -65,7 +65,7 @@
- const cChannel *chan = cDevice::CurrentChannel() != 0 ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
- if (chan) {
- Channels.SwitchTo(m_Channel->Number());
-- cDevice *dev = cDevice::GetDevice(chan, 1);
-+ cDevice *dev = cDevice::GetDevice(chan, 1,true);
- if (dev) {
- DELETENULL(m_Receiver);
- m_Channel = chan;
-@@ -97,7 +97,7 @@
- // try only channels which are currently available
- bool ndr = false;
- dev = cDevice::GetDevice(channel, 0, &ndr);
-- if (dev && !ndr && !cStatus::MsgChannelProtected(0, channel)) // PIN PATCH
-+ if (dev && !ndr ) // PIN PATCH
- break;
- n = channel->Number() + Direction;
- }
-@@ -129,7 +129,7 @@
- {
- const cChannel *chan = cDevice::CurrentChannel() != 0 ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
- if (chan) {
-- cDevice *dev = cDevice::GetDevice(chan, 1);
-+ cDevice *dev = cDevice::GetDevice(chan, 1,true);
- if (dev) {
- DELETENULL(m_Receiver);
- m_Channel = chan;
-diff -Nru vdr-osdpip.org/osdpip.c vdr-osdpip/osdpip.c
---- vdr-osdpip.org/osdpip.c 2008-12-25 07:50:50.000000000 +0100
-+++ vdr-osdpip/osdpip.c 2008-12-25 10:33:55.000000000 +0100
-@@ -118,7 +118,7 @@
- ? Channels.GetByNumber(cDevice::CurrentChannel()) : NULL;
- if (chan != NULL)
- {
-- dev = cDevice::GetDevice(chan, 1);
-+ dev = cDevice::GetDevice(chan, 1, true);
- if (dev)
- {
- printf
-diff -Nru vdr-osdpip.org/receiver.c vdr-osdpip/receiver.c
---- vdr-osdpip.org/receiver.c 2008-12-25 07:50:50.000000000 +0100
-+++ vdr-osdpip/receiver.c 2008-12-25 10:55:21.000000000 +0100
-@@ -15,7 +15,7 @@
-
- cOsdPipReceiver::cOsdPipReceiver(const cChannel * Channel,
- cPipPlayer * pipplayer):
--cReceiver(Channel->Ca(), 0, Channel->Vpid()),
-+cReceiver(Channel->GetChannelID(), 0, Channel->Vpid(),0,0,0),
- player(pipplayer)
- {
- //printf("cOsdPipReceiver::cOsdPipReceiver\n");
-diff -Nru vdr-osdpip.org/osd.c vdr-osdpip/osd.c
---- vdr-osdpip.org/osd.c 2008-12-29 16:11:03.000000000 +0100
-+++ vdr-osdpip/osd.c 2008-12-29 16:11:41.000000000 +0100
-@@ -175,7 +175,7 @@
- if (state == osUnknown) {
- switch (Key & ~k_Repeat)
- {
-- case kGreater:
-+ case kRight:
- if (OsdPipSetup.PipPosition == kInfoTopLeft)
- OsdPipSetup.PipPosition = kInfoTopRight;
- else if (OsdPipSetup.PipPosition == kInfoBottomLeft)