CWFs

diff --git a/src/afeed.h b/src/afeed.h
index d2ea5508863caccaa4a2252bd0a181abfcc703de..f710c37dc3c84d2bec74645a4b1ab2d6561356bf 100644 (file)
--- a/src/afeed.h
+++ b/src/afeed.h
@@ -42,7 +42,6 @@ class AFeed
     bool stopThread{};
 
     int audioEnabled;
-    bool callbacksend;
     Callback& cb;
 };
 

diff --git a/src/dvbsubtitles.cc b/src/dvbsubtitles.cc
index 2887c49d35acbb6d3c602a242482d4aefde3dca1..61fe197ae7a0d899d4802f9639f19fc454fc3234 100644 (file)
--- a/src/dvbsubtitles.cc
+++ b/src/dvbsubtitles.cc
@@ -1015,9 +1015,9 @@ void DVBSubtitles::threadMethod()
 
       waitExpireWL = false;
       worklistTimeoutPointActive = false;
-#ifndef DVBSDEBUG
-      u8 nowPTS = Video::getInstance()->getCurrentTimestamp();
-#endif
+//#ifndef DVBSDEBUG
+//      u8 nowPTS = Video::getInstance()->getCurrentTimestamp();
+//#endif
       // Guaranteed to be at least one packet in the worklist
       PESPacket packet = worklist.front();
       u8 pktPTS = worklist.front().getPTS();

diff --git a/src/dvbsubtitles.h b/src/dvbsubtitles.h
index 717c1f2703f3e07a5e348c809b94174840a6174d..96c3fcf2e833895ab8316c85eb353df9abe74fdd 100644 (file)
--- a/src/dvbsubtitles.h
+++ b/src/dvbsubtitles.h
@@ -151,7 +151,7 @@ class DVBSubtitles
     bool signalStop{};
     bool signalPause{};
 
-    FILE* DBG;
+//    FILE* DBG;
 };
 
 #endif

diff --git a/src/event.h b/src/event.h
index cbfd26c50fccfdad2baf2af9116dec73256774b9..f7867f0f4a70b92baf791dc77a2b08b2eadc2f27 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -24,7 +24,7 @@
 
 #include "defines.h"
 
-class MovieInfo;
+struct MovieInfo;
 class SeriesInfo;
 
 class Event

diff --git a/src/image.h b/src/image.h
index ec9a834e25098327a5a859e91eb5cd18adeafd4b..b870d97e5e9d8cd7e7bf8d299ce5eff6ecf0d0be 100644 (file)
--- a/src/image.h
+++ b/src/image.h
@@ -165,7 +165,7 @@ class CImageStatic : public CImage
 };
 
 class SeriesInfo;
-class MovieInfo;
+struct MovieInfo;
 class CImageGeneric : public CImage
 {
   friend class ImageLoader;

diff --git a/src/imageloader.cc b/src/imageloader.cc
index 4389c1a91db6a11f2d84d597e595405e006f5cb0..f0d29b381d7c82e32baf3ad06556b77f45f124d2 100644 (file)
--- a/src/imageloader.cc
+++ b/src/imageloader.cc
@@ -325,6 +325,8 @@ void ImageLoader::ensureLoaded(Image& image)
         VDR::getInstance()->loadImageChannelLogo(icl);
         break;
       }
+      case CImage::INVALID:
+      {}
     }
 
     image->loading = true;

diff --git a/src/inputudp.h b/src/inputudp.h
index f115080eb7aebbdef81b7cde3947b6866d50bb06..911f3c7b41003ac00e6ff5b127a5ba6085853e0b 100644 (file)
--- a/src/inputudp.h
+++ b/src/inputudp.h
@@ -60,7 +60,6 @@ class InputUDP : public Input
     std::thread listenThread;
     std::mutex threadStartProtect;
     void listenLoop();
-    bool listenLoopStop{};
 
 #ifdef WIN32 // FIXME move these into UDP4?
     SOCKET quitPipe;

diff --git a/src/omx/omxeglrender.h b/src/omx/omxeglrender.h
index 9e106f98494e8faa33da4b2319fe0e9e2074696a..963e08b6a0d90585bc14e4406b99335f29d15734 100644 (file)
--- a/src/omx/omxeglrender.h
+++ b/src/omx/omxeglrender.h
@@ -34,8 +34,8 @@ class OMX_EGL_Render : public OMX
     OMX_EGL_Render();
     virtual ~OMX_EGL_Render();
 
-    bool init();
-    void shutdown();
+    bool init() override;
+    void shutdown() override;
 
     void prepareInputPort(OMX_U32 frameWidth, OMX_U32 frameHeight, OMX_U32 stride);  // throws
     void prepareOutputPort(EGLDisplay egldisplay);  // throws

diff --git a/src/omx/omximagedecode.h b/src/omx/omximagedecode.h
index 34e5c7d3b4fd1b140da816d75e9be1f1d0cc2650..820ee32246862aa574c3d7ea2bff97910e6461d6 100644 (file)
--- a/src/omx/omximagedecode.h
+++ b/src/omx/omximagedecode.h
@@ -30,8 +30,8 @@ class OMX_Image_Decode : public OMX
     OMX_Image_Decode();
     virtual ~OMX_Image_Decode();
 
-    bool init();
-    void shutdown();
+    bool init() override;
+    void shutdown() override;
 
     void prepareInputBuffers(int dataSize);  // throws
     void setFormat();  // throws

diff --git a/src/osdopenvg.cc b/src/osdopenvg.cc
index 7edafce97268f3c4f51b26f6edac1c2acf07a45f..f9902fa9f8958d8f9aa218a82a29806b47b630c5 100644 (file)
--- a/src/osdopenvg.cc
+++ b/src/osdopenvg.cc
@@ -436,7 +436,7 @@ void OsdOpenVG::processMessage(Message* m)
     // It will be deleted properly on the next garbage collection run
 
     // OSDOVG-ROD-EXPERIMENT
-    logger->trace(TAG, "EXPERIMENT - call doRender");
+    logger->debug(TAG, "EXPERIMENT - call doRender");
     doRender();
   }
 }
@@ -528,7 +528,7 @@ void OsdOpenVG::renderLoop()
       #if DEV
       dumpStyles();
       #endif
-      LogNT::getInstance()->trace(TAG, "EXPERIMENT - render");
+      LogNT::getInstance()->debug(TAG, "EXPERIMENT - render");
 
       InternalRendering();
       lastrendertime = getTimeMS();

diff --git a/src/osdvector.cc b/src/osdvector.cc
index ab8a138f1420ba94dc7b4f5bffac808d871f1fac..c3e26b5c09ead9d2c4b4802c951e85e6cca28f96 100644 (file)
--- a/src/osdvector.cc
+++ b/src/osdvector.cc
@@ -280,8 +280,8 @@ void OsdVector::updateOrAddSurface(const SurfaceVector* surf, float x, float y,
   SurfacesIterator si;
 
   #if DEV
-  logger->trace(TAG, "updateOrAddSurface, surfaces.length {}", surfaces.size());
-  dumpStyles();
+  //logger->trace(TAG, "updateOrAddSurface, surfaces.length {}", surfaces.size());
+  //dumpStyles();
   #endif
 
   // First determine it is already in our system
@@ -326,12 +326,12 @@ void OsdVector::updateOrAddSurface(const SurfaceVector* surf, float x, float y,
   cleanupOrphanedRefs();
 
   #if DEV
-  logger->trace(TAG, "After UOAS:");
-  dumpStyles();
+//  logger->trace(TAG, "After UOAS:");
+//  dumpStyles();
   #endif
 
   // OSDOVG-ROD-EXPERIMENT
-  logger->trace(TAG, "EXPERIMENT - call doRender");
+  logger->debug(TAG, "EXPERIMENT - call doRender");
   doRender();
 }
 

diff --git a/src/recinfo.cc b/src/recinfo.cc
index 6e39568857031437bfd0c230e17c52bd7ae9f276..99dc93c6486eb6e6913117e904b8dff41c80e2ea 100644 (file)
--- a/src/recinfo.cc
+++ b/src/recinfo.cc
@@ -192,7 +192,7 @@ char* RecInfo::buildSummaryWithDetails(bool forceRefresh)
     }
 
     summaryWithDetails = new char[swdLength];
-    SNPRINTF(summaryWithDetails, swdLength, "%s\n\n%s%s\n%s%01i:%02i\n%s%s\n%s%lu MB", summary,
+    SNPRINTF(summaryWithDetails, swdLength, "%s\n\n%s%s\n%s%01i:%02i\n%s%s\n%s%u MB", summary,
              tr("Channel: "), channelName,
              tr("Duration: "), hours, mins,
              tr("Resume at: "), resumePointText,

diff --git a/src/surfacevector.cc b/src/surfacevector.cc
index dfdd1c6d7e84585ee72f2a6c7f7012fe792e70b9..a02dd18d220697550a3af0815cb2eb15129c7711 100644 (file)
--- a/src/surfacevector.cc
+++ b/src/surfacevector.cc
@@ -268,12 +268,12 @@ void SurfaceVector::drawImage(Image& image, float x, float y, float  width, floa
 
   if (image->isReady())
   {
-    logger->trace(TAG, "drawImage: READY, Add instr PaintImage for {}", static_cast<void*>(image.get()));
+    logger->debug(TAG, "drawImage: READY, Add instr PaintImage for {}", static_cast<void*>(image.get()));
     commands.push_back(SVGCommand::PaintImage(x, y, width, height, image, corner));
   }
   else
   {
-    logger->trace(TAG, "drawImage: NOT_READY, Add instr PaintImageLoading {} LI {}", static_cast<void*>(image.get()), reinterpret_cast<void*>(image.get()));
+    logger->debug(TAG, "drawImage: NOT_READY, Add instr PaintImageLoading {} LI {}", static_cast<void*>(image.get()), reinterpret_cast<void*>(image.get()));
     commands.push_back(SVGCommand::PaintImageLoading(image, x, y, width, height, corner));
   }
 
@@ -448,7 +448,7 @@ int SurfaceVector::removeCommands(float x, float y, float width, float height)
 
 }
 
-int SurfaceVector::updateToScreen(int sx, int sy, int w, int h, int dx, int dy)
+int SurfaceVector::updateToScreen(int sx, int sy, int /*w*/, int /*h*/, int dx, int dy)
 {
   // ok this method really works in a pixel oriented way
   command_mutex.lock();

diff --git a/src/udp6.h b/src/udp6.h
index 5cb8e19cc4d5973b42a18835f1e79818ebbf81a8..dfe35d66c828c50fb8654f4f13ac4d89aedb53c8 100644 (file)
--- a/src/udp6.h
+++ b/src/udp6.h
@@ -50,7 +50,9 @@ class UDP6
   private:
     bool initted{};
     u4 getIPNumber(u4 num);
+#ifdef WIN32
     u4 iterate_ip{};
+#endif
     int socketnum;                  // Socket descriptor
     u2 myPort{};                // My port number
     struct sockaddr_in6 myAddr;     // My address

diff --git a/src/vaudioselector.cc b/src/vaudioselector.cc
index f87342db70226ae5c28d35a10c9b05df9ad6efa8..6c1edfeee293c4eb4477d430811055db32f80d14 100644 (file)
--- a/src/vaudioselector.cc
+++ b/src/vaudioselector.cc
@@ -38,7 +38,7 @@
 VAudioSelector::VAudioSelector(MessageReceiver* tparent, bool* availableMpegAudioChannels,
                                bool* availableAc3AudioChannels, int currentAudioChannel, bool* availableSubtitleChannels, int* ttxtpages,
                                int currentSubtitleChannel, int currentSubtitleType, RecInfo* recInfo)
-: parent(tparent), liveMode(false)
+: parent(tparent)
 {
   LogNT::getInstance()->debug("VAudioSelector", "{}", currentAudioChannel);
 
@@ -66,7 +66,7 @@ VAudioSelector::VAudioSelector(MessageReceiver* tparent, bool* availableMpegAudi
         sc.pestype = ttxtpages[i];
         std::ostringstream oss;
         oss << tr("TTxt:") << " " << std::hex << std::setw(3) << ttxtpages[i];
-        sc.name = std::move(oss.str());
+        sc.name = oss.str();
         scl.push_back(std::move(sc));
       }
     }
@@ -270,7 +270,7 @@ VAudioSelector::VAudioSelector(MessageReceiver* tparent, bool* availableMpegAudi
 }
 
 VAudioSelector::VAudioSelector(MessageReceiver* tparent, Channel* channel, int currentAudioChannel, int currentSubtitletype, int currentSubtitleChannel, int* ttxtpages)
-: parent(tparent), liveMode(true)
+: parent(tparent)
 {
   u4 i;
 
@@ -294,7 +294,7 @@ VAudioSelector::VAudioSelector(MessageReceiver* tparent, Channel* channel, int c
         sc.pestype = ttxtpages[i];
         std::ostringstream oss;
         oss << tr("TTxt:") << " " << std::hex << std::setw(3) << ttxtpages[i];
-        sc.name = std::move(oss.str());
+        sc.name = oss.str();
         scl.push_back(std::move(sc));
       }
     }

diff --git a/src/vaudioselector.h b/src/vaudioselector.h
index 4c9e8c14963bfe7422182c2b6208fae553a52132..e29b37d3d20cf3529b953622e9ed40cd501fe52e 100644 (file)
--- a/src/vaudioselector.h
+++ b/src/vaudioselector.h
@@ -72,7 +72,6 @@ class VAudioSelector : public TBBoxx, public MessageReceiver
     WSelectList ssl;
 
     MessageReceiver* parent;
-    bool liveMode;
     bool subtitles{};
     bool editsubtitles{};
 

diff --git a/src/vconnect.h b/src/vconnect.h
index 39cc41eed0f5821e90c211a8826efaea71442cd0..1aff863ba0be3d589e72204dcd426254a9a26deb 100644 (file)
--- a/src/vconnect.h
+++ b/src/vconnect.h
@@ -30,7 +30,7 @@
 
 class LogNT;
 class BoxStack;
-class VDRServer;
+struct VDRServer;
 
 class VConnect : public VInfo
 {

diff --git a/src/vdpc.cc b/src/vdpc.cc
index 725da43ca36e42a237f0236378a0fef89e127aa5..2ecfb45cc40b715a6aea4eb04ae2fd769bd89e9d 100644 (file)
--- a/src/vdpc.cc
+++ b/src/vdpc.cc
@@ -34,6 +34,8 @@
 
 static const char* TAG = "VDPC";
 
+LogNT* VDPC::logger{};
+
 bool VDPC::init()
 {
   logger = LogNT::getInstance();
@@ -233,8 +235,6 @@ void VDPC::VDPC4::stop()
 
 void VDPC::VDPC4::threadMethod()
 {
-  LogNT* logger = LogNT::getInstance();
-
 #ifdef WIN32
   quitPipe = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if (quitPipe == INVALID_SOCKET)
@@ -348,8 +348,6 @@ void VDPC::VDPC6::stop()
 
 void VDPC::VDPC6::threadMethod()
 {
-  LogNT* logger = LogNT::getInstance();
-
   if (pipe2(pfdsUDP6, O_NONBLOCK) == -1)
   {
     logger->error("VDPC6", "pipe2 error B");

diff --git a/src/vdpc.h b/src/vdpc.h
index ca243ab5b103e6992499c0505224ba3c2288efe5..5ae25d97221261f04ba744d6c6c7a55cb451e3fb 100644 (file)
--- a/src/vdpc.h
+++ b/src/vdpc.h
@@ -90,7 +90,7 @@ class LogNT;
 class VDPC
 {
   private:
-    LogNT* logger{};
+    static LogNT* logger; // has to be static for inner classes to use it
     typedef std::function<void(int, const char*, const char*, u2, u4)> AddServerCallback;
 
   // Nested classes

diff --git a/src/vdr.cc b/src/vdr.cc
index 12eae8ddbf72444fa7d6a59f29ae95186ee2cc84..05a651b51c2797688277f157dba31c25cb2d7d72 100644 (file)
--- a/src/vdr.cc
+++ b/src/vdr.cc
@@ -244,7 +244,7 @@ void VDR::disconnect()
   logger->debug(TAG, "Disconnect");
 }
 
-void VDR::setReceiveWindow(size_t size)
+void VDR::setReceiveWindow(size_t /*size*/)
 {
   //if (connected && size) tcpold->setReceiveWindow(size);
 }

diff --git a/src/vdr.h b/src/vdr.h
index 7b6469c0d5d7a3ff97638194e60a386ba5705cea..7f9b104395d4071d0c33c6e691aa6bfdcad4b8a1 100644 (file)
--- a/src/vdr.h
+++ b/src/vdr.h
@@ -54,7 +54,7 @@ class VDR_ResponsePacket;
 #ifdef VOMP_MEDIAPLAYER
 class SerializeBuffer;
 #endif
-class MovieInfo;
+struct MovieInfo;
 class SeriesInfo;
 
 typedef std::vector<Event*> EventList;

diff --git a/src/vepg.cc b/src/vepg.cc
index 11f39002281caa9215a10d1e605de0e6196bec9f..a5646c9c815182e0116f12be78d566852c93a147 100644 (file)
--- a/src/vepg.cc
+++ b/src/vepg.cc
@@ -748,7 +748,7 @@ void VEpg::paintCell(Event* event, int yOffset, const DrawStyle& bg, const DrawS
     tT[textPos ] =  '\0';
     surface->drawText(tT, x+2, y, fg);
   }
-  delete tT;
+  delete[] tT;
 
 }
 

diff --git a/src/vepgsettimer.cc b/src/vepgsettimer.cc
index 0d2e6d931d1d3bdab46f8d8bd6e6988eb1df01e6..c3a3d4707a9573025a643bef0507d63d2111ac7c 100644 (file)
--- a/src/vepgsettimer.cc
+++ b/src/vepgsettimer.cc
@@ -151,7 +151,7 @@ char* VEpgSetTimer::genTimerString()
   strcpy(eventTitle, event->title.c_str());
   for(u4 i=0; i < strlen(eventTitle); i++) if (eventTitle[i] == ':') eventTitle[i] = '|';
 
-  SNPRINTF(timerString, 1023, "%i:%lu:%s:%s:%s:%s:%s:%s:",
+  SNPRINTF(timerString, 1023, "%i:%u:%s:%s:%s:%s:%s:%s:",
     flags, channel->number, dateString,
     startString, endString,
     priority, lifetime, eventTitle);

diff --git a/src/videoomx.cc b/src/videoomx.cc
index 8e1b41741cc959c97ce2fdec7c2f2c0b6a3996a0..437fc244fa8065de4315108b0551b23f1c8c995e 100644 (file)
--- a/src/videoomx.cc
+++ b/src/videoomx.cc
@@ -209,7 +209,7 @@ void VideoOMX::AddOmxEvent(VPE_OMX_EVENT  new_event)
   signalOmx();
 }
 
-OMX_ERRORTYPE VideoOMX::EmptyBufferDone_OMX(OMX_IN OMX_HANDLETYPE hcomp,OMX_IN OMX_PTR appdata,OMX_IN OMX_BUFFERHEADERTYPE* buffer){
+OMX_ERRORTYPE VideoOMX::EmptyBufferDone_OMX(OMX_IN OMX_HANDLETYPE /*hcomp*/, OMX_IN OMX_PTR /*appdata*/, OMX_IN OMX_BUFFERHEADERTYPE* buffer){
 
 //     LogNT::getInstance()->info(TAG, "EmptyBufferDone");
        VideoOMX* video = static_cast<VideoOMX *>(Video::getInstance());
@@ -231,7 +231,7 @@ void VideoOMX::ReturnEmptyOMXBuffer(OMX_BUFFERHEADERTYPE* buffer){
     signalOmx();
 }
 
- OMX_ERRORTYPE VideoOMX::FillBufferDone_OMX(OMX_IN OMX_HANDLETYPE hcomp, OMX_IN OMX_PTR appdata,OMX_IN OMX_BUFFERHEADERTYPE* buffer) {
+ OMX_ERRORTYPE VideoOMX::FillBufferDone_OMX(OMX_IN OMX_HANDLETYPE /*hcomp*/, OMX_IN OMX_PTR /*appdata*/, OMX_IN OMX_BUFFERHEADERTYPE* /*buffer*/) {
         //LogNT::getInstance()->info(TAG, "FillBufferDone");
        return OMX_ErrorNone;
 }

diff --git a/src/vradiorec.cc b/src/vradiorec.cc
index 33762e958f804e2d43608653682d116628f56941..37bcb624ab4f133269155ff8d1607f3acfc3d951 100644 (file)
--- a/src/vradiorec.cc
+++ b/src/vradiorec.cc
@@ -468,7 +468,7 @@ void VRadioRec::drawBarClocks()
     u4 lengthMinutes = dlengthSeconds / 60;
     dlengthSeconds %= 60;
 
-    SNPRINTF(buffer, 99, "%01lu:%02lu:%02lu / %01lu:%02lu:%02lu", currentHours, currentMinutes, dcurrentSeconds, lengthHours, lengthMinutes, dlengthSeconds);
+    SNPRINTF(buffer, 99, "%01u:%02u:%02u / %01u:%02u:%02u", currentHours, currentMinutes, dcurrentSeconds, lengthHours, lengthMinutes, dlengthSeconds);
     LogNT::getInstance()->debug(TAG, buffer);
   }
   else

diff --git a/src/vradiorec.h b/src/vradiorec.h
index be97686b3622f321986eff497a171d6a7fccaa77..11e00730f7b25a479647c88039e310d4f1f3c595 100644 (file)
--- a/src/vradiorec.h
+++ b/src/vradiorec.h
@@ -58,7 +58,6 @@ class VRadioRec : public Boxx, public MessageReceiver, public TimerReceiver
 
     bool playing;
     bool barShowing;
-    bool stickyBar;
 
     void doBar(int action);
     void drawBarClocks();

diff --git a/src/vtimeredit.cc b/src/vtimeredit.cc
index c075133af58a600e144e886501b3dde6978a5727..7918458ebbb5e669a567ac56754b5e543fcc74f6 100644 (file)
--- a/src/vtimeredit.cc
+++ b/src/vtimeredit.cc
@@ -105,7 +105,7 @@ void VTimerEdit::draw()
   drawText(buffer, xpos, ypos, DrawStyle::LIGHTTEXT);         ypos += fontheight;
 
   // Channel
-  SNPRINTF(buffer, 999, "%lu", recTimer->channelNumber);
+  SNPRINTF(buffer, 999, "%u", recTimer->channelNumber);
   drawText(buffer, xpos, ypos, DrawStyle::LIGHTTEXT);         ypos += fontheight;
 
   // Name
@@ -131,11 +131,11 @@ void VTimerEdit::draw()
   drawText(buffer, xpos, ypos, DrawStyle::LIGHTTEXT);         ypos += fontheight;
 
   // Priority
-  SNPRINTF(buffer, 999, "%lu", recTimer->priority);
+  SNPRINTF(buffer, 999, "%u", recTimer->priority);
   drawText(buffer, xpos, ypos, DrawStyle::LIGHTTEXT);         ypos += fontheight;
 
   // Lifetime
-  SNPRINTF(buffer, 999, "%lu", recTimer->lifeTime);
+  SNPRINTF(buffer, 999, "%u", recTimer->lifeTime);
   drawText(buffer, xpos, ypos, DrawStyle::LIGHTTEXT);         ypos += fontheight;
                                                            ypos += fontheight;
 

diff --git a/src/vvideolivetv.cc b/src/vvideolivetv.cc
index d96c74e12df06953e2f2315b28a0d021728dc6fc..1ee6aa39f82b521e2414046ae9061b4e203f67fa 100644 (file)
--- a/src/vvideolivetv.cc
+++ b/src/vvideolivetv.cc
@@ -618,7 +618,7 @@ void VVideoLiveTV::doTeletext(bool subtitlemode)
     keying = 0;
     // and reset the display - this is a copy from setNowNextData
     char formatChanNum[20];
-    SNPRINTF(formatChanNum, 19, "%0*lu", numberWidth, (*chanList)[osdChannelIndex]->number);
+    SNPRINTF(formatChanNum, 19, "%0*u", numberWidth, (*chanList)[osdChannelIndex]->number);
     osdChanNum.setText(formatChanNum);
     osdChanName.setText((*chanList)[osdChannelIndex]->name);
   }
@@ -661,7 +661,7 @@ void VVideoLiveTV::doAudioSelector()
     keying = 0;
     // and reset the display - this is a copy from setNowNextData
     char formatChanNum[20];
-    SNPRINTF(formatChanNum, 19, "%0*lu", numberWidth, (*chanList)[osdChannelIndex]->number);
+    SNPRINTF(formatChanNum, 19, "%0*u", numberWidth, (*chanList)[osdChannelIndex]->number);
     osdChanNum.setText(formatChanNum);
     osdChanName.setText((*chanList)[osdChannelIndex]->name);
   }
@@ -728,7 +728,7 @@ void VVideoLiveTV::setNowNextData()
   Channel* currentChannel = (*chanList)[osdChannelIndex];
 
   char formatChanNum[20];
-  SNPRINTF(formatChanNum, 19, "%0*lu", numberWidth, currentChannel->number);
+  SNPRINTF(formatChanNum, 19, "%0*u", numberWidth, currentChannel->number);
   osdChanNum.setText(formatChanNum);
   osdChanName.setText(currentChannel->name);
 

diff --git a/src/wpictureview.cc b/src/wpictureview.cc
index 93625c7a8b606a2e367ba6c9fdc3fa75401d0b46..423c5878ede2a4780f91f065cca469f8b1da7a2f 100644 (file)
--- a/src/wpictureview.cc
+++ b/src/wpictureview.cc
@@ -186,7 +186,7 @@ int WPictureView::handleCommand(int command)
 }
 
 
-bool WPictureView::mouseAndroidScroll(int x, int y, int sx, int sy)
+bool WPictureView::mouseAndroidScroll(int x, int y, int /* sx */, int sy)
 {
        if ((x - getRootBoxOffsetX()) >= 0 && (y - getRootBoxOffsetY()) >= 0
                && (x - getRootBoxOffsetX()) <= (int)area.w && (y - getRootBoxOffsetY()) <= (int)area.h)