mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 19:01:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/zapit/include/zapit/zapit.h: fix merge problems

Browse Source
This commit is contained in:
[CST] Focus
2012-04-13 17:22:02 +04:00
parent fd3f7b92a1
commit 554ded6471
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,13 +125,14 @@ 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;
uint32_t lastChannelRadio; t_channel_id lastChannelRadio;
uint32_t lastChannelTV; t_channel_id lastChannelTV;
int abort_zapit; int abort_zapit;
int pmt_update_fd; int pmt_update_fd;
//void LoadAudioMap(); //void LoadAudioMap();
void SaveSettings(bool write_conf, bool write_audio); void SaveAudioMap();
void SaveSettings(bool write_conf);
//void SaveChannelPids(CZapitChannel* channel); //void SaveChannelPids(CZapitChannel* channel);
void RestoreChannelPids(CZapitChannel* channel); void RestoreChannelPids(CZapitChannel* channel);
//void ConfigFrontend(); //void ConfigFrontend();