mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-27 07:23:09 +02:00
initialize volues
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#include "eventserver.h"
|
#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());
|
strcpy(eventData[eventID][ClientID].udsName, udsName.c_str());
|
||||||
}
|
}
|
||||||
|
@@ -68,7 +68,7 @@ class CEventServer
|
|||||||
unsigned int dataSize;
|
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 registerEvent(const int fd);
|
||||||
void unRegisterEvent2(const unsigned int eventID, const unsigned int ClientID);
|
void unRegisterEvent2(const unsigned int eventID, const unsigned int ClientID);
|
||||||
void unRegisterEvent(const int fd);
|
void unRegisterEvent(const int fd);
|
||||||
|
@@ -52,6 +52,7 @@ SIevent::SIevent(const t_original_network_id _original_network_id, const t_trans
|
|||||||
eventID = _event_id;
|
eventID = _event_id;
|
||||||
table_id = 0xFF; /* not set */
|
table_id = 0xFF; /* not set */
|
||||||
version = 0xFF;
|
version = 0xFF;
|
||||||
|
running = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SIevent::parse(Event &event)
|
void SIevent::parse(Event &event)
|
||||||
|
@@ -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
|
// 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
|
// D.h. wir fuegen die Zeiten in das richtige Event ein
|
||||||
MySIeventsOrderUniqueKey::iterator ie = mySIeventsOrderUniqueKey.find(i->second);
|
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
|
// normales Event
|
||||||
mySIeventsOrderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
|
mySIeventsOrderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
|
||||||
|
|
||||||
if (e->times.size())
|
if (!e->times.empty())
|
||||||
{
|
{
|
||||||
// diese beiden Mengen enthalten nur Events mit Zeiten
|
// diese beiden Mengen enthalten nur Events mit Zeiten
|
||||||
mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.insert(e);
|
mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.insert(e);
|
||||||
@@ -588,7 +588,7 @@ static void addNVODevent(const SIevent &evt)
|
|||||||
|
|
||||||
mySIeventsNVODorderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
|
mySIeventsNVODorderUniqueKey.insert(std::make_pair(e->uniqueKey(), e));
|
||||||
unlockEvents();
|
unlockEvents();
|
||||||
if (e->times.size())
|
if (!e->times.empty())
|
||||||
{
|
{
|
||||||
// diese beiden Mengen enthalten nur Events mit Zeiten
|
// diese beiden Mengen enthalten nur Events mit Zeiten
|
||||||
writeLockEvents();
|
writeLockEvents();
|
||||||
@@ -1472,7 +1472,7 @@ void CSectionThread::run()
|
|||||||
{
|
{
|
||||||
xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
|
xprintf("%s::run:: starting, pid %d (%lu)\n", name.c_str(), getpid(), pthread_self());
|
||||||
if (sections_debug)
|
if (sections_debug)
|
||||||
dump_sched_info(name.c_str());
|
dump_sched_info(name);
|
||||||
|
|
||||||
addFilters();
|
addFilters();
|
||||||
|
|
||||||
|
@@ -55,6 +55,14 @@ CBEBouquetWidget::CBEBouquetWidget()
|
|||||||
int icol_w, icol_h;
|
int icol_w, icol_h;
|
||||||
frameBuffer = CFrameBuffer::getInstance();
|
frameBuffer = CFrameBuffer::getInstance();
|
||||||
iconoffset = 0;
|
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;
|
ButtonHeight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+8;
|
||||||
|
|
||||||
|
@@ -60,6 +60,16 @@ CBEChannelWidget::CBEChannelWidget(const std::string & Caption, unsigned int Bou
|
|||||||
frameBuffer = CFrameBuffer::getInstance();
|
frameBuffer = CFrameBuffer::getInstance();
|
||||||
selected = 0;
|
selected = 0;
|
||||||
iconoffset = 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();
|
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
|
||||||
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
|
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
|
||||||
|
@@ -69,7 +69,6 @@ class CBEChannelWidget : public CMenuWidget
|
|||||||
int footerHeight;
|
int footerHeight;
|
||||||
int info_height;
|
int info_height;
|
||||||
|
|
||||||
int ButtonHeight;
|
|
||||||
std::string caption;
|
std::string caption;
|
||||||
bool channelsChanged;
|
bool channelsChanged;
|
||||||
|
|
||||||
|
@@ -57,7 +57,7 @@ CBEChannelSelectWidget::CBEChannelSelectWidget(const std::string & Caption, unsi
|
|||||||
bouquet = Bouquet;
|
bouquet = Bouquet;
|
||||||
mode = Mode;
|
mode = Mode;
|
||||||
iconoffset = 0;
|
iconoffset = 0;
|
||||||
|
info_height = 0;
|
||||||
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
|
theight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
|
||||||
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
|
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
|
||||||
footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
|
footerHeight= g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight()+6;
|
||||||
|
@@ -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[0x0D00] = std::make_pair(index++,"cw");
|
||||||
icon_map[0x0900] = std::make_pair(index ,"nds");
|
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);
|
snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon);
|
||||||
frameBuffer->getIconSize(buf, &icon_sizeW[(*it).second.first], &icon_sizeH);
|
frameBuffer->getIconSize(buf, &icon_sizeW[(*it).second.first], &icon_sizeH);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user