From 1df133b2a0565a35c3b07e043bd04b449869a0cb Mon Sep 17 00:00:00 2001
From: Andreas Regel <andreas.regel@powarman.de>
Date: Sun, 13 Jun 2004 23:00:00 +0200
Subject: Release version 0.0.5

- added support for VDR version 1.3.7 and later (VDR 1.2.6 is still
  supported, no guarantee for 1.3.0-1.3.6)
- no patching required any longer with 1.3.7 and later
- fixed info window colors if palette patch is not applied (VDR up to 1.3.6,
  index patch must be applied)
- added german translations
- added finnish translations (thanks to Rolf Ahrenberg)
---
 osd.h | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

(limited to 'osd.h')

diff --git a/osd.h b/osd.h
index 7216b79..7388ada 100644
--- a/osd.h
+++ b/osd.h
@@ -7,15 +7,6 @@
 #ifndef VDR_OSDPIP_OSD_H
 #define VDR_OSDPIP_OSD_H
 
-extern "C"
-{
-#ifdef HAVE_FFMPEG_STATIC
-#	include <avcodec.h>
-#else
-#	include <ffmpeg/avcodec.h>
-#endif
-}
-
 #include <sys/time.h>
 
 #include <vdr/osd.h>
@@ -23,53 +14,55 @@ extern "C"
 #include <vdr/status.h>
 #include <vdr/receiver.h>
 
+#include "decoder.h"
+
 class cRingBufferFrame;
 class cOsdPipReceiver;
 class cQuantize;
 
 class cOsdPipObject: public cOsdObject, public cThread, public cStatus {
 private:
+#if VDRVERSNUM >= 10307
+	cOsd *m_Osd;
+#else
 	cOsdBase *m_Osd;
+	tWindowHandle m_Window;
+	tWindowHandle m_WindowInfo;
+#endif
 	cRingBufferFrame *m_ESBuffer;
 	cOsdPipReceiver *m_Receiver;
 	const cChannel *m_Channel;
-	tWindowHandle m_Window;
 	cBitmap * m_Bitmap;
-	tWindowHandle m_WindowInfo;
 	cBitmap * m_BitmapInfo;
+#if VDRVERSNUM >= 10307
+	int m_InfoX;
+	int m_InfoY;
+#endif
 
 	time_t m_ShowTime;
 	bool m_ShowInfo;
 
 	bool m_Active;
 	bool m_Ready;
+#if VDRVERSNUM >= 10307
+	bool m_Reset;
+#endif
 	int m_Width, m_Height;
 	int m_FrameDrop;
 
-	AVCodec * m_Codec;
-	AVCodecContext * m_Context;
-	AVFrame * m_PicDecoded;
-	AVFrame * m_PicResample;
-	AVFrame * m_PicConvert;
-	unsigned char * m_BufferResample;
-	unsigned char * m_BufferConvert;
-
 	unsigned int m_AlphaBase;
 	unsigned int m_Palette[256];
 	int m_PaletteStart;
-	unsigned char m_PaletteLookup[256];
 
+	cDecoder decoder;
 	cQuantize * quantizer;
 
-	int Decode(unsigned char * data, int length);
-	int Resample();
-	int ConvertToRGB();
 	void ProcessImage(unsigned char * data, int length);
 
-	void ShowChannelInfo(const cChannel * channel);
+	void ShowChannelInfo(const cChannel * channel, bool show = true);
 protected:
 	virtual void Action(void);
-  virtual void ChannelSwitch(const cDevice * device, int channelNumber);
+	virtual void ChannelSwitch(const cDevice * device, int channelNumber);
 
 public:
 	cOsdPipObject(cDevice *Device, const cChannel *Channel);
-- 
cgit v1.2.3