diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp index b573a31b5..ad67f055e 100644 --- a/lib/libdvbsub/dvbsub.cpp +++ b/lib/libdvbsub/dvbsub.cpp @@ -360,7 +360,6 @@ static void* dvbsub_thread(void* /*arg*/) gettimeofday(&now, NULL); - int ret = 0; now.tv_usec += (timeout == 0) ? 1000000 : timeout; // add the timeout while (now.tv_usec >= 1000000) { // take care of an overflow now.tv_sec++; @@ -370,7 +369,7 @@ static void* dvbsub_thread(void* /*arg*/) restartWait.tv_nsec = now.tv_usec * 1000; // nano seconds pthread_mutex_lock( &packetMutex ); - ret = pthread_cond_timedwait( &packetCond, &packetMutex, &restartWait ); + pthread_cond_timedwait( &packetCond, &packetMutex, &restartWait ); pthread_mutex_unlock( &packetMutex ); timeout = dvbSubtitleConverter->Action(); diff --git a/lib/libeventserver/eventserver.cpp b/lib/libeventserver/eventserver.cpp index 0ce98e244..c37f4dfda 100644 --- a/lib/libeventserver/eventserver.cpp +++ b/lib/libeventserver/eventserver.cpp @@ -102,12 +102,14 @@ bool CEventServer::sendEvent2Client(const unsigned int eventID, const initiators head.eventID = eventID; head.initiatorID = initiatorID; head.dataSize = eventbodysize; - int written = write(sock_fd, &head, sizeof(head)); + /*int written = */ + write(sock_fd, &head, sizeof(head)); // printf ("[eventserver]: sent 0x%x - following eventbody= %d\n", written, eventbodysize ); if(eventbodysize!=0) { - written = write(sock_fd, eventbody, eventbodysize); + /*written = */ + write(sock_fd, eventbody, eventbodysize); // printf ("[eventserver]: eventbody sent 0x%x - peventbody= %x eventbody= %x\n", written, (unsigned)eventbody, *(unsigned*)eventbody ); } close(sock_fd); diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index e36df5b2d..346210d4f 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -3383,8 +3383,6 @@ void ConfigMenu(int Init) void PageInput(int Number) { - int zoom = 0; - /* clear temp_page */ if (inputcounter == 2) temp_page = 0; @@ -3416,9 +3414,6 @@ void PageInput(int Number) CopyBB2FB(); } - if (zoommode == 1) - zoom = 1<<10; - PosY = StartY; switch (inputcounter) @@ -3915,7 +3910,7 @@ void SwitchScreenMode(int newscreenmode) { ClearFB(clearbbcolor); - int fw, fh, tx, ty, tw, th; + int fw, tx, ty, tw, th; if (screenmode==1) /* split with topmenu */ { @@ -3923,7 +3918,6 @@ void SwitchScreenMode(int newscreenmode) int w = CFrameBuffer::getInstance()->getScreenWidth(); int h = CFrameBuffer::getInstance()->getScreenHeight(); fw = fontwidth_topmenumain; - fh = fontheight; tx = 0; /* split means we start at the left edge */ sx = x; @@ -3951,7 +3945,6 @@ void SwitchScreenMode(int newscreenmode) { StartX = CFrameBuffer::getInstance()->getScreenX(); fw = fontwidth_small; - fh = fontheight; tx = TV169FULLSTARTX; ty = TV169FULLSTARTY; tw = TV169FULLWIDTH; @@ -4905,7 +4898,7 @@ void RenderCharLCDsmall(int Char, int XPos, int YPos) void RenderMessage(int Message) { int byte; - int fbcolor, timecolor, imenuatr; + int fbcolor, imenuatr; int pagecolumn; const char *msg; int national_subset_back = national_subset; @@ -4930,7 +4923,6 @@ void RenderMessage(int Message) /* set colors */ fbcolor = transp; - timecolor = transp<<4 | transp; imenuatr = ATR_MSG0; /* clear framebuffer */ diff --git a/lib/libupnpclient/UPNPDevice.cpp b/lib/libupnpclient/UPNPDevice.cpp index 8c23ac0a1..834f2ca8a 100644 --- a/lib/libupnpclient/UPNPDevice.cpp +++ b/lib/libupnpclient/UPNPDevice.cpp @@ -356,7 +356,7 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act std::string portname; std::string hostname; std::string path; - int port, t_socket, result, received; + int port, t_socket, received; std::stringstream command, reply; std::string commandstr, line; struct sockaddr_in socktcp; @@ -431,7 +431,7 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act } commandstr = command.str(); - result = send(t_socket, commandstr.c_str(), commandstr.size(), 0); + send(t_socket, commandstr.c_str(), commandstr.size(), 0); while ((received = recv(t_socket, buf, sizeof(buf)-1, 0)) > 0) { buf[received] = 0; diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index f14466807..e22c3ef77 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -152,7 +152,7 @@ const struct button_label CBEBouquetWidgetButtons[3] = void CBEBouquetWidget::paintFoot() { - int icol_w, icol_h, h2, fh; + int icol_w, icol_h, h2; struct button_label Button[4]; Button[0] = CBEBouquetWidgetButtons[0]; @@ -163,7 +163,7 @@ void CBEBouquetWidget::paintFoot() const neutrino_locale_t button_ids[] = {LOCALE_BOUQUETEDITOR_RENAME,LOCALE_BOUQUETEDITOR_HIDE,LOCALE_BOUQUETEDITOR_LOCK}; const std::vector buttonID_rest (button_ids, button_ids + sizeof(button_ids) / sizeof(neutrino_locale_t) ); - fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); +// fh = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight(); frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h); /* ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8*//*std::max(fh, icol_h+4)*/; diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index c716842fb..7b7de137a 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -113,11 +113,8 @@ void CCECSetup::setCECSettings() videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); } -bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void *data) +bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*/) { - int val = 0; - if(data) - val = * (int *) data; if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_MODE)) { diff --git a/src/gui/cec_setup.h b/src/gui/cec_setup.h index 168dc9d47..9f69672f9 100644 --- a/src/gui/cec_setup.h +++ b/src/gui/cec_setup.h @@ -48,7 +48,7 @@ class CCECSetup : public CMenuTarget, CChangeObserver ~CCECSetup(); void setCECSettings(); int exec(CMenuTarget* parent, const std::string & actionKey); - virtual bool changeNotify(const neutrino_locale_t OptionName, void *data); + virtual bool changeNotify(const neutrino_locale_t OptionName, void * data); }; diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 17e6af18a..d4ad4202d 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -1079,10 +1079,9 @@ const struct button_label EpgButtons[] = void CEpgData::showTimerEventBar (bool pshow) { - int x,y,w,h,fh; + int x,y,h,fh; int icol_w, icol_h; - w = ox - 20; x = sx + 10; y = sy + oy; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 2e979e8fd..bfc2fcaee 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -901,7 +901,7 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id) CColorKeyHelper keyhelper; //user_menue.h neutrino_msg_t dummy = CRCInput::RC_nokey; const char * icon = NULL; - std::string btncaption; +// std::string btncaption; bh = std::max(FunctionBarHeight, bh); frameBuffer->paintBackgroundBoxRel(x,by,width,bh); @@ -925,10 +925,10 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id) EventListFirstButton[0].button = icon; if(is_timer == CTimerd::TIMER_RECORD ){ - btncaption = g_Locale->getText(LOCALE_TIMERLIST_DELETE); +// btncaption = g_Locale->getText(LOCALE_TIMERLIST_DELETE); EventListFirstButton[0].locale = LOCALE_TIMERLIST_DELETE; } else { - btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_RECORDEVENT); +// btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_RECORDEVENT); EventListFirstButton[0].locale = LOCALE_EVENTLISTBAR_RECORDEVENT; } @@ -948,10 +948,10 @@ void EventList::showFunctionBar (bool show, t_channel_id channel_id) keyhelper.get(&dummy, &icon, g_settings.key_channelList_addremind); EventListThirdButton[0].button = icon; if(is_timer == CTimerd::TIMER_ZAPTO) { - btncaption = g_Locale->getText(LOCALE_TIMERLIST_DELETE); +// btncaption = g_Locale->getText(LOCALE_TIMERLIST_DELETE); EventListThirdButton[0].locale = LOCALE_TIMERLIST_DELETE; } else { - btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_CHANNELSWITCH); +// btncaption = g_Locale->getText(LOCALE_EVENTLISTBAR_CHANNELSWITCH); EventListThirdButton[0].locale = LOCALE_EVENTLISTBAR_CHANNELSWITCH; } } diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 62cf3e089..8a74475f8 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1227,7 +1227,8 @@ void CInfoViewer::killRadiotext() void CInfoViewer::showRadiotext() { char stext[3][100]; - int yoff = 8, ii = 0; +// int yoff = 8; + int ii = 0; bool RTisIsUTF = false; if (g_Radiotext == NULL) return; @@ -1264,7 +1265,7 @@ void CInfoViewer::showRadiotext() frameBuffer->paintBoxRel(rt_x, rt_y, rt_dx, rt_dy, COL_INFOBAR_PLUS_0, RADIUS_LARGE, CORNER_TOP); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(rt_x+10, rt_y+ 30, rt_dx-20, stext[0], COL_INFOBAR, 0, RTisIsUTF); // UTF-8 } - yoff = 17; +// yoff = 17; ii = 1; #if 0 // RDS- or Rass-Symbol, ARec-Symbol or Bitrate @@ -1561,14 +1562,14 @@ void CInfoViewer::showSNR () g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, COL_INFOBAR); } int sw, snr, sig, posx, posy; - int height, ChanNumYPos; + + int height; ssig = CFEManager::getInstance()->getLiveFE()->getSignalStrength(); ssnr = CFEManager::getInstance()->getLiveFE()->getSignalNoiseRatio(); sig = (ssig & 0xFFFF) * 100 / 65535; snr = (ssnr & 0xFFFF) * 100 / 65535; height = g_SignalFont->getHeight () - 1; - ChanNumYPos = BoxStartY + ChanHeight /*+ 4*/ - 2 * height; if (lastsig != sig) { lastsig = sig; diff --git a/src/gui/motorcontrol.cpp b/src/gui/motorcontrol.cpp index 627b4dfc7..4df5d3506 100644 --- a/src/gui/motorcontrol.cpp +++ b/src/gui/motorcontrol.cpp @@ -714,7 +714,7 @@ void CMotorControl::showSNR() int barwidth = 100; uint16_t ssig, ssnr; int sig, snr; - int bheight, posx, posy; + int posx, posy; int sw; @@ -728,7 +728,6 @@ void CMotorControl::showSNR() g_sig = ssig & 0xFFFF; g_snr = snr; - bheight = mheight - 5; posy = y + height - mheight - 5; if (lastsig != sig) { diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 655072405..d5cc1c4f9 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -681,7 +681,7 @@ void CMovieBrowser::initRows(void) m_settings.lastRecordRowWidth[4] = m_defaultRowWidth[m_settings.lastRecordRow[4]]; m_settings.lastRecordRowWidth[5] = m_defaultRowWidth[m_settings.lastRecordRow[5]]; } - +#if 0 void CMovieBrowser::initDevelopment(void) { TRACE("[mb]->initDevelopment\r\n"); @@ -694,6 +694,7 @@ void CMovieBrowser::initDevelopment(void) //addDir(name); } +#endif void CMovieBrowser::defaultSettings(MB_SETTINGS* settings) { @@ -2378,7 +2379,6 @@ void CMovieBrowser::updateDir(void) void CMovieBrowser::loadAllTsFileNamesFromStorage(void) { //TRACE("[mb]->loadAllTsFileNamesFromStorage \r\n"); - bool result; int i,size; m_movieSelectionHandler = NULL; @@ -2391,7 +2391,7 @@ void CMovieBrowser::loadAllTsFileNamesFromStorage(void) for(i=0; i < size;i++) { if(*m_dir[i].used == true ) - result = loadTsFileNamesFromDir(m_dir[i].name); + loadTsFileNamesFromDir(m_dir[i].name); } TRACE("[mb] Dir%d, Files:%d \r\n",m_dirNames.size(),m_vMovieInfo.size()); diff --git a/src/gui/moviebrowser.h b/src/gui/moviebrowser.h index 8f751f0e2..1f1bcf637 100644 --- a/src/gui/moviebrowser.h +++ b/src/gui/moviebrowser.h @@ -330,7 +330,9 @@ class CMovieBrowser : public CMenuTarget void init(void); //P1 void initGlobalSettings(void); //P1 void initFrames(void); +#if 0 void initDevelopment(void); //P1 for development testing only +#endif void initRows(void); void reinit(void); //P1 diff --git a/src/gui/movieinfo.cpp b/src/gui/movieinfo.cpp index ed87bbdd8..eda4e0dbd 100644 --- a/src/gui/movieinfo.cpp +++ b/src/gui/movieinfo.cpp @@ -957,8 +957,8 @@ bool CMovieInfo::saveFile_std(const CFile & file, const char *text, const int te bool result = false; int fd; if ((fd = open(file.Name.c_str(), O_SYNC | O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) { - int nr; - nr = write(fd, text, text_size); + /*int nr=*/ + write(fd, text, text_size); //fdatasync(fd); close(fd); result = true; diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 017340eff..871d1188d 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -601,7 +601,6 @@ void CMoviePlayerGui::PlayFile(void) if(!g_settings.screenshot_cover){ pos = fname.find_last_of('/'); if(pos != std::string::npos) { - std::string fname_scr=fname; fname.replace(0, pos, g_settings.screenshot_dir); } } diff --git a/src/gui/nfs.cpp b/src/gui/nfs.cpp index e9df3ad87..1d80c8371 100644 --- a/src/gui/nfs.cpp +++ b/src/gui/nfs.cpp @@ -208,7 +208,7 @@ const CMenuOptionChooser::keyval NFS_TYPE_OPTIONS[NFS_TYPE_OPTION_COUNT] = int CNFSMountGui::menuEntry(int nr) { - char *dir,*local_dir, *username, *password, *options1, *options2, *mac; + char *dir,*local_dir, *username, *password, *options1, *options2/*, *mac*/; int* automount; int* type; char cmd[9]; @@ -222,7 +222,7 @@ int CNFSMountGui::menuEntry(int nr) type = &g_settings.network_nfs_type[nr]; options1 = g_settings.network_nfs_mount_options1[nr]; options2 = g_settings.network_nfs_mount_options2[nr]; - mac = g_settings.network_nfs_mac[nr]; +// mac = g_settings.network_nfs_mac[nr]; sprintf(cmd,"domount%d",nr); sprintf(cmd2,"dir%d",nr); diff --git a/src/gui/osdlang_setup.cpp b/src/gui/osdlang_setup.cpp index 5acca3b52..fc2b32a84 100644 --- a/src/gui/osdlang_setup.cpp +++ b/src/gui/osdlang_setup.cpp @@ -128,7 +128,7 @@ CMenuOptionStringChooser* COsdLangSetup::getTzItems() if (!strcmp(xmlGetName(search), "zone")) { std::string name = xmlGetAttribute(search, "name"); - std::string zone = xmlGetAttribute(search, "zone"); +// std::string zone = xmlGetAttribute(search, "zone"); //printf("Timezone: %s -> %s\n", name.c_str(), zone.c_str()); tzSelect->addOption(name.c_str()); found = true; diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 8a5951df1..63cdeafc2 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -900,18 +900,17 @@ int CStreamInfo2::ts_setup () int CStreamInfo2::update_rate () { - unsigned char buf[TS_BUF_SIZE]; - long b; - - int ret = 0; - int b_len, b_start; - int timeout = 100; if(!dmx) return 0; - b_len = 0; - b_start = 0; + unsigned char buf[TS_BUF_SIZE] = {0}; + long b = 0; + + int ret = 0; + int b_len = 0; + int timeout = 100; + b_len = dmx->Read(buf, sizeof (buf), timeout); //printf("ts: read %d\n", b_len); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 0413f53a7..238e153cc 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -787,12 +787,12 @@ void CTimerList::paintItem(int pos) if (liststart+pos==selected) { std::string line1 = convertTimerType2String(timer.eventType); // UTF-8 - std::string line2 = zAlarmTime; + //std::string line2 = zAlarmTime; switch (timer.eventType) { case CTimerd::TIMER_RECORD : - line2+= " -"; - line2+= zStopTime+6; + // line2+= " -"; + // line2+= zStopTime+6; case CTimerd::TIMER_NEXTPROGRAM : case CTimerd::TIMER_ZAPTO : { diff --git a/src/sectionsd/dmx.cpp b/src/sectionsd/dmx.cpp index 45eb54661..47a0eacda 100644 --- a/src/sectionsd/dmx.cpp +++ b/src/sectionsd/dmx.cpp @@ -276,7 +276,7 @@ int DMX::getSection(char *buf, const unsigned timeoutInMSeconds, int &timeouts) extended_section_header *extended_header; eit_extended_section_header *eit_extended_header; int rc; - unsigned short section_length; + short section_length = 0; unsigned short current_onid = 0; unsigned short current_tsid = 0; diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp index efca3dbf9..c7fb314b2 100644 --- a/src/sectionsd/sectionsd.cpp +++ b/src/sectionsd/sectionsd.cpp @@ -35,6 +35,8 @@ #include #include +#include +#include #include #include #include @@ -4592,7 +4594,7 @@ static void *insertEventsfromFile(void *) struct stat buf; indexname = epg_dir + "index.tmp"; //skip read EPG cache if index.tmp available - if (!(stat(indexname.c_str(), &buf) == 0)){ + if (stat(indexname.c_str(), &buf) != 0){ indexname = epg_dir + "index.xml";