diff --git a/src/eitd/SIevents.hpp b/src/eitd/SIevents.hpp index 398f384b5..c1af74493 100644 --- a/src/eitd/SIevents.hpp +++ b/src/eitd/SIevents.hpp @@ -89,10 +89,13 @@ struct descr_linkage_header { struct descr_pdc_header { unsigned descriptor_tag : 8; +#if 0 + // unused unsigned descriptor_length : 8; unsigned pil0 : 8; unsigned pil1 : 8; unsigned pil2 : 8; +#endif } __attribute__ ((packed)) ; class SIlinkage { diff --git a/src/eitd/SIsections.hpp b/src/eitd/SIsections.hpp index 21b4df4b2..5862e1717 100644 --- a/src/eitd/SIsections.hpp +++ b/src/eitd/SIsections.hpp @@ -65,7 +65,8 @@ struct SI_section_EIT_header { unsigned segment_last_section_number : 8; unsigned last_table_id : 8; } __attribute__ ((packed)) ; // 14 bytes - +#if 0 +// unused struct SI_section_header { unsigned table_id : 8; #if __BYTE_ORDER == __BIG_ENDIAN @@ -94,7 +95,7 @@ struct SI_section_header { unsigned section_number : 8; unsigned last_section_number : 8; } __attribute__ ((packed)) ; // 8 bytes - +#endif class SIsectionEIT #ifdef USE_DVBSI_EVENTS : public EventInformationSection diff --git a/src/eitd/SIservices.hpp b/src/eitd/SIservices.hpp index 80f1f3f1b..4d6796c0a 100644 --- a/src/eitd/SIservices.hpp +++ b/src/eitd/SIservices.hpp @@ -51,7 +51,8 @@ public: { return uniqueKey() < ref.uniqueKey(); } - +#if 0 +//unused void toStream(char * &p) const { *(t_service_id *)p = service_id; p += sizeof(t_service_id); @@ -63,7 +64,7 @@ public: { return service_id; } - +#endif t_channel_id uniqueKey(void) const { return CREATE_CHANNEL_ID(service_id, original_network_id, transport_stream_id); // cf. zapittypes.h } @@ -115,11 +116,16 @@ public: is_actual = 0; } +#if 0 +// unused int eitScheduleFlag(void) { return (int)flags.EIT_schedule_flag; } int eitPresentFollowingFlag(void) { return (int)flags.EIT_present_following_flag; } +#endif int runningStatus(void) { return (int)flags.running_status; } +#if 0 +// unused int freeCAmode(void) { return (int)flags.free_CA_mode; } - +#endif bool operator < (const SIservice& s) const { return uniqueKey() < s.uniqueKey(); } diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 84e4d42df..0aed608ff 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -694,8 +694,8 @@ void EpgPlus::init() CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h); CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &h2); - if(icol_h < h2) - icol_h = h2; +// if(icol_h < h2) +// icol_h = h2; int buttonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8; //TODO get height from buttons/*std::max (icol_h+8, fonts[EPGPlus_footer_fontbuttons]->getHeight());*/ int footerHeight = Footer::getUsedHeight() + buttonHeight; diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index c0c15595a..2491ddcc3 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -776,7 +776,7 @@ void CTimerList::paintItem(int pos) { zAddData += sep; zAddData += "AC3"; - sep = "/"; +// sep = "/"; } zAddData += ')'; } diff --git a/src/gui/widget/progresswindow.cpp b/src/gui/widget/progresswindow.cpp index fa8dff4e4..0e06617e7 100644 --- a/src/gui/widget/progresswindow.cpp +++ b/src/gui/widget/progresswindow.cpp @@ -166,7 +166,7 @@ void CProgressWindow::paint() ypos+= mheight; globalstatusY = ypos+ mheight-20; - ypos+= mheight >>1; + //ypos+= mheight >>1; showGlobalStatus(global_progress); } diff --git a/src/timerd/timerd.cpp b/src/timerd/timerd.cpp index db1e2c5da..5eb5c509e 100644 --- a/src/timerd/timerd.cpp +++ b/src/timerd/timerd.cpp @@ -61,7 +61,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) rspGetSleeptimer.eventID = 0; if (CTimerManager::getInstance()->listEvents(events)) { - for (pos = events.begin(); pos != events.end(); pos++) + for (pos = events.begin(); pos != events.end(); ++pos) { printf("ID: %u type: %u\n",pos->second->eventID,pos->second->eventType); if(pos->second->eventType == CTimerd::TIMER_SLEEPTIMER)