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

Fixes for Werror build

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@529 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-03-27 14:11:27 +00:00
parent bba7ffe7e1
commit cdab9d60bf
3 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
else if (msg==CRCInput::RC_down || msg==(neutrino_msg_t)g_settings.key_channelList_pagedown) else if (msg==CRCInput::RC_down || msg==(neutrino_msg_t)g_settings.key_channelList_pagedown)
{ {
unsigned int step = 0; unsigned int step = 0;
int prev_selected = selected; unsigned int prev_selected = selected;
step = (msg==(neutrino_msg_t)g_settings.key_channelList_pagedown) ? listmaxshow : 1; // browse or step 1 step = (msg==(neutrino_msg_t)g_settings.key_channelList_pagedown) ? listmaxshow : 1; // browse or step 1
selected += step; selected += step;

2
src/zapit/src/fastscan.cpp
View File

@@ -502,7 +502,7 @@ int parse_fnt(unsigned short pid, unsigned short operator_id)
FrontendParameters feparams; FrontendParameters feparams;
uint8_t polarization; uint8_t polarization;
t_satellite_position satellitePosition = 0; t_satellite_position satellitePosition = 0;
freq_id_t freq; freq_id_t freq = 0;
for (pos2 = pos + 6; pos2 < pos + transport_descriptors_length + 6; pos2 += buffer[pos2 + 1] + 2) for (pos2 = pos + 6; pos2 < pos + transport_descriptors_length + 6; pos2 += buffer[pos2 + 1] + 2)
{ {

38
src/zapit/src/frontend.cpp
View File

@@ -131,7 +131,7 @@ int startPlayBack(CZapitChannel * thisChannel);
int zapit(const t_channel_id channel_id, bool in_nvod, bool forupdate = 0, bool nowait = 0); int zapit(const t_channel_id channel_id, bool in_nvod, bool forupdate = 0, bool nowait = 0);
#define TIMER_INIT() \ #define TIMER_INIT() \
static unsigned int tmin = 2000, tmax; \ static unsigned int tmin = 2000, tmax = 0; \
struct timeval tv, tv2; \ struct timeval tv, tv2; \
unsigned int timer_msec = 0; unsigned int timer_msec = 0;
@@ -402,9 +402,6 @@ struct dvb_frontend_event CFrontend::getEvent(void)
TIMER_INIT(); TIMER_INIT();
int msec = TIME_STEP;
int tmsec = msec;
pfd.fd = fd; pfd.fd = fd;
pfd.events = POLLIN | POLLPRI; pfd.events = POLLIN | POLLPRI;
pfd.revents = 0; pfd.revents = 0;
@@ -415,16 +412,15 @@ struct dvb_frontend_event CFrontend::getEvent(void)
TIMER_START(); TIMER_START();
//while (msec <= TIMEOUT_MAX_MS ) { //while (msec <= TIMEOUT_MAX_MS ) {
while ((int) timer_msec <= TIMEOUT_MAX_MS) { while ((int) timer_msec < TIMEOUT_MAX_MS) {
//int ret = poll(&pfd, 1, TIME_STEP); //int ret = poll(&pfd, 1, TIME_STEP);
int ret = poll(&pfd, 1, TIMEOUT_MAX_MS); int ret = poll(&pfd, 1, TIMEOUT_MAX_MS - timer_msec);
if (ret < 0) { if (ret < 0) {
perror("CFrontend::getEvent poll"); perror("CFrontend::getEvent poll");
continue; continue;
} }
if (ret == 0) { if (ret == 0) {
TIMER_STOP("[fe0] ############################## poll timeout, time"); TIMER_STOP("[fe0] ############################## poll timeout, time");
msec += TIME_STEP;
continue; continue;
} }
@@ -446,7 +442,7 @@ struct dvb_frontend_event CFrontend::getEvent(void)
break; break;
} else if (event.status & FE_TIMEDOUT) { } else if (event.status & FE_TIMEDOUT) {
printf("[fe%d] ############################## FE_TIMEDOUT\n", fenumber); printf("[fe%d] ############################## FE_TIMEDOUT\n", fenumber);
break; /*break;*/
} else { } else {
if (event.status & FE_HAS_SIGNAL) if (event.status & FE_HAS_SIGNAL)
printf("[fe%d] FE_HAS_SIGNAL\n", fenumber); printf("[fe%d] FE_HAS_SIGNAL\n", fenumber);
@@ -464,10 +460,6 @@ struct dvb_frontend_event CFrontend::getEvent(void)
TIMER_STOP("[fe0] poll hup after"); TIMER_STOP("[fe0] poll hup after");
reset(); reset();
} }
msec += TIME_STEP;
tmsec += TIME_STEP;
if (tmsec > 15000)
break;
} }
//printf("[fe%d] event after: %d\n", fenumber, tmsec); //printf("[fe%d] event after: %d\n", fenumber, tmsec);
return event; return event;
@@ -703,27 +695,14 @@ int CFrontend::setFrontend(const struct dvb_frontend_parameters *feparams, bool
struct dvb_frontend_event ev; struct dvb_frontend_event ev;
{ {
TIMER_INIT(); //TIMER_INIT();
TIMER_START(); //TIMER_START();
struct pollfd pfd;
pfd.fd = fd;
pfd.events = POLLIN | POLLPRI;
pfd.revents = 0;
#if 1
while (1) { while (1) {
if (ioctl(fd, FE_GET_EVENT, &ev) < 0) if (ioctl(fd, FE_GET_EVENT, &ev) < 0)
break; break;
printf("[fe0] DEMOD: event status %d\n", ev.status); printf("[fe0] DEMOD: event status %d\n", ev.status);
} }
#else //TIMER_STOP("[fe0] clear events took");
int ret = poll(&pfd, 1, 100);
if (ret > 0) {
if (ioctl(fd, FE_GET_EVENT, &ev) >= 0)
printf("[fe0] CLEAR DEMOD: event status %d\n", ev.status);
}
#endif
TIMER_STOP("[fe0] clear events took");
} }
printf("[fe0] DEMOD: FEC %s system %s modulation %s pilot %s\n", f, s, m, pilot == PILOT_ON ? "on" : "off"); printf("[fe0] DEMOD: FEC %s system %s modulation %s pilot %s\n", f, s, m, pilot == PILOT_ON ? "on" : "off");
@@ -740,7 +719,8 @@ int CFrontend::setFrontend(const struct dvb_frontend_parameters *feparams, bool
TIMER_INIT(); TIMER_INIT();
TIMER_START(); TIMER_START();
getEvent(); struct dvb_frontend_event event;
event = getEvent();
TIMER_STOP("[fe0] tuning took"); TIMER_STOP("[fe0] tuning took");
} }