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

never used

Browse Source
This commit is contained in:
satbaby
2012-12-07 12:01:45 +01:00
parent fe16513b4f
commit 1d5e7b23b3
7 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/eitd/SIevents.hpp
View File

@@ -89,10 +89,13 @@ struct descr_linkage_header {
struct descr_pdc_header { struct descr_pdc_header {
unsigned descriptor_tag : 8; unsigned descriptor_tag : 8;
#if 0
// unused
unsigned descriptor_length : 8; unsigned descriptor_length : 8;
unsigned pil0 : 8; unsigned pil0 : 8;
unsigned pil1 : 8; unsigned pil1 : 8;
unsigned pil2 : 8; unsigned pil2 : 8;
#endif
} __attribute__ ((packed)) ; } __attribute__ ((packed)) ;
class SIlinkage { class SIlinkage {

5
src/eitd/SIsections.hpp
View File

@@ -65,7 +65,8 @@ struct SI_section_EIT_header {
unsigned segment_last_section_number : 8; unsigned segment_last_section_number : 8;
unsigned last_table_id : 8; unsigned last_table_id : 8;
} __attribute__ ((packed)) ; // 14 bytes } __attribute__ ((packed)) ; // 14 bytes
#if 0
// unused
struct SI_section_header { struct SI_section_header {
unsigned table_id : 8; unsigned table_id : 8;
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
@@ -94,7 +95,7 @@ struct SI_section_header {
unsigned section_number : 8; unsigned section_number : 8;
unsigned last_section_number : 8; unsigned last_section_number : 8;
} __attribute__ ((packed)) ; // 8 bytes } __attribute__ ((packed)) ; // 8 bytes
#endif
class SIsectionEIT class SIsectionEIT
#ifdef USE_DVBSI_EVENTS #ifdef USE_DVBSI_EVENTS
: public EventInformationSection : public EventInformationSection

12
src/eitd/SIservices.hpp
View File

@@ -51,7 +51,8 @@ public:
{ {
return uniqueKey() < ref.uniqueKey(); return uniqueKey() < ref.uniqueKey();
} }
#if 0
//unused
void toStream(char * &p) const void toStream(char * &p) const
{ {
*(t_service_id *)p = service_id; p += sizeof(t_service_id); *(t_service_id *)p = service_id; p += sizeof(t_service_id);
@@ -63,7 +64,7 @@ public:
{ {
return service_id; return service_id;
} }
#endif
t_channel_id uniqueKey(void) const { t_channel_id uniqueKey(void) const {
return CREATE_CHANNEL_ID(service_id, original_network_id, transport_stream_id); // cf. zapittypes.h return CREATE_CHANNEL_ID(service_id, original_network_id, transport_stream_id); // cf. zapittypes.h
} }
@@ -115,11 +116,16 @@ public:
is_actual = 0; is_actual = 0;
} }
#if 0
// unused
int eitScheduleFlag(void) { return (int)flags.EIT_schedule_flag; } int eitScheduleFlag(void) { return (int)flags.EIT_schedule_flag; }
int eitPresentFollowingFlag(void) { return (int)flags.EIT_present_following_flag; } int eitPresentFollowingFlag(void) { return (int)flags.EIT_present_following_flag; }
#endif
int runningStatus(void) { return (int)flags.running_status; } int runningStatus(void) { return (int)flags.running_status; }
#if 0
// unused
int freeCAmode(void) { return (int)flags.free_CA_mode; } int freeCAmode(void) { return (int)flags.free_CA_mode; }
#endif
bool operator < (const SIservice& s) const { bool operator < (const SIservice& s) const {
return uniqueKey() < s.uniqueKey(); return uniqueKey() < s.uniqueKey();
} }

4
src/gui/epgplus.cpp
View File

@@ -694,8 +694,8 @@ void EpgPlus::init()
CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h); CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_RED, &icol_w, &icol_h);
CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &h2); CFrameBuffer::getInstance()->getIconSize(NEUTRINO_ICON_BUTTON_HELP, &icol_w, &h2);
if(icol_h < h2) // if(icol_h < h2)
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 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; int footerHeight = Footer::getUsedHeight() + buttonHeight;

2
src/gui/timerlist.cpp
View File

@@ -776,7 +776,7 @@ void CTimerList::paintItem(int pos)
{ {
zAddData += sep; zAddData += sep;
zAddData += "AC3"; zAddData += "AC3";
sep = "/"; // sep = "/";
} }
zAddData += ')'; zAddData += ')';
} }

2
src/gui/widget/progresswindow.cpp
View File

@@ -166,7 +166,7 @@ void CProgressWindow::paint()
ypos+= mheight; ypos+= mheight;
globalstatusY = ypos+ mheight-20; globalstatusY = ypos+ mheight-20;
ypos+= mheight >>1; //ypos+= mheight >>1;
showGlobalStatus(global_progress); showGlobalStatus(global_progress);
} }

2
src/timerd/timerd.cpp
View File

@@ -61,7 +61,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
rspGetSleeptimer.eventID = 0; rspGetSleeptimer.eventID = 0;
if (CTimerManager::getInstance()->listEvents(events)) 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); printf("ID: %u type: %u\n",pos->second->eventID,pos->second->eventType);
if(pos->second->eventType == CTimerd::TIMER_SLEEPTIMER) if(pos->second->eventType == CTimerd::TIMER_SLEEPTIMER)