Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-softdevice/files: vdr-softdevice-20070711-vdr-1.5.9.diff
Date: Mon, 01 Oct 2007 16:34:35
Message-Id: E1IcO5S-0000dr-Ko@stork.gentoo.org
1 zzam 07/10/01 16:25:38
2
3 Added: vdr-softdevice-20070711-vdr-1.5.9.diff
4 Log:
5 Make it compile against vdr-1.5.9.
6 (Portage version: 2.1.3.11)
7
8 Revision Changes Path
9 1.1 media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-softdevice/files/vdr-softdevice-20070711-vdr-1.5.9.diff?rev=1.1&content-type=text/plain
13
14 Index: vdr-softdevice-20070711-vdr-1.5.9.diff
15 ===================================================================
16 diff -ru softdevice.cvs.orig/softdevice.c softdevice.cvs/softdevice.c
17 --- softdevice.cvs.orig/softdevice.c 2007-07-24 04:10:13.000000000 -0700
18 +++ softdevice.cvs/softdevice.c 2007-08-26 18:06:33.000000000 -0700
19 @@ -119,7 +119,7 @@
20 static cOsd *osd;
21 public:
22 cSoftOsdProvider(cVideoOut *VideoOut);
23 - virtual cOsd *CreateOsd(int Left, int Top);
24 + virtual cOsd *CreateOsd(int Left, int Top, uint Level);
25 static cOsd *GetOsd();
26 };
27
28 @@ -130,9 +130,9 @@
29 videoOut = VideoOut;
30 }
31
32 -cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top)
33 +cOsd * cSoftOsdProvider::CreateOsd(int Left, int Top, uint Level)
34 {
35 - osd = new cSoftOsd(videoOut, Left, Top);
36 + osd = new cSoftOsd(videoOut, Left, Top, Level);
37 return osd;
38 }
39
40 diff -ru softdevice.cvs.orig/SoftOsd.c softdevice.cvs/SoftOsd.c
41 --- softdevice.cvs.orig/SoftOsd.c 2007-07-24 04:10:11.000000000 -0700
42 +++ softdevice.cvs/SoftOsd.c 2007-08-26 18:14:57.000000000 -0700
43 @@ -46,8 +46,8 @@
44 /* ---------------------------------------------------------------------------
45 */
46
47 -cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y)
48 - : cOsd(X, Y),active(false),close(false) {
49 +cSoftOsd::cSoftOsd(cVideoOut *VideoOut, int X, int Y, uint level)
50 + : cOsd(X, Y, 0),active(false),close(false) {
51 OSDDEB("cSoftOsd constructor\n");
52 OutputConvert=&cSoftOsd::ARGB_to_ARGB32;
53 bitmap_Format=PF_None; // forces a clear after first SetMode
54 diff -ru softdevice.cvs.orig/SoftOsd.h softdevice.cvs/SoftOsd.h
55 --- softdevice.cvs.orig/SoftOsd.h 2007-07-24 04:10:11.000000000 -0700
56 +++ softdevice.cvs/SoftOsd.h 2007-08-26 18:13:17.000000000 -0700
57 @@ -91,7 +91,7 @@
58 int ScreenOsdWidth;
59 int ScreenOsdHeight;
60 public:
61 - cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs);
62 + cSoftOsd(cVideoOut *VideoOut, int XOfs, int XOfs, uint level);
63 virtual ~cSoftOsd();
64 virtual void Flush(void);
65
66
67
68
69 --
70 gentoo-commits@g.o mailing list