From patchwork Fri Mar 3 09:56:46 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 12221 Received: from c-71-197-74-6.hsd1.ca.comcast.net ([71.197.74.6] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.50) id 1FF6yA-0008BO-BW for vdr@linuxtv.org; Fri, 03 Mar 2006 10:53:06 +0100 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by nofear.bounceme.net (Postfix) with ESMTP id 0B82C73546 for ; Fri, 3 Mar 2006 01:52:24 -0800 (PST) Message-ID: <440812DE.5080803@syphir.sytes.net> Date: Fri, 03 Mar 2006 01:56:46 -0800 From: "C.Y.M" Organization: CooLNeT User-Agent: Thunderbird 1.5 (Windows/20051201) MIME-Version: 1.0 To: Vdr X-Enigmail-Version: 0.94.0.0 Subject: [vdr] Compile warning fix for xine-0.7.7 and vdr-1.3.44 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2006 09:53:06 -0000 Status: O X-Status: X-Keywords: X-UID: 8237 I noticed some warnings when compiling xine-0.7.7 and vdr-1.3.44. Here is a patch. Best Regards, --- xineOsd.c.orig 2006-03-03 00:01:36.000000000 -0800 +++ xineOsd.c 2006-03-03 00:05:02.000000000 -0800 @@ -258,10 +258,10 @@ // fprintf(stderr, "drawbitmap\n"); } #else - void cXineOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg /* = 0 */, tColor ColorBg /* = 0 */, bool ReplacePalette /* = false */) + void cXineOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg /* = 0 */, tColor ColorBg /* = 0 */, bool ReplacePalette /* = false */, bool Overlay /* = false */) { cMutexLock osdLock(&m_osdMutex); - cOsd::DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette); + cOsd::DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette, Overlay); // fprintf(stderr, "drawbitmap\n"); } #endif --- xineOsd.h.orig 2006-03-03 00:00:29.000000000 -0800 +++ xineOsd.h 2006-03-03 00:01:11.000000000 -0800 @@ -51,7 +51,7 @@ #if VDRVERSNUM < 10327 virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0); #else - virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false); + virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false, bool Overlay = false); #endif virtual void DrawText(int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault); virtual void DrawRectangle(int x1, int y1, int x2, int y2, tColor Color);