introduce HDMI mode settings and move display handling to cRpiDisplay

1 files changed, 74 insertions, 4 deletions

diff --git a/display.h b/display.h
index bf608c9..55a0780 100644
--- a/display.h
+++ b/display.h
@@ -7,26 +7,96 @@
 #ifndef DISPLAY_H
 #define DISPLAY_H
 
+#include "tools.h"
+
+extern "C" {
 #include "interface/vmcs_host/vc_dispmanx_types.h"
+}
 
 class cRpiDisplay
 {
 
 public:
 
-	static int Open(int device);
-	static void Close(void);
+	static cRpiDisplay* GetInstance(void);
+	static void DropInstance(void);
 
 	static int GetSize(int &width, int &height);
+	static int GetSize(int &width, int &height, double &aspect);
+
+	static cRpiVideoPort::ePort GetVideoPort(void);
+	static bool IsProgressive(void);
+
+	static int Get(int &width, int &height, int &frameRate, bool &interlaced);
+	static int Set(int width, int height, int frameRate, bool interlaced);
+
 	static int AddElement(DISPMANX_ELEMENT_HANDLE_T &element,
 			int width, int height, int layer);
 	static int Snapshot(uint8_t* frame, int width, int height);
 
+protected:
+
+	cRpiDisplay(int width, int height, int frameRate,
+			cRpiVideoPort::ePort port);
+	virtual ~cRpiDisplay();
+
+	virtual int SetMode(int width, int height, int frameRate, bool interlaced) {
+		return 0;
+	}
+
+	int m_width;
+	int m_height;
+	int m_frameRate;
+	bool m_interlaced;
+	cRpiVideoPort::ePort m_port;
+
+	static cRpiDisplay *s_instance;
+
+private:
+
+	cRpiDisplay(const cRpiDisplay&);
+	cRpiDisplay& operator= (const cRpiDisplay&);
+
+	class cHandles;
+	cHandles *m_handles;
+};
+
+class cRpiHDMIDisplay : public cRpiDisplay
+{
+
+public:
+
+	cRpiHDMIDisplay(int width, int height, int frameRate, int group, int mode);
+	virtual ~cRpiHDMIDisplay();
+
 private:
 
-	static DISPMANX_DISPLAY_HANDLE_T s_display;
-	static DISPMANX_UPDATE_HANDLE_T  s_update;
+	virtual int SetMode(int width, int height, int frameRate, bool interlaced);
+	int SetMode(int group, int mode);
+
+	class ModeList;
+	ModeList *m_modes;
+
+	int m_group;
+	int m_mode;
+
+	int m_startGroup;
+	int m_startMode;
+	bool m_modified;
+};
+
+class cRpiCompositeDisplay : public cRpiDisplay
+{
+
+public:
+
+	cRpiCompositeDisplay(int width, int height, int frameRate);
+
+private:
 
+	virtual int SetMode(int width, int height, int frameRate, bool interlaced) {
+		return 0;
+	}
 };
 
 #endif