From patchwork Sun Jun 19 17:00:35 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 11920 Received: from c-24-10-6-146.hsd1.ca.comcast.net ([24.10.6.146] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.34) id 1Dk3AI-0007em-P8 for vdr@linuxtv.org; Sun, 19 Jun 2005 19:00:59 +0200 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 ACD4873534 for ; Sun, 19 Jun 2005 10:00:12 -0700 (PDT) Message-ID: <42B5A4B3.2050309@syphir.sytes.net> Date: Sun, 19 Jun 2005 10:00:35 -0700 From: "C.Y.M" Organization: CooLNeT User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Vdr Subject: Re: [vdr] Warnings with Xine Plugin and vdr-1.3.27 References: <42B59315.7010505@syphir.sytes.net> <42B59CDE.2020202@gmx.de> In-Reply-To: <42B59CDE.2020202@gmx.de> X-Enigmail-Version: 0.92.0.0 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2005 17:00:59 -0000 Status: O X-Status: X-Keywords: X-UID: 3126 Reinhard Nissl wrote: > Hi, > > C.Y.M wrote: > >> There are a few new warnings when building the Xine plugin with >> vdr-1.3.27. >> >> ccache g++ -g -O2 -Wall -Woverloaded-virtual -c -D_GNU_SOURCE >> -DPLUGIN_NAME_I18N='"xine"' -DFIFO_DIR=\"/tmp/vdr-xine\" `xine-config >> --cflags` >> -I../../../include -I../DVB/include xine.c >> ccache g++ -g -O2 -Wall -Woverloaded-virtual -c -D_GNU_SOURCE >> -DPLUGIN_NAME_I18N='"xine"' -DFIFO_DIR=\"/tmp/vdr-xine\" `xine-config >> --cflags` >> -I../../../include -I../DVB/include xineDevice.c >> In file included from xineDevice.c:8: >> ../../../include/vdr/osd.h:280: warning: `virtual void >> cOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int, bool)' was hidden >> xineOsd.h:49: warning: by `virtual void >> PluginXine::cXineOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int)' >> ccache g++ -g -O2 -Wall -Woverloaded-virtual -c -D_GNU_SOURCE >> -DPLUGIN_NAME_I18N='"xine"' -DFIFO_DIR=\"/tmp/vdr-xine\" `xine-config >> --cflags` >> -I../../../include -I../DVB/include xineLib.c >> In file included from xineLib.c:7: >> ../../../include/vdr/osd.h:280: warning: `virtual void >> cOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int, bool)' was hidden >> xineOsd.h:49: warning: by `virtual void >> PluginXine::cXineOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int)' >> ccache g++ -g -O2 -Wall -Woverloaded-virtual -c -D_GNU_SOURCE >> -DPLUGIN_NAME_I18N='"xine"' -DFIFO_DIR=\"/tmp/vdr-xine\" `xine-config >> --cflags` >> -I../../../include -I../DVB/include xineOsd.c >> In file included from xineOsd.c:4: >> ../../../include/vdr/osd.h:280: warning: `virtual void >> cOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int, bool)' was hidden >> xineOsd.h:49: warning: by `virtual void >> PluginXine::cXineOsd::DrawBitmap(int, >> int, const cBitmap&, unsigned int, unsigned int)' > > > I'm sorry that I cannot supply a patch already (and I don't know when > this will happen due to beeing busy with other things). > > Just have a look into osd.h and adapt the signature of the functions in > xineOsd.h. They just delegate the work to the original functions, so it > is ok to just pass the additional parameters. > Thanks, this patch seems to fix the warnings. Regards, C. --- xine-0.7.4/xineOsd.h.orig 2005-06-19 09:41:07.000000000 -0700 +++ xine-0.7.4/xineOsd.h 2005-06-19 09:51:33.000000000 -0700 @@ -46,7 +46,7 @@ virtual void RestoreRegion(void); virtual eOsdError SetPalette(const cPalette &Palette, int Area); virtual void DrawPixel(int x, int y, tColor Color); - virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0); + virtual void DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg = 0, tColor ColorBg = 0, bool ReplacePalette = false); 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); virtual void DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quadrants = 0); --- xine-0.7.4/xineOsd.c.orig 2005-06-19 09:55:57.000000000 -0700 +++ xine-0.7.4/xineOsd.c 2005-06-19 09:53:49.000000000 -0700 @@ -246,10 +246,10 @@ cOsd::DrawPixel(x, y, Color); } - void cXineOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg /* = 0 */, tColor ColorBg /* = 0 */) + void cXineOsd::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg /* = 0 */, tColor ColorBg /* = 0 */, bool ReplacePalette) { cMutexLock osdLock(&m_osdMutex); - cOsd::DrawBitmap(x, y, Bitmap, ColorFg, ColorBg); + cOsd::DrawBitmap(x, y, Bitmap, ColorFg, ColorBg, ReplacePalette); // fprintf(stderr, "drawbitmap\n"); }