Release version 0.0.8v0.0.8

- Added Navigation through channel in a way like with ordinary VDR. Use
  the Left/Right keys to select channel groups, OK to choose one or the
  number keys to directly enter a channel number. All this only works
  with enabled info window.
- Extended the info window to contain more information. The amount of
  information shown can be chosen through the setup menu. This directly
  affects the height of the info window.
- Using the info window to show vdr messages if they occur.
- Changed the manner the moving of the PiP window works. Now move mode
  is enabled or disabled by pressing the green button. In move mode,
  the cursor keys can be used to move the PiP window.
- Added some more predefined PiP window sizes. You have to reset your
  size in setup menu.
- Added support for ffmpeg 0.4.9 (should work with 0.4.8, too)
- Updated finnish translations (thanks to Rolf Ahrenberg)
- Cleaned up, dropped support for vdr versions older than 1.3.8

1 files changed, 5 insertions, 17 deletions

diff --git a/osd.h b/osd.h
index 37eb6fb..6bf7427 100644
--- a/osd.h
+++ b/osd.h
@@ -15,6 +15,7 @@
 #include <vdr/receiver.h>
 
 #include "decoder.h"
+#include "osd_info.h"
 
 class cRingBufferFrame;
 class cOsdPipReceiver;
@@ -22,31 +23,17 @@ 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;
 	cBitmap * m_Bitmap;
-	cBitmap * m_BitmapInfo;
-#if VDRVERSNUM >= 10307
-	int m_InfoX;
-	int m_InfoY;
-#endif
-
-	time_t m_ShowTime;
-	bool m_ShowInfo;
+	cOsdInfoWindow * m_InfoWindow;
 
 	bool m_Active;
 	bool m_Ready;
-#if VDRVERSNUM >= 10307
 	bool m_Reset;
-#endif
+	bool m_MoveMode;
 	int m_Width, m_Height;
 	int m_FrameDrop;
 
@@ -59,12 +46,13 @@ private:
 
 	void ProcessImage(unsigned char * data, int length);
 
-	void ShowChannelInfo(const cChannel * channel, bool show = true);
 	void Stop(void);
 	void SwapChannels(void);
 protected:
 	virtual void Action(void);
 	virtual void ChannelSwitch(const cDevice * device, int channelNumber);
+	virtual void OsdClear(void);
+	virtual void OsdStatusMessage(const char * message);
 
 public:
 	cOsdPipObject(cDevice *Device, const cChannel *Channel);