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

never used values

Browse Source
This commit is contained in:
satbaby
2012-05-08 15:49:36 +02:00
parent 8e06495776
commit e023548008
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/audiodec/wavdec.cpp
View File

@@ -51,18 +51,18 @@ extern cAudio * audioDecoder;
struct WavHeader struct WavHeader
{ {
char ChunkID[4]; char ChunkID[4];
int ChunkSize; // int ChunkSize;
char Format[4]; char Format[4];
char Subchunk1ID[4]; // char Subchunk1ID[4];
int Subchunk1Size; // int Subchunk1Size;
short AudioFormat; short AudioFormat;
short NumChannels; short NumChannels;
int SampleRate; int SampleRate;
int ByteRate; int ByteRate;
short BlockAlign; // short BlockAlign;
short BitsPerSample; short BitsPerSample;
char Subchunk2ID[4]; // char Subchunk2ID[4];
int Subchunk2Size; // int Subchunk2Size;
} __attribute__ ((packed)); } __attribute__ ((packed));
int endianTest=1; int endianTest=1;

8
src/driver/pig.cpp
View File

@@ -143,7 +143,7 @@ void CPIG::_set_window (int x, int y, int w, int h)
// -- Modul interne Routine // -- Modul interne Routine
struct v4l2_crop crop; struct v4l2_crop crop;
struct v4l2_format coord; struct v4l2_format coord;
int err; // int err;
crop.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; crop.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
err = ioctl(fd, VIDIOC_G_CROP, &crop); err = ioctl(fd, VIDIOC_G_CROP, &crop);
@@ -153,10 +153,10 @@ void CPIG::_set_window (int x, int y, int w, int h)
crop.c.top = 0; crop.c.top = 0;
crop.c.width = 720; crop.c.width = 720;
crop.c.height = 576; crop.c.height = 576;
err = ioctl(fd, VIDIOC_S_CROP, &crop); /*err =*/ ioctl(fd, VIDIOC_S_CROP, &crop);
coord.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; coord.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
err = ioctl(fd, VIDIOC_G_FMT, &coord); /*err = */ioctl(fd, VIDIOC_G_FMT, &coord);
// fit into small window // fit into small window
coord.fmt.win.w.left = x; coord.fmt.win.w.left = x;
@@ -178,7 +178,7 @@ void CPIG::_set_window (int x, int y, int w, int h)
coord.fmt.win.w.height = h; coord.fmt.win.w.height = h;
int pigmode = 0; int pigmode = 0;
err = ioctl(fd, VIDIOC_OVERLAY, &pigmode); /*err =*/ ioctl(fd, VIDIOC_OVERLAY, &pigmode);
printf("pig::window VIDIOC_OVERLAY %d\n", err); printf("pig::window VIDIOC_OVERLAY %d\n", err);
err = ioctl(fd, VIDIOC_S_FMT, &coord); err = ioctl(fd, VIDIOC_S_FMT, &coord);

1
src/gui/plugins.h
View File

@@ -87,7 +87,6 @@ class CPlugins
} }
}; };
int fb, rc, lcd, pid;
int number_of_plugins; int number_of_plugins;
std::vector<plugin> plugin_list; std::vector<plugin> plugin_list;

4
src/neutrino.cpp
View File

@@ -2325,7 +2325,7 @@ _show:
int old_mode = GetChannelMode(); int old_mode = GetChannelMode();
printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, bouquetList->Bouquets.size(), old_b);fflush(stdout); printf("************************* ZAP START: bouquetList %p size %d old_b %d\n", bouquetList, bouquetList->Bouquets.size(), old_b);fflush(stdout);
if(bouquetList->Bouquets.size()) { if(!bouquetList->Bouquets.empty()) {
old_num = bouquetList->Bouquets[old_b]->channelList->getSelected(); old_num = bouquetList->Bouquets[old_b]->channelList->getSelected();
} }
//_show: //_show:
@@ -2354,7 +2354,7 @@ _repeat:
* other modes selected bouquet not restored */ * other modes selected bouquet not restored */
SetChannelMode(old_mode); SetChannelMode(old_mode);
bouquetList->activateBouquet(old_b, false); bouquetList->activateBouquet(old_b, false);
if(bouquetList->Bouquets.size()) if(bouquetList->Bouquets.empty())
bouquetList->Bouquets[old_b]->channelList->setSelected(old_num); bouquetList->Bouquets[old_b]->channelList->setSelected(old_num);
StartSubtitles(mode == mode_tv); StartSubtitles(mode == mode_tv);
} }

2
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1796,7 +1796,7 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh)
sort(timerlist.begin(), timerlist.end()); // sort timer sort(timerlist.begin(), timerlist.end()); // sort timer
CTimerd::TimerList::iterator timer = timerlist.begin(); CTimerd::TimerList::iterator timer = timerlist.begin();
std::string xml_response = ""; // std::string xml_response = "";
hh->SetHeader(HTTP_OK, "text/xml; charset=UTF-8"); hh->SetHeader(HTTP_OK, "text/xml; charset=UTF-8");
hh->WriteLn("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); hh->WriteLn("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
hh->WriteLn("<timer>\n"); hh->WriteLn("<timer>\n");

3
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -97,7 +97,8 @@ THandleStatus CNeutrinoYParser::Hook_ReadConfig(CConfigFile *Config, CStringList
Config->setInt32("configfile.version", CONF_VERSION); Config->setInt32("configfile.version", CONF_VERSION);
Config->saveConfig(HTTPD_CONFIGFILE); Config->saveConfig(HTTPD_CONFIGFILE);
} }
std::string logo = ConfigList["TUXBOX_LOGOS_URL"]; //std::string logo =
ConfigList["TUXBOX_LOGOS_URL"];
return HANDLED_CONTINUE; return HANDLED_CONTINUE;
} }

8
src/zapit/src/descriptors.cpp
View File

@@ -249,7 +249,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
uint8_t polarization; uint8_t polarization;
stiterator tI; stiterator tI;
transponder_id_t TsidOnid; transponder_id_t TsidOnid;
int modulationSystem, modulationType, rollOff, fec_inner; int modulationSystem, modulationType/*, rollOff*/, fec_inner;
if (CFrontend::getInstance()->getInfo()->type != FE_QPSK) if (CFrontend::getInstance()->getInfo()->type != FE_QPSK)
return -1; return -1;
@@ -268,7 +268,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t
feparams.inversion = INVERSION_AUTO; feparams.inversion = INVERSION_AUTO;
rollOff = (buffer[8] >> 4) & 0x03; //alpha_0_35, alpha_0_25, alpha_0_20, alpha_auto // rollOff = (buffer[8] >> 4) & 0x03; //alpha_0_35, alpha_0_25, alpha_0_20, alpha_auto
modulationSystem = (buffer[8] >> 2) & 0x01; // 1= DVB_S2 modulationSystem = (buffer[8] >> 2) & 0x01; // 1= DVB_S2
modulationType = (buffer[8]) & 0x03; // 1=QPSK, 2=M8PSK modulationType = (buffer[8]) & 0x03; // 1=QPSK, 2=M8PSK
@@ -475,7 +475,7 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s
std::string providerName((const char*)&(buffer[4]), service_provider_name_length); std::string providerName((const char*)&(buffer[4]), service_provider_name_length);
std::string serviceName; std::string serviceName;
std::string satelliteName = "unknown"; // std::string satelliteName = "unknown";
bool in_blacklist = false; bool in_blacklist = false;
if (check_blacklisted(providerName)) { if (check_blacklisted(providerName)) {
@@ -713,7 +713,7 @@ void current_service_descriptor(const unsigned char * const buffer, const t_serv
std::string providerName((const char*)&(buffer[4]), service_provider_name_length); std::string providerName((const char*)&(buffer[4]), service_provider_name_length);
std::string serviceName; std::string serviceName;
std::string satelliteName = "unknown"; // std::string satelliteName = "unknown";
bool in_blacklist = false; bool in_blacklist = false;

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

@@ -344,7 +344,7 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
void CServiceManager::ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream_id, const t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq, uint8_t polarization) void CServiceManager::ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream_id, const t_original_network_id original_network_id, t_satellite_position satellitePosition, freq_id_t freq, uint8_t polarization)
{ {
int dummy; int dummy = 0;
int * have_ptr = &dummy; int * have_ptr = &dummy;
sat_iterator_t sit = satellitePositions.find(satellitePosition); sat_iterator_t sit = satellitePositions.find(satellitePosition);