From d6ac9e52c5407e7605f2d3a18979b02dd858c2e5 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 8 May 2012 15:49:36 +0200 Subject: [PATCH] never used values Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e023548008dd6462f33fe92434b135fe5ed8f6b5 Author: Jacek Jendrzej Date: 2012-05-08 (Tue, 08 May 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/audiodec/wavdec.cpp | 12 ++++++------ src/driver/pig.cpp | 8 ++++---- src/gui/plugins.h | 1 - src/neutrino.cpp | 4 ++-- src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 +- src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp | 3 ++- src/zapit/src/descriptors.cpp | 8 ++++---- src/zapit/src/getservices.cpp | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/driver/audiodec/wavdec.cpp b/src/driver/audiodec/wavdec.cpp index 9a0f8c9c4..7727f1412 100644 --- a/src/driver/audiodec/wavdec.cpp +++ b/src/driver/audiodec/wavdec.cpp @@ -51,18 +51,18 @@ extern cAudio * audioDecoder; struct WavHeader { char ChunkID[4]; - int ChunkSize; +// int ChunkSize; char Format[4]; - char Subchunk1ID[4]; - int Subchunk1Size; +// char Subchunk1ID[4]; +// int Subchunk1Size; short AudioFormat; short NumChannels; int SampleRate; int ByteRate; - short BlockAlign; +// short BlockAlign; short BitsPerSample; - char Subchunk2ID[4]; - int Subchunk2Size; +// char Subchunk2ID[4]; +// int Subchunk2Size; } __attribute__ ((packed)); int endianTest=1; diff --git a/src/driver/pig.cpp b/src/driver/pig.cpp index 40e9ceebb..f9c324892 100644 --- a/src/driver/pig.cpp +++ b/src/driver/pig.cpp @@ -143,7 +143,7 @@ void CPIG::_set_window (int x, int y, int w, int h) // -- Modul interne Routine struct v4l2_crop crop; struct v4l2_format coord; - int err; +// int err; crop.type = V4L2_BUF_TYPE_VIDEO_OVERLAY; 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.width = 720; 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; - err = ioctl(fd, VIDIOC_G_FMT, &coord); + /*err = */ioctl(fd, VIDIOC_G_FMT, &coord); // fit into small window 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; int pigmode = 0; - err = ioctl(fd, VIDIOC_OVERLAY, &pigmode); + /*err =*/ ioctl(fd, VIDIOC_OVERLAY, &pigmode); printf("pig::window VIDIOC_OVERLAY %d\n", err); err = ioctl(fd, VIDIOC_S_FMT, &coord); diff --git a/src/gui/plugins.h b/src/gui/plugins.h index b9e95ad71..9fab562b2 100644 --- a/src/gui/plugins.h +++ b/src/gui/plugins.h @@ -87,7 +87,6 @@ class CPlugins } }; - int fb, rc, lcd, pid; int number_of_plugins; std::vector plugin_list; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2ae715f94..d069424f3 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2325,7 +2325,7 @@ _show: int old_mode = GetChannelMode(); 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(); } //_show: @@ -2354,7 +2354,7 @@ _repeat: * other modes selected bouquet not restored */ SetChannelMode(old_mode); bouquetList->activateBouquet(old_b, false); - if(bouquetList->Bouquets.size()) + if(bouquetList->Bouquets.empty()) bouquetList->Bouquets[old_b]->channelList->setSelected(old_num); StartSubtitles(mode == mode_tv); } diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index e8cb9301f..0da793884 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -1796,7 +1796,7 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh) sort(timerlist.begin(), timerlist.end()); // sort timer CTimerd::TimerList::iterator timer = timerlist.begin(); - std::string xml_response = ""; +// std::string xml_response = ""; hh->SetHeader(HTTP_OK, "text/xml; charset=UTF-8"); hh->WriteLn(""); hh->WriteLn("\n"); diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index 7fe73c862..a7b5d0653 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -97,7 +97,8 @@ THandleStatus CNeutrinoYParser::Hook_ReadConfig(CConfigFile *Config, CStringList Config->setInt32("configfile.version", CONF_VERSION); Config->saveConfig(HTTPD_CONFIGFILE); } - std::string logo = ConfigList["TUXBOX_LOGOS_URL"]; + //std::string logo = + ConfigList["TUXBOX_LOGOS_URL"]; return HANDLED_CONTINUE; } diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp index dc43bc83b..e40fc43e5 100644 --- a/src/zapit/src/descriptors.cpp +++ b/src/zapit/src/descriptors.cpp @@ -249,7 +249,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t uint8_t polarization; stiterator tI; transponder_id_t TsidOnid; - int modulationSystem, modulationType, rollOff, fec_inner; + int modulationSystem, modulationType/*, rollOff*/, fec_inner; if (CFrontend::getInstance()->getInfo()->type != FE_QPSK) return -1; @@ -268,7 +268,7 @@ int satellite_delivery_system_descriptor(const unsigned char * const buffer, t_t 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 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 serviceName; - std::string satelliteName = "unknown"; +// std::string satelliteName = "unknown"; bool in_blacklist = false; 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 serviceName; - std::string satelliteName = "unknown"; +// std::string satelliteName = "unknown"; bool in_blacklist = false; diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 6324f2402..d1175ad9d 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -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) { - int dummy; + int dummy = 0; int * have_ptr = &dummy; sat_iterator_t sit = satellitePositions.find(satellitePosition);