mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
[CST] Focus
2012-04-13 16:41:58 +04:00
parent cac6486202 a328dee9dd
commit f29f98b8a1
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zapit/include/zapit/getservices.h
View File

@@ -168,8 +168,9 @@ class CServiceManager
std::string GetServiceName(t_channel_id channel_id); std::string GetServiceName(t_channel_id channel_id);
bool GetAllRadioChannels(ZapitChannelList &list, int flags = 0); tallchans* GetAllChannels(){ return &allchans; };
bool GetAllTvChannels(ZapitChannelList &list, int flags = 0); bool GetAllRadioChannels(ZapitChannelList &list);
bool GetAllTvChannels(ZapitChannelList &list);
bool GetAllHDChannels(ZapitChannelList &list); bool GetAllHDChannels(ZapitChannelList &list);
bool GetAllSatelliteChannels(ZapitChannelList &list, t_satellite_position position); bool GetAllSatelliteChannels(ZapitChannelList &list, t_satellite_position position);
bool GetAllTransponderChannels(ZapitChannelList &list, transponder_id_t tpid); bool GetAllTransponderChannels(ZapitChannelList &list, transponder_id_t tpid);

46
src/zapit/include/zapit/zapit.h
View File

@@ -108,12 +108,11 @@ class CZapit : public OpenThreads::Thread
int currentMode; int currentMode;
bool playbackStopForced; bool playbackStopForced;
diseqc_t diseqcType; //diseqc_t diseqcType;
int video_mode; //int video_mode;
Zapit_config config; //Zapit_config config;
CConfigFile configfile; //CConfigFile configfile;
CEventServer *eventServer; CEventServer *eventServer;
CBasicServer zapit_server; CBasicServer zapit_server;
@@ -125,18 +124,17 @@ class CZapit : public OpenThreads::Thread
audio_map_t audio_map; audio_map_t audio_map;
bool current_is_nvod; bool current_is_nvod;
bool standby; //bool standby;
t_channel_id lastChannelRadio; uint32_t lastChannelRadio;
t_channel_id lastChannelTV; uint32_t lastChannelTV;
int abort_zapit; int abort_zapit;
int pmt_update_fd; int pmt_update_fd;
void LoadAudioMap(); //void LoadAudioMap();
void SaveAudioMap(); void SaveSettings(bool write_conf, bool write_audio);
void SaveSettings(bool write); //void SaveChannelPids(CZapitChannel* channel);
void SaveChannelPids(CZapitChannel* channel);
void RestoreChannelPids(CZapitChannel* channel); void RestoreChannelPids(CZapitChannel* channel);
void ConfigFrontend(); //void ConfigFrontend();
bool TuneChannel(CFrontend *frontend, CZapitChannel * channel, bool &transponder_change); bool TuneChannel(CFrontend *frontend, CZapitChannel * channel, bool &transponder_change);
bool ParsePatPmt(CZapitChannel * channel); bool ParsePatPmt(CZapitChannel * channel);
@@ -150,29 +148,41 @@ class CZapit : public OpenThreads::Thread
void SendConfig(int connfd); void SendConfig(int connfd);
bool StartPlayBack(CZapitChannel *thisChannel); bool StartPlayBack(CZapitChannel *thisChannel);
bool StopPlayBack(bool send_pmt); //bool StopPlayBack(bool send_pmt);
void SendPMT(bool forupdate = false); void SendPMT(bool forupdate = false);
void SetAudioStreamType(CZapitAudioChannel::ZapitAudioChannelType audioChannelType); void SetAudioStreamType(CZapitAudioChannel::ZapitAudioChannelType audioChannelType);
void enterStandby(); void enterStandby();
void leaveStandby(); //void leaveStandby();
unsigned int ZapTo(const unsigned int bouquet, const unsigned int pchannel); 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(t_channel_id channel_id, bool isSubService = false);
unsigned int ZapTo(const unsigned int pchannel); unsigned int ZapTo(const unsigned int pchannel);
void PrepareScan(); void PrepareScan();
CZapitSdtMonitor SdtMonitor; //CZapitSdtMonitor SdtMonitor;
void run(); void run();
protected: protected:
diseqc_t diseqcType;
int video_mode;
CConfigFile configfile;
bool standby;
Zapit_config config;
CZapitSdtMonitor SdtMonitor;
void LoadAudioMap();
void SaveChannelPids(CZapitChannel* channel);
virtual void ConfigFrontend();
bool StopPlayBack(bool send_pmt);
virtual void leaveStandby();
static CZapit * zapit; static CZapit * zapit;
CZapit(); CZapit();
public: public:
~CZapit(); ~CZapit();
static CZapit * getInstance(); static CZapit * getInstance();
void LoadSettings(); virtual void LoadSettings();
bool Start(Z_start_arg* ZapStart_arg); virtual bool Start(Z_start_arg* ZapStart_arg);
bool Stop(); bool Stop();
bool ParseCommand(CBasicMessage::Header &rmsg, int connfd); bool ParseCommand(CBasicMessage::Header &rmsg, int connfd);
bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true); bool ZapIt(const t_channel_id channel_id, bool for_update = false, bool startplayback = true);