Updated headers for new libcoolstream. Indent cleanups and

added functionality.
Add new CS API header. WIP.
Remove old init_cs.h header.



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@596 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ad54303db
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2010-05-20 (Thu, 20 May 2010)



------------------
This commit was generated by Migit

lib/libcoolstream/cs_api.h

@@ -0,0 +1,33 @@
+#ifndef __CS_API_H_
+#define __CS_API_H_
+
+typedef void (*cs_messenger) (unsigned int msg, unsigned int data);
+
+// Initialization
+void cs_api_init(void);
+void cs_api_exit(void);
+
+// Memory helpers
+void *cs_malloc_uncached(size_t size);
+void cs_free_uncached(void *ptr);
+void *cs_phys_addr(void *ptr);
+
+// Callback function helpers
+void cs_register_messenger(cs_messenger messenger);
+void cs_deregister_messenger(void);
+cs_messenger cs_get_messenger(void);
+
+// Logging functions
+void cs_log_enable(void);
+void cs_log_disable(void);
+void cs_log_message(const char *module, const char *fmt, ...);
+
+// TS Routing
+unsigned int cs_get_ts_output(void);
+int cs_set_ts_output(unsigned int port);
+
+// Serial nr and revision accessors
+unsigned long long cs_get_serial(void);
+unsigned int cs_get_revision(void);
+
+#endif //__CS_API_H_

lib/libcoolstream/dmx_cs.h

@@ -52,7 +52,6 @@ class cDemux
 		DMX_CHANNEL_TYPE type;
 		CS_DMX_PDATA * privateData;
 	public:
-
 		bool Open(DMX_CHANNEL_TYPE pes_type, void * hVideoBuffer = NULL, int uBufferSize = 8192);
 		void Close(void);
 		bool Start(void);

lib/libcoolstream/init_cs.h

@@ -1,8 +0,0 @@
-#ifndef __INIT_CS_H
-#define __INIT_CS_H
-void init_cs_api();
-void shutdown_cs_api();
-void * cs_malloc_uncached(size_t size);
-void cs_free_uncached(void *ptr);
-void * cs_phys_addr(void *ptr);
-#endif

lib/libcoolstream/video_cs.h

@@ -15,7 +15,7 @@ typedef enum {
 	ANALOG_SD_YPRPB_SCART,
 	ANALOG_HD_RGB_SCART,
 	ANALOG_HD_YPRPB_SCART,
-	ANALOG_SCART_MASK = 0x10
+	ANALOG_SCART_MASK = 0x10,
 } analog_mode_t;
 
 typedef enum {
@@ -53,7 +53,7 @@ typedef enum {
 	DISPLAY_AR_14_9,
 	DISPLAY_AR_16_9,
 	DISPLAY_AR_20_9,
-	DISPLAY_AR_RAW
+	DISPLAY_AR_RAW,
 } DISPLAY_AR;
 
 typedef enum {
@@ -109,7 +109,7 @@ class cVideo
 		VIDEO_DB_DR		eDbDr;
 		DISPLAY_AR		PictureAR;
 		VIDEO_FRAME_RATE	FrameRate;
-		bool interlaced;
+		bool			Interlaced;
 
 		unsigned int uDRMDisplayDelay;
 		unsigned int uVideoPTSDelay;
@@ -120,9 +120,6 @@ class cVideo
 		bool playing;
 		bool auto_format;
 		int uFormatIndex;
-		int pic_width, pic_height;
-		int jpeg_width, jpeg_height;
-		int video_width, video_height;
 
 		bool receivedDRMDelay;
 		bool receivedVideoDelay;
@@ -166,11 +163,14 @@ class cVideo
 		int getPlayState(void);
 		void SetDRMDelay(unsigned int delay) { uDRMDisplayDelay = delay;};
 		void SetVideoDelay(unsigned int delay) { uVideoPTSDelay = delay;};
+		/* Notification handlers */
 		void HandleDRMMessage(int Event, void *pData);
 		void HandleVideoMessage(void * hHandle, int Event, void *pData);
+		void HandleEncoderMessage(void *hHandle, int Event, void *pData);
 		VIDEO_DEFINITION   GetVideoDef(void) { return VideoDefinition; }
 
 		/* change video play state */
+		int Prepare(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL);
 		int Start(void * PcrChannel, unsigned short PcrPid, unsigned short VideoPid, void * hChannel = NULL);
 		int Stop(bool blank = true);
 		bool Pause(void);