* zapit converted to CZapit class.

* new class to monitor SDT changes - saving current services xml moved to CServiceManager



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

src/zapit/include/zapit/zapit.h

@@ -5,35 +5,151 @@
 #ifndef __zapit_h__
 #define __zapit_h__
 
+#include <OpenThreads/Thread>
+#include <configfile.h>
+#include <eventserver.h>
+#include <connection/basicserver.h>
+#include <xmlinterface.h>
+#include <ca_cs.h>
+
 #include "client/zapitclient.h"
 
-#include "bouquets.h"
+#include <zapit/channel.h>
-
+#include <zapit/bouquets.h>
-void save_settings (bool write);
-void *start_scanthread(void *);
-int start_scan(bool scan_mode);
-
-/**************************************************************/
-/*  functions for new command handling via CZapitClient       */
-/*  these functions should be encapsulated in a class CZapit  */
-/**************************************************************/
-
-void addChannelToBouquet (const unsigned int bouquet, const t_channel_id channel_id);
-void sendBouquets        (int connfd, const bool emptyBouquetsToo, CZapitClient::channelsMode mode = CZapitClient::MODE_CURRENT);
-void internalSendChannels(int connfd, ZapitChannelList* channels, bool nonames);
-void sendBouquetChannels (int connfd, const unsigned int bouquet, CZapitClient::channelsMode mode = CZapitClient::MODE_CURRENT, bool nonames = false);
-void sendChannels        (int connfd, const CZapitClient::channelsMode mode = CZapitClient::MODE_CURRENT, const CZapitClient::channelsOrder order = CZapitClient::SORT_BOUQUET);
-int startPlayBack(CZapitChannel *);
-int stopPlayBack(bool stop_camd);
-unsigned int zapTo(const unsigned int channel);
-unsigned int zapTo(const unsigned int bouquet, const unsigned int channel);
-unsigned int zapTo_ChannelID(const t_channel_id channel_id, const bool isSubService);
-void sendAPIDs(int connfd);
-void enterStandby(void);
-void leaveStandby(void);
-void setVideoSystem_t(int video_system);
 
 #define PAL	0
 #define NTSC	1
+#define AUDIO_CONFIG_FILE "/var/tuxbox/config/zapit/audio.conf"
 
+typedef std::map<t_channel_id, audio_map_set_t> audio_map_t;
+typedef audio_map_t::iterator audio_map_iterator_t;
+typedef std::map<transponder_id_t, time_t> sdt_tp_map_t;
+
+class CZapitSdtMonitor : public OpenThreads::Thread
+{
+	private:
+		bool started;
+		bool sdt_wakeup;
+
+		sdt_tp_map_t sdt_tp;
+
+		void run();
+
+	public:
+		CZapitSdtMonitor();
+		~CZapitSdtMonitor();
+		bool Start();
+		bool Stop();
+		void Wakeup();
+};
+
+class CZapit : public OpenThreads::Thread
+{
+	private:
+		enum {
+			TV_MODE = 0x01,
+			RADIO_MODE = 0x02,
+			RECORD_MODE = 0x04
+		};
+
+		bool started;
+		bool event_mode;
+
+		int audio_mode;
+		int def_audio_mode;
+		int aspectratio;
+		int mode43;
+		unsigned int volume_left;
+		unsigned int volume_right;
+		unsigned int def_volume_left;
+		unsigned int def_volume_right;
+
+		int currentMode;
+		bool playbackStopForced;
+		diseqc_t diseqcType;
+
+		int video_mode;
+		Zapit_config config;
+		CConfigFile configfile;
+		CEventServer *eventServer;
+		CZapitChannel * current_channel;
+
+#if 0 //FIXME still globals
+		t_channel_id live_channel_id;
+#endif
+		audio_map_t audio_map;
+		bool current_is_nvod;
+		bool standby;
+		uint32_t  lastChannelRadio;
+		uint32_t  lastChannelTV;
+		int abort_zapit;
+		int pmt_update_fd;
+
+		void LoadAudioMap();
+		void SaveSettings(bool write_conf, bool write_audio);
+		void SaveChannelPids(CZapitChannel* channel);
+		void RestoreChannelPids(CZapitChannel* channel);
+
+		bool TuneChannel(CZapitChannel * channel, bool &transponder_change);
+		bool ParsePatPmt(CZapitChannel * channel);
+
+		bool send_data_count(int connfd, int data_count);
+		void sendAPIDs(int connfd);
+		void internalSendChannels(int connfd, ZapitChannelList* channels, const unsigned int first_channel_nr, bool nonames);
+		void sendBouquets(int connfd, const bool emptyBouquetsToo, CZapitClient::channelsMode mode);
+		void sendBouquetChannels(int connfd, const unsigned int bouquet, const CZapitClient::channelsMode mode, bool nonames);
+		void sendChannels(int connfd, const CZapitClient::channelsMode mode, const CZapitClient::channelsOrder order);
+		void SendConfig(int connfd);
+
+		bool StartPlayBack(CZapitChannel *thisChannel);
+		bool StopPlayBack(bool send_pmt);
+		void SendPMT(bool forupdate = false);
+		void SetAudioStreamType(CZapitAudioChannel::ZapitAudioChannelType audioChannelType);
+
+		void enterStandby();
+		void leaveStandby();
+		unsigned int ZapTo(const unsigned int bouquet, const unsigned int pchannel);
+		unsigned int ZapTo(t_channel_id channel_id, bool isSubService = false);
+		unsigned int ZapTo(const unsigned int pchannel);
+		void PrepareScan();
+
+		CZapitSdtMonitor SdtMonitor;
+
+		static CZapit * zapit;
+		void run();
+		CZapit();
+	public:
+		~CZapit();
+		static CZapit * getInstance();
+
+		void LoadSettings();
+		bool Start(Z_start_arg* ZapStart_arg);
+		bool Stop();
+		bool ParseCommand(CBasicMessage::Header &rmsg, int connfd);
+		bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true);
+		bool ZapForRecord(const t_channel_id channel_id);
+		bool ChangeAudioPid(uint8_t index);
+		void SetRadioMode();
+		void SetTVMode();
+		void SetRecordMode(bool enable);
+		int getMode();
+
+		bool PrepareChannels();
+		bool StartScan(int scan_mode);
+		bool StartFastScan(int scan_mode, int opid);
+
+		void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id);
+		void SetConfig(Zapit_config * Cfg);
+		void GetConfig(Zapit_config &Cfg);
+
+		void SendEvent(const unsigned int eventID, const void* eventbody = NULL, const unsigned int eventbodysize = 0);
+
+		audio_map_set_t * GetSavedPids(const t_channel_id channel_id);
+
+		/* inlines */
+		void Abort() { abort_zapit = 1; };
+		bool Recording() { return currentMode & RECORD_MODE; };
+		bool makeRemainingChannelsBouquet() { return config.makeRemainingChannelsBouquet; };
+		bool scanSDT() { return config.scanSDT; };
+};
 #endif /* __zapit_h__ */