mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

initialize volues

Browse Source
This commit is contained in:
satbaby
2012-05-09 17:33:34 +02:00
parent a79e374cab
commit 489d88a9a2
9 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libeventserver/eventserver.cpp
View File

@@ -31,7 +31,7 @@
#include "eventserver.h"
void CEventServer::registerEvent2(const unsigned int eventID, const unsigned int ClientID, const std::string udsName)
void CEventServer::registerEvent2(const unsigned int eventID, const unsigned int ClientID, const std::string &udsName)
{
strcpy(eventData[eventID][ClientID].udsName, udsName.c_str());
}

2
lib/libeventserver/eventserver.h
View File

@@ -68,7 +68,7 @@ class CEventServer
unsigned int dataSize;
};
void registerEvent2(const unsigned int eventID, const unsigned int ClientID, const std::string udsName);
void registerEvent2(const unsigned int eventID, const unsigned int ClientID, const std::string &udsName);
void registerEvent(const int fd);
void unRegisterEvent2(const unsigned int eventID, const unsigned int ClientID);
void unRegisterEvent(const int fd);

1
src/eitd/SIevents.cpp
View File

@@ -52,6 +52,7 @@ SIevent::SIevent(const t_original_network_id _original_network_id, const t_trans
eventID = _event_id;
table_id = 0xFF; /* not set */
version = 0xFF;
running = 0;
}
void SIevent::parse(Event &event)

8
src/eitd/sectionsd.cpp
View File

@@ -493,7 +493,7 @@ xprintf("addEvent: current %016llx event %016llx running %d messaging_got_CN %d\
{
// ist ein MetaEvent, d.h. mit Zeiten fuer NVOD-Event
if (e->times.size())
if (!e->times.empty())
{
// D.h. wir fuegen die Zeiten in das richtige Event ein
MySIeventsOrderUniqueKey::iterator ie = mySIeventsOrderUniqueKey.find(i->second);
@@ -527,7 +527,7 @@ xprintf("addEvent: current %016llx event %016llx running %d messaging_got_CN %d\
// normales Event
mySIeventsOrderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
if (e->times.size())
if (!e->times.empty())
{
// diese beiden Mengen enthalten nur Events mit Zeiten
mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.insert(e);
@@ -588,7 +588,7 @@ static void addNVODevent(const SIevent &evt)
mySIeventsNVODorderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
unlockEvents();
if (e->times.size())
if (!e->times.empty())
{
// diese beiden Mengen enthalten nur Events mit Zeiten
writeLockEvents();
@@ -1472,7 +1472,7 @@ void CSectionThread::run()
{
xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
if (sections_debug)
dump_sched_info(name.c_str());
dump_sched_info(name);
addFilters();

8
src/gui/bedit/bouqueteditor_bouquets.cpp
View File

@@ -55,6 +55,14 @@ CBEBouquetWidget::CBEBouquetWidget()
int icol_w, icol_h;
frameBuffer = CFrameBuffer::getInstance();
iconoffset = 0;
origPosition = 0;
newPosition = 0;
listmaxshow = 0;
bouquetsChanged = 0;
width = 0;
height = 0;
x = 0;
y = 0;
ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8;

10
src/gui/bedit/bouqueteditor_channels.cpp
View File

@@ -60,6 +60,16 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
frameBuffer = CFrameBuffer::getInstance();
selected = 0;
iconoffset = 0;
origPosition = 0;
newPosition = 0;
listmaxshow = 0;
numwidth = 0;
info_height = 0;
channelsChanged = false;
width = 0;
height = 0;
x = 0;
y = 0;
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();

1
src/gui/bedit/bouqueteditor_channels.h
View File

@@ -69,7 +69,6 @@ class CBEChannelWidget : public CMenuWidget
int footerHeight;
int info_height;
int ButtonHeight;
std::string caption;
bool channelsChanged;

2
src/gui/bedit/bouqueteditor_chanselect.cpp
View File

@@ -57,7 +57,7 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsi
bouquet = Bouquet;
mode = Mode;
iconoffset = 0;
info_height = 0;
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;

2
src/gui/infoviewer.cpp
View File

@@ -2263,7 +2263,7 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon, int &icon_space_offset)
icon_map[0x0D00] = std::make_pair(index++,"cw");
icon_map[0x0900] = std::make_pair(index ,"nds");
for (it=icon_map.begin(); it!=icon_map.end(); it++) {
for (it=icon_map.begin(); it!=icon_map.end(); ++it) {
snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon);
frameBuffer->getIconSize(buf, &icon_sizeW[(*it).second.first], &icon_sizeH);
}