diff --git a/lib/libnet/libnet.c b/lib/libnet/libnet.c index 9eb1cb679..a92487f5e 100644 --- a/lib/libnet/libnet.c +++ b/lib/libnet/libnet.c @@ -9,6 +9,8 @@ #include #include +#if 0 +//never used static void scanip( char *str, unsigned char *to ) { int val; @@ -80,7 +82,7 @@ abbruch: return rc; } - +#endif void netGetIP( char *dev, char *ip, char *mask, char *brdcast ) { int fd; @@ -114,7 +116,8 @@ void netGetIP( char *dev, char *ip, char *mask, char *brdcast ) close(fd); return; } - +#if 0 +//never used void netSetDefaultRoute( char *gw ) { struct rtentry re; @@ -149,7 +152,7 @@ void netSetDefaultRoute( char *gw ) close(fd); return; } - +#endif void netGetDefaultRoute( char *ip ) { FILE *fp; @@ -179,7 +182,8 @@ static char dombuf[256]; static char hostbuf[256]; static char domis=0; static char hostis=0; - +#if 0 +//never used char *netGetDomainname( void ) { if (!domis) @@ -194,7 +198,7 @@ void netSetDomainname( char *dom ) domis=1; setdomainname(dombuf,strlen(dombuf)+1); } - +#endif char *netGetHostname( void ) { if (!hostis) diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 346210d4f..c629daa6a 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -236,12 +236,13 @@ void ClearFB(int /*color*/) //memset(lfb,0, var_screeninfo.yres*fix_screeninfo.line_length); CFrameBuffer::getInstance()->paintBackground(); } - +#if 0 +//never used void ClearB(int color) { FillRect(0,0,var_screeninfo.xres,var_screeninfo.yres*2,color); } - +#endif int GetCurFontWidth() { int mx = (displaywidth)%(40-nofirst); // # of unused pixels diff --git a/lib/sectionsdclient/sectionsdclient.cpp b/lib/sectionsdclient/sectionsdclient.cpp index 97eadb83d..6d6da6b4b 100644 --- a/lib/sectionsdclient/sectionsdclient.cpp +++ b/lib/sectionsdclient/sectionsdclient.cpp @@ -375,6 +375,8 @@ CChannelEventList CSectionsdClient::getChannelEvents(const bool tv_mode, t_chann 3: keyword search in EPG description (INFO2) In case of a match, the EPG event is added to the Eventlist eList. */ +#if 0 +//never used bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,const t_channel_id channel_id,char search_typ,std::string& search_text) { int nBufSize=0; @@ -435,7 +437,7 @@ bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,con close_connection(); return true; } - +#endif CChannelEventList CSectionsdClient::getEventsServiceKey(const t_channel_id channel_id) { CChannelEventList eList; @@ -479,6 +481,8 @@ CChannelEventList CSectionsdClient::getEventsServiceKey(const t_channel_id chann close_connection(); return eList; } +#if 0 +//never used void showhexdumpa (char *label, unsigned char * from, int len) { int i, j, k; @@ -519,7 +523,7 @@ void showhexdumpa (char *label, unsigned char * from, int len) } printf ("\n"); } - +#endif // 21.07.2005 - rainerk // Convert line-terminated extended events to vector of strings char * CSectionsdClient::parseExtendedEvents(char * dp, CEPGData * epgdata) { diff --git a/src/driver/audiodec/flacdec.cpp b/src/driver/audiodec/flacdec.cpp index ed114dc50..242337945 100644 --- a/src/driver/audiodec/flacdec.cpp +++ b/src/driver/audiodec/flacdec.cpp @@ -81,12 +81,13 @@ FLAC__StreamDecoderSeekStatus flac_seek(const FLAC__StreamDecoder *, FLAC__uint6 else return FLAC__STREAM_DECODER_SEEK_STATUS_OK; } - +#if 0 +//never used int flac_close(void *) { return 0; } - +#endif FLAC__StreamDecoderTellStatus flac_tell(const FLAC__StreamDecoder *, FLAC__uint64 *absolute_byte_offset, void *client_data) { CFlacDec * flacdec = (CFlacDec *)client_data; diff --git a/src/driver/audiodec/int_fft.c b/src/driver/audiodec/int_fft.c index 5f8a7f62d..d44aa66fe 100644 --- a/src/driver/audiodec/int_fft.c +++ b/src/driver/audiodec/int_fft.c @@ -84,6 +84,8 @@ fixed fix_mpy(fixed a, fixed b); size of data = 2**m set inverse to 0=dft, 1=idft */ +#if 0 +//never used int fix_fft(fixed fr[], fixed fi[], int m, int inverse) { int mr,nn,i,j,l,k,istep, n, scale, shift; @@ -180,7 +182,7 @@ fix_mpy(wi,fr[j]); return scale; } - +#endif /* window() - apply a Hanning window */ void window(fixed fr[], int n) @@ -203,6 +205,8 @@ void window(fixed fr[], int n) was obtained from an inverse FFT, 0 otherwise. loud[] is the loudness, in dB wrt 32767; will be +10 to -N_LOUD. */ +#if 0 +//never used void fix_loud(fixed loud[], fixed fr[], fixed fi[], int n, int scale_shift) { int i, max; @@ -218,7 +222,7 @@ void fix_loud(fixed loud[], fixed fr[], fixed fi[], int n, int scale_shift) loud[i] = max; } } - +#endif /* db_from_ampl() - find loudness (in dB) from the complex amplitude. */ @@ -258,6 +262,8 @@ fixed fix_mpy(fixed a, fixed b) /* iscale() - scale an integer value by (numer/denom) */ +#if 0 +//never used int iscale(int value, int numer, int denom) { #ifdef DOS @@ -338,7 +344,7 @@ overflow: #endif } - +#endif #if N_WAVE != 1024 ERROR: N_WAVE != 1024 diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 0ff7020d7..ab4a80c3e 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -510,11 +510,12 @@ int CFrameBuffer::setMode(unsigned int /*nxRes*/, unsigned int /*nyRes*/, unsign } return 0; } - +#if 0 +//never used void CFrameBuffer::setTransparency( int /*tr*/ ) { } - +#endif void CFrameBuffer::setBlendMode(uint8_t mode) { #ifdef HAVE_COOL_HARDWARE @@ -539,14 +540,15 @@ void CFrameBuffer::setBlendLevel(int level) #endif #endif } - +#if 0 +//never used void CFrameBuffer::setAlphaFade(int in, int num, int tr) { for (int i=0; ilfb, 0, thiz->stride * thiz->yRes); } } +#endif void CFrameBuffer::Clear() { paintBackground(); //memset(getFrameBufferPointer(), 0, stride * yRes); } - +#if 0 +//never used void CFrameBuffer::showFrame(const std::string & filename) { std::string varpath = "/var/tuxbox/config/neutrino/icons/"; @@ -1611,7 +1619,7 @@ void CFrameBuffer::showFrame(const std::string & filename) else videoDecoder->ShowPicture((iconBasePath + filename).c_str()); } - +#endif bool CFrameBuffer::Lock() { if(locked) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index a967ff0bc..30f970f71 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -284,7 +284,8 @@ void CRCInput::restartInput() close(); open(); } - +#if 0 +//never used int CRCInput::messageLoop( bool anyKeyCancels, int timeout ) { neutrino_msg_t msg; @@ -335,6 +336,7 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout ) } return res; } +#endif int CRCInput::addTimer(uint64_t Interval, bool oneshot, bool correct_time ) { @@ -1557,7 +1559,8 @@ void CRCInput::close_click() void CRCInput::open_click() { } - +#if 0 +//never used void CRCInput::reset_dsp(int /*rate*/) { } @@ -1565,7 +1568,7 @@ void CRCInput::reset_dsp(int /*rate*/) void CRCInput::set_dsp() { } - +#endif void CRCInput::play_click() { } diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 231501869..1291345df 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1546,7 +1546,7 @@ bool CRecordManager::changeNotify(const neutrino_locale_t OptionName, void * /*d } return ret; } - +#if 0 /* this is saved copy of neutrino code which seems was not used for some time */ bool CRecordManager::ChooseRecDir(std::string &dir) { @@ -1575,7 +1575,7 @@ bool CRecordManager::ChooseRecDir(std::string &dir) } return doRecord; } - +#endif bool CRecordManager::MountDirectory(const char *recordingDir) { bool ret = true; diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp index 6ae11889f..7aea07577 100644 --- a/src/driver/screenshot.cpp +++ b/src/driver/screenshot.cpp @@ -126,6 +126,8 @@ void CScreenShot::run() } /* save file in sync mode, return true if save ok, or false */ +#if 0 +//never used bool CScreenShot::StartSync() { bool ret = false; @@ -136,7 +138,7 @@ bool CScreenShot::StartSync() printf("CScreenShot::StartSync: %s finished: %d\n", filename.c_str(), ret); return ret; } - +#endif /* save file in selected format, free data received from video decoder */ bool CScreenShot::SaveFile() { diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 9de6a2455..ec2633bc0 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -357,7 +357,8 @@ void * streamts_live_thread(void *data) close(fd); return 0; } - +#if 0 +//never used void streamts_file_thread(void *data) { int dvrfd; @@ -458,3 +459,4 @@ void streamts_file_thread(void *data) return; } +#endif \ No newline at end of file diff --git a/src/eitd/SIevents.cpp b/src/eitd/SIevents.cpp index 3e89ed875..78e60f5b6 100644 --- a/src/eitd/SIevents.cpp +++ b/src/eitd/SIevents.cpp @@ -561,7 +561,8 @@ void SIevent::dump(void) const for_each(ratings.begin(), ratings.end(), printSIparentalRating()); for_each(linkage_descs.begin(), linkage_descs.end(), printSIlinkage()); } - +#if 0 +//never used void SIevent::dumpSmall(void) const { for (std::map::const_iterator it = langName.begin() ; @@ -578,3 +579,4 @@ void SIevent::dumpSmall(void) const for_each(ratings.begin(), ratings.end(), printSIparentalRating()); for_each(linkage_descs.begin(), linkage_descs.end(), printSIlinkage()); } +#endif diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index 0d5bd2230..854641324 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -150,12 +150,12 @@ inline void readLockServices(void) { pthread_rwlock_rdlock(&servicesLock); } - +#ifdef ENABLE_SDT inline void writeLockServices(void) { pthread_rwlock_wrlock(&servicesLock); } - +#endif inline void unlockServices(void) { pthread_rwlock_unlock(&servicesLock); diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 056799fbd..6f11db53e 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -90,7 +90,8 @@ int CBookmarkManager::createBookmark (const std::string & url, const std::string } //------------------------------------------------------------------------ - +#if 0 +//never used void CBookmarkManager::removeBookmark (unsigned int index) { std::vector::iterator p = bookmarks.begin()+index; bookmarks.erase(p); @@ -115,7 +116,7 @@ void CBookmarkManager::renameBookmark (unsigned int index) { bookmarksmodified=true; } } - +#endif #define BOOKMARKSTRINGLENGTH (10 + 1) #define BOOKMARKSTRINGMODIFICATIONPOINT 8 const char * const BOOKMARKSTRING = "bookmark0."; @@ -195,7 +196,8 @@ CBookmarkManager::~CBookmarkManager () { } //------------------------------------------------------------------------ - +#if 0 +//never used int CBookmarkManager::getBookmarkCount(void) const { return bookmarks.size(); } @@ -205,7 +207,7 @@ int CBookmarkManager::getBookmarkCount(void) const { int CBookmarkManager::getMaxBookmarkCount(void) const { return MAXBOOKMARKS; } - +#endif //------------------------------------------------------------------------ void CBookmarkManager::flush() { @@ -215,7 +217,8 @@ void CBookmarkManager::flush() { } //------------------------------------------------------------------------ - +#if 0 +//never used const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent) { if (parent) @@ -360,7 +363,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent) else return NULL; } - +#endif //------------------------------------------------------------------------ void CBookmarkManager::paintItem(int pos) { diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 0563a3a85..976bb32c7 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -3841,7 +3841,8 @@ int find_gop(unsigned char *buf, int r) } return -1; } - +#if 0 +//never used off64_t fake_read(int fd, unsigned char *buf, size_t size, off64_t fsize) { off64_t cur = lseek64 (fd, 0, SEEK_CUR); @@ -3852,7 +3853,7 @@ off64_t fake_read(int fd, unsigned char *buf, size_t size, off64_t fsize) else return size; } - +#endif #define PSI_SIZE 188*3 static int read_psi(char * spart, unsigned char * buf) { diff --git a/src/gui/movieinfo.cpp b/src/gui/movieinfo.cpp index a455736b3..d9489cfa9 100644 --- a/src/gui/movieinfo.cpp +++ b/src/gui/movieinfo.cpp @@ -321,6 +321,8 @@ bool CMovieInfo::loadMovieInfo(MI_MOVIE_INFO * movie_info, CFile * file) /************************************************************************ ************************************************************************/ +#if 0 +//never used bool CMovieInfo::parseXmlTree(char */*text*/, MI_MOVIE_INFO * /*movie_info*/) { #ifndef XMLTREE_LIB @@ -413,7 +415,7 @@ bool CMovieInfo::parseXmlTree(char */*text*/, MI_MOVIE_INFO * /*movie_info*/) #endif /* XMLTREE_LIB */ return (true); } - +#endif /************************************************************************ ************************************************************************/ @@ -513,6 +515,8 @@ void CMovieInfo::showMovieInfo(MI_MOVIE_INFO & movie_info) /************************************************************************ ************************************************************************/ +#if 0 +//never used void CMovieInfo::printDebugMovieInfo(MI_MOVIE_INFO & movie_info) { TRACE(" FileName: %s", movie_info.file.Name.c_str()); @@ -561,7 +565,7 @@ void CMovieInfo::printDebugMovieInfo(MI_MOVIE_INFO & movie_info) } } } - +#endif /************************************************************************ ************************************************************************/ diff --git a/src/gui/widget/mountchooser.cpp b/src/gui/widget/mountchooser.cpp index a5d927709..b205b99d7 100644 --- a/src/gui/widget/mountchooser.cpp +++ b/src/gui/widget/mountchooser.cpp @@ -88,11 +88,12 @@ int CMountChooser::exec(CMenuTarget* parent, const std::string & actionKey) return CMenuWidget::exec(parent, actionKey); } } - +#if 0 +//never used void CMountChooser::setSelectedItem(int selection) { selected = selection; } - +#endif diff --git a/src/system/flashtool.cpp b/src/system/flashtool.cpp index ec9eff466..063827603 100644 --- a/src/system/flashtool.cpp +++ b/src/system/flashtool.cpp @@ -304,13 +304,15 @@ bool CFlashTool::erase(int globalProgressEnd) close(fd); return true; } - +#if 0 +//never used bool CFlashTool::check_cramfs( const std::string & /*filename*/ ) { int retVal = 0; //cramfs_crc( (char*) filename.c_str() ); printf("flashcheck returned: %d\n", retVal); return retVal==1; } +#endif #define FROMHEX(c) ((c)>='a' ? (c)-'a'+10 : ((c)>='A' ? (c)-'A'+10 : (c)-'0')) bool CFlashTool::check_md5( const std::string & filename, const std::string & smd5) { diff --git a/src/system/lastchannel.cpp b/src/system/lastchannel.cpp index 8898d77b8..787c22c4b 100644 --- a/src/system/lastchannel.cpp +++ b/src/system/lastchannel.cpp @@ -122,13 +122,14 @@ void CLastChannel::set_store_difftime (int secs) { secs_diff_before_store = secs; } - +#if 0 +//never used int CLastChannel::get_store_difftime (void) const { return secs_diff_before_store; } - +#endif int CLastChannel::get_mode(t_channel_id channel_id) { std::list<_LastCh>::iterator It; diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp index bdf1e2a2c..a1aab9988 100644 --- a/src/zapit/lib/zapitclient.cpp +++ b/src/zapit/lib/zapitclient.cpp @@ -351,7 +351,8 @@ bool CZapitClient::receive_channel_list(BouquetChannelList& channels, const bool } return true; } - +#if 0 +//never used bool CZapitClient::receive_nchannel_list(BouquetNChannelList& channels) { CZapitMessages::responseGeneralInteger responseInteger; @@ -374,7 +375,7 @@ bool CZapitClient::receive_nchannel_list(BouquetNChannelList& channels) } return true; } - +#endif /* gets all channels that are in specified bouquet */ /* bouquets are numbered starting at 0 */ @@ -528,7 +529,8 @@ void CZapitClient::getVolume(unsigned int *left, unsigned int *right) close_connection(); } - +#if 0 +//never used delivery_system_t CZapitClient::getDeliverySystem(void) { send(CZapitMessages::CMD_GET_DELIVERY_SYSTEM, 0, 0); @@ -542,6 +544,7 @@ delivery_system_t CZapitClient::getDeliverySystem(void) return response.system; } +#endif #if 0 bool CZapitClient::get_current_TP(TP_params* TP) { @@ -1024,6 +1027,8 @@ void CZapitClient::setRecordMode(const bool activate) send(CZapitMessages::CMD_SET_RECORD_MODE, (char*)&msg, sizeof(msg)); close_connection(); } +#if 0 +//never used void CZapitClient::setEventMode(const bool activate) { CZapitMessages::commandSetRecordMode msg; @@ -1031,7 +1036,7 @@ void CZapitClient::setEventMode(const bool activate) send(CZapitMessages::CMD_SET_EVENT_MODE, (char*)&msg, sizeof(msg)); close_connection(); } - +#endif bool CZapitClient::isRecordModeActive() { send(CZapitMessages::CMD_GET_RECORD_MODE); diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp index 991f978ce..72374d4ad 100644 --- a/src/zapit/src/channel.cpp +++ b/src/zapit/src/channel.cpp @@ -269,7 +269,8 @@ CZapitAbsSub* CZapitChannel::getChannelSub(int index) } return retval; } - +#if 0 +//never used void CZapitChannel::setChannelSub(int subIdx) { if (subIdx < (int)channelSubs.size()){ @@ -281,7 +282,7 @@ int CZapitChannel::getChannelSubIndex(void) { return currentSub < getSubtitleCount() ? currentSub : -1; } - +#endif #if 0 void CZapitChannel::setCaPmt(CCaPmt *pCaPmt) { diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 6cb0a14b3..26e669fc1 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -185,10 +185,10 @@ bool CFEManager::loadSettings() char cfg_key[81]; sprintf(cfg_key, "fe%d_satellites", fe->fenumber); - std::vector satList = configfile.getInt32Vector(cfg_key); satellite_map_t & satmap = fe->getSatellites(); satmap.clear(); #if 0 + std::vector satList = configfile.getInt32Vector(cfg_key); for(unsigned int i = 0; i < satList.size(); i++) t_satellite_position position = satList[i]; #endif @@ -316,7 +316,8 @@ CFrontend * CFEManager::getFE(int index) INFO("Frontend #%d not found", index); return NULL; } - +#if 0 +//never used transponder * CFEManager::getChannelTransponder(CZapitChannel * channel) { transponder_list_t::iterator tpI = transponders.find(channel->getTransponderId()); @@ -326,6 +327,7 @@ transponder * CFEManager::getChannelTransponder(CZapitChannel * channel) INFO("Transponder %llx not found", channel->getTransponderId()); return NULL; } +#endif /* try to find fe with same tid, or unlocked. fe with same tid is preffered */ CFrontend * CFEManager::findFrontend(CZapitChannel * channel) diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index e71764a47..f96df7683 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -399,12 +399,13 @@ fe_status_t CFrontend::getStatus(void) const return status; #endif } - +#if 0 +//never used FrontendParameters CFrontend::getFrontend(void) const { return currentTransponder.feparams; } - +#endif uint32_t CFrontend::getBitErrorRate(void) const { uint32_t ber = 0; @@ -427,7 +428,8 @@ uint16_t CFrontend::getSignalNoiseRatio(void) const fop(ioctl, FE_READ_SNR, &snr); return snr; } - +#if 0 +//never used uint32_t CFrontend::getUncorrectedBlocks(void) const { uint32_t blocks = 0; @@ -435,7 +437,7 @@ uint32_t CFrontend::getUncorrectedBlocks(void) const return blocks; } - +#endif struct dvb_frontend_event CFrontend::getEvent(void) { struct dvb_frontend_event event; @@ -849,11 +851,12 @@ void CFrontend::secSetVoltage(const fe_sec_voltage_t voltage, const uint32_t ms) usleep(1000 * ms); // FIXME : is needed ? } } - +#if 0 +//never used void CFrontend::secResetOverload(void) { } - +#endif void CFrontend::sendDiseqcCommand(const struct dvb_diseqc_master_cmd *cmd, const uint32_t ms) { printf("[fe%d] Diseqc cmd: ", fenumber); @@ -865,12 +868,13 @@ void CFrontend::sendDiseqcCommand(const struct dvb_diseqc_master_cmd *cmd, const if (fop(ioctl, FE_DISEQC_SEND_MASTER_CMD, cmd) == 0) usleep(1000 * ms); } - +#if 0 +//never used uint32_t CFrontend::getDiseqcReply(const int /*timeout_ms*/) const { return 0; } - +#endif void CFrontend::sendToneBurst(const fe_sec_mini_cmd_t burst, const uint32_t ms) { if (slave || info.type != FE_QPSK) @@ -1094,7 +1098,8 @@ bool CFrontend::tuneChannel(CZapitChannel * /*channel*/, bool /*nvod*/) return false; return tuneFrequency(&transponder->second.feparams, transponder->second.polarization, false); } - +#if 0 +//never used bool CFrontend::retuneTP(bool nowait) { /* used in pip only atm */ @@ -1107,7 +1112,7 @@ bool CFrontend::retuneChannel(void) setFrontend(¤tTransponder.feparams); return 0; } - +#endif int CFrontend::tuneFrequency(FrontendParameters * feparams, uint8_t polarization, bool nowait) { TP_params TP; diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index a71235695..4255a35bf 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -79,7 +79,8 @@ bool CServiceManager::ParseScanXml(void) } return (scanInputParser != NULL); } - +#if 0 +//never used xmlDocPtr CServiceManager::ScanXml() { if(!scanInputParser) @@ -87,7 +88,7 @@ xmlDocPtr CServiceManager::ScanXml() return scanInputParser; } - +#endif bool CServiceManager::AddChannel(CZapitChannel * &channel) { channel_insert_res_t ret = allchans.insert ( @@ -160,12 +161,13 @@ void CServiceManager::RemoveAllChannels() { allchans.clear(); } - +#if 0 +//never used void CServiceManager::RemoveNVODChannels() { nvodchannels.clear(); } - +#endif void CServiceManager::RemoveCurrentChannels() { curchans.clear(); @@ -540,10 +542,10 @@ int CServiceManager::LoadMotorPositions(void) return 0; } - +#if 0 +//never used void CServiceManager::SaveMotorPositions() { -#if 0 FILE * fd; sat_iterator_t sit; printf("[getservices] saving motor positions...\n"); @@ -561,9 +563,8 @@ void CServiceManager::SaveMotorPositions() } fdatasync(fileno(fd)); fclose(fd); -#endif } - +#endif bool CServiceManager::InitSatPosition(t_satellite_position position, char * name, bool force) { if(force || (satellitePositions.find(position) == satellitePositions.end())) { @@ -1026,7 +1027,8 @@ bool CServiceManager::ReplaceProviderName(std::string &name, t_transport_stream_ } return false; } - +#if 0 +//never used int CServiceManager::GetFreeNumber(bool radio) { service_number_map_t * channel_numbers = radio ? &radio_numbers : &tv_numbers; @@ -1040,7 +1042,7 @@ int CServiceManager::GetFreeNumber(bool radio) } } } - +#endif int CServiceManager::GetMaxNumber(bool radio) { service_number_map_t * channel_numbers = radio ? &radio_numbers : &tv_numbers; @@ -1052,7 +1054,8 @@ int CServiceManager::GetMaxNumber(bool radio) } return i+1; } - +#if 0 +//never used void CServiceManager::FreeNumber(int number, bool radio) { service_number_map_t * channel_numbers = radio ? &radio_numbers : &tv_numbers; @@ -1064,7 +1067,7 @@ void CServiceManager::UseNumber(int number, bool radio) service_number_map_t * channel_numbers = radio ? &radio_numbers : &tv_numbers; channel_numbers->insert(number); } - +#endif bool CServiceManager::GetTransponder(transponder_id_t tid, transponder &t) { stiterator tI = transponders.find(tid); diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index 991003980..82172882e 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -625,7 +625,8 @@ bool CServiceScan::ScanTransponder() return (found_channels != 0); } - +#if 0 +//never used bool CServiceScan::ReplaceTransponderParams(freq_id_t freq, t_satellite_position satellitePosition, struct dvb_frontend_parameters * feparams, uint8_t polarization) { bool ret = false; @@ -643,7 +644,7 @@ bool CServiceScan::ReplaceTransponderParams(freq_id_t freq, t_satellite_position } return ret; } - +#endif void CServiceScan::SendTransponderInfo(transponder &t) { uint32_t actual_freq = t.feparams.dvb_feparams.frequency; diff --git a/src/zapit/src/transponder.cpp b/src/zapit/src/transponder.cpp index 0db0d34bb..aa51be576 100644 --- a/src/zapit/src/transponder.cpp +++ b/src/zapit/src/transponder.cpp @@ -120,13 +120,14 @@ void transponder::dump(std::string label) transponder_id, dvb_feparams->frequency, dvb_feparams->u.qpsk.symbol_rate, dvb_feparams->u.qpsk.fec_inner, polarization); } - +#if 0 +//never used void transponder::ddump(std::string label) { if (zapit_debug) dump(label); } - +#endif char transponder::pol(unsigned char p) { if (p == 0) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index ed27b65ac..bc5b8aa94 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2133,13 +2133,14 @@ void CZapit::SetConfig(Zapit_config * Cfg) SaveSettings(true); ConfigFrontend(); } - +#if 0 +//never used void CZapit::SendConfig(int connfd) { printf("[zapit] %s...\n", __FUNCTION__); CBasicServer::send_data(connfd, &config, sizeof(config)); } - +#endif void CZapit::GetConfig(Zapit_config &Cfg) { printf("[zapit] %s...\n", __FUNCTION__);