Merge branch 'multituner' into dvbsi++

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a696e56c3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-29 (Thu, 29 Mar 2012)


------------------
No further description and justification available within origin commit message!

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

lib/libcoolstream/audio_cs.h

@@ -141,12 +141,13 @@ public:
 	void getAudioInfo(int &Type, int &Layer, int &Freq, int &Bitrate, int &Mode);
 	void SetSRS(int iq_enable, int nmgr_enable, int iq_mode, int iq_level);
 	bool IsHdmiDDSupported(void);
-	void SetHdmiDD(HDMI_ENCODED_MODE type);
+	void SetHdmiDD(bool On);
 	void SetSpdifDD(bool Enable);
 	void ScheduleMute(bool On);
 	void EnableAnalogOut(bool Enable);
 	bool GetHdmiAudioCaps(cs_audio_caps_t &caps);
 	bool IsHdmiAudioFormatSupported(HDMI_AUDIO_FORMAT format);
+	void SetHdmiDD(HDMI_ENCODED_MODE type);
 };
 
 #endif //__AUDIO_CS_H_

lib/libcoolstream/playback_cs.h

@@ -5,6 +5,7 @@
 /*                                                                             */
 /* (C) 2008 CoolStream International                                           */
 /*                                                                             */
+/* $Id::                                                                     $ */
 /*******************************************************************************/
 #ifndef __PLAYBACK_CS_H_
 #define __PLAYBACK_CS_H_
@@ -18,6 +19,14 @@ typedef enum {
 
 class cPlaybackData;
 
+typedef struct {
+	bool enabled;
+	uint16_t pid;
+	uint16_t ac3flags;
+	std::string lang;
+	std::string codec_name;
+} playback_audio_pid_info_t;
+
 class cPlayback {
 private:
 	cPlaybackData * pd;
@@ -50,6 +59,7 @@ public:
 	bool SetPosition(int position, bool absolute = false);
 	bool IsPlaying(void) const { return playing; }
 	bool IsEnabled(void) const { return enabled; }
+	void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida);
 	void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
 
 };

src/sectionsd/dmxapi.h

@@ -29,7 +29,7 @@
 #endif
 
 #include <stdint.h>
-#if !HAVE_TRIPLEDRAGON
+#if 0 // !HAVE_TRIPLEDRAGON
 #include <linux/dvb/dmx.h>
 #endif