1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
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)
|
GitWeb
