1 |
zzam 07/09/30 14:28:08 |
2 |
|
3 |
Added: vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff |
4 |
Log: |
5 |
Make it compile with vdr-1.5.9 |
6 |
(Portage version: 2.1.3.11) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff |
15 |
=================================================================== |
16 |
--- osd.c.~1.7.~ 2007-03-14 19:51:01.000000000 +0200 |
17 |
+++ osd.c 2007-09-01 11:47:04.000000000 +0300 |
18 |
@@ -148,8 +148,12 @@ |
19 |
} |
20 |
} |
21 |
|
22 |
-cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y) |
23 |
+cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level) |
24 |
+#if VDRVERSNUM >= 10509 |
25 |
+ : cOsd(x, y, Level), m_IsVisible(true) |
26 |
+#else |
27 |
: cOsd(x, y), m_IsVisible(true) |
28 |
+#endif |
29 |
{ |
30 |
TRACEF("cXinelibOsd::cXinelibOsd"); |
31 |
|
32 |
@@ -341,7 +345,11 @@ |
33 |
} |
34 |
} |
35 |
|
36 |
+#if VDRVERSNUM >= 10509 |
37 |
+cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top, uint Level) |
38 |
+#else |
39 |
cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top) |
40 |
+#endif |
41 |
{ |
42 |
TRACEF("cXinelibOsdProvider::CreateOsd"); |
43 |
|
44 |
@@ -350,7 +358,11 @@ |
45 |
if(cXinelibOsd::m_OsdStack.First()) |
46 |
LOGMSG("cXinelibOsdProvider::CreateOsd - OSD already open !"); |
47 |
|
48 |
+#if VDRVERSNUM >= 10509 |
49 |
+ cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top, Level); |
50 |
+#else |
51 |
cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top); |
52 |
+#endif |
53 |
|
54 |
if(cXinelibOsd::m_OsdStack.First()) |
55 |
cXinelibOsd::m_OsdStack.First()->Hide(); |
56 |
--- osd.h.~1.3.~ 2007-01-06 13:42:58.000000000 +0200 |
57 |
+++ osd.h 2007-09-01 11:47:04.000000000 +0300 |
58 |
@@ -45,7 +45,7 @@ |
59 |
friend class cXinelibOsdProvider; |
60 |
|
61 |
public: |
62 |
- cXinelibOsd(cXinelibDevice *Device, int x, int y); |
63 |
+ cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level = 0); |
64 |
virtual ~cXinelibOsd(); |
65 |
}; |
66 |
|
67 |
@@ -59,7 +59,11 @@ |
68 |
cXinelibOsdProvider(cXinelibDevice *Device); |
69 |
virtual ~cXinelibOsdProvider(); |
70 |
|
71 |
+#if VDRVERSNUM >= 10509 |
72 |
+ virtual cOsd *CreateOsd(int Left, int Top, uint Level); |
73 |
+#else |
74 |
virtual cOsd *CreateOsd(int Left, int Top); |
75 |
+#endif |
76 |
|
77 |
static void RefreshOsd(void); |
78 |
}; |
79 |
--- equalizer.c.~1.2.~ 2006-08-22 06:45:34.000000000 +0300 |
80 |
+++ equalizer.c 2007-09-01 11:47:04.000000000 +0300 |
81 |
@@ -46,7 +46,11 @@ |
82 |
{ |
83 |
tArea areas [] = { {0, 0, OSD_W - 1, OSD_H - 1, 4} }; |
84 |
|
85 |
+#if VDRVERSNUM >= 10509 |
86 |
+ m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); |
87 |
+#else |
88 |
m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); |
89 |
+#endif |
90 |
|
91 |
if(m_Osd) { |
92 |
if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { |
93 |
--- setup_menu.c.~1.34.~ 2007-06-19 09:06:22.000000000 +0300 |
94 |
+++ setup_menu.c 2007-09-01 11:47:04.000000000 +0300 |
95 |
@@ -1537,7 +1537,11 @@ |
96 |
int i; |
97 |
|
98 |
if(!m_Osd) |
99 |
+#if VDRVERSNUM >= 10509 |
100 |
+ m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); |
101 |
+#else |
102 |
m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); |
103 |
+#endif |
104 |
|
105 |
if(m_Osd) { |
106 |
if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { |
107 |
@@ -1636,7 +1640,11 @@ |
108 |
int x, y, bit = 0; |
109 |
|
110 |
if(!m_Osd) { |
111 |
+#if VDRVERSNUM >= 10509 |
112 |
+ m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); |
113 |
+#else |
114 |
m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); |
115 |
+#endif |
116 |
|
117 |
if(m_Osd) { |
118 |
if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { |
119 |
|
120 |
|
121 |
|
122 |
-- |
123 |
gentoo-commits@g.o mailing list |