7 CWFs

diff --git a/dvbsubtitles.cc b/dvbsubtitles.cc
index 3d2ff976edb523124e5a4fd0d07caaf659093c03..e7dd28a2c503917f6d200b0bc651b5157d5a9a86 100644 (file)
--- a/dvbsubtitles.cc
+++ b/dvbsubtitles.cc
@@ -694,7 +694,9 @@ bool DVBSubtitles::decodePacket(const PESPacket& packet)
           object.decodeSubBlock(segmentData + 7, topFieldLen, false);
       }
       else if (codingMethod == 0x01) // Coded as a string of characters
+      {
         ; // TODO
+      }
       break;
     }
     case 0x14: {// Display definition
@@ -998,9 +1000,9 @@ void DVBSubtitles::threadMethod()
 
       waitExpireWL = false;
       worklistTimeoutPointActive = false;
-
+#ifndef DVBSDEBUG
       ULLONG nowPTS = Video::getInstance()->getCurrentTimestamp();
-
+#endif
       // Guaranteed to be at least one packet in the worklist
       PESPacket packet = worklist.front();
       ULLONG pktPTS = worklist.front().getPTS();

diff --git a/option.cc b/option.cc
index c00b86ab5b96e46b84e9a93805adb494e28028ac..a44a361fe90637545f8b6fb0093c000e6092ae0a 100644 (file)
--- a/option.cc
+++ b/option.cc
@@ -21,7 +21,7 @@
 #include "option.h"
 #include "vdr.h"
 
-Option::Option(UINT ID, const char* DISPLAYTEXT, const char* CONFIGSECTION, const char* CONFIGKEY, UINT OPTIONTYPE, 
+Option::Option(UINT ID, const char* DISPLAYTEXT, const char* CONFIGSECTION, const char* CONFIGKEY, UCHAR OPTIONTYPE,
                UINT NUMCHOICES, UINT DEFAULTCHOICE, UINT STARTINT,
                const char * const * OPTIONS, const char * const * OPTIONKEYS, bool DELETESTRINGS, AbstractOption* handler)
 : id(ID), displayText(DISPLAYTEXT), configSection(CONFIGSECTION), configKey(CONFIGKEY), optionType(OPTIONTYPE),

diff --git a/option.h b/option.h
index 130f3be2cf7fcce7a436db1d6898183fa02838e9..fa420bbf6b6a015b54e4a5ea6e7bdd156f14288f 100644 (file)
--- a/option.h
+++ b/option.h
@@ -33,7 +33,7 @@ typedef std::vector<Option*> Options;
 class Option
 {
   public:
-    Option(UINT id, const char* displayText, const char* configSection, const char* configKey, UINT optionType, 
+    Option(UINT id, const char* displayText, const char* configSection, const char* configKey, UCHAR optionType,
            UINT numChoices, UINT defaultChoice, UINT startInt,
            const char * const * options, const char * const * optionkeys = NULL, bool deletestrings = false, AbstractOption* handler = NULL);
     ~Option();

diff --git a/playerradiolive.cc b/playerradiolive.cc
index 8caaa2ebb82d67f7e41afe53b93eaf192bf37de7..8add617bce2c881449a75ad3abf93552e6013ea9 100644 (file)
--- a/playerradiolive.cc
+++ b/playerradiolive.cc
@@ -209,7 +209,7 @@ void PlayerRadioLive::chunkToDemuxer()
   StreamChunk s = streamChunks.front();
   streamChunks.pop();
   //logger->log("PlayerRadioLive", Log::DEBUG, "About to call demuxer with %p %lu", s.data, s.len);
-  /*int a =*/ demuxer->put((UCHAR*)s.data, s.len);
+  /*int a =*/ demuxer->put(static_cast<UCHAR*>(s.data), s.len);
   //logger->log("PlayerRadioLive", Log::DEBUG, "put %i to demuxer", a);
   free(s.data);  
 }
@@ -474,7 +474,8 @@ void PlayerRadioLive::threadMethod()
       if (state == S_PREBUFFERING)
       {
         ++preBufferCount;
-        ULONG percentDone = (ULONG)(preBufferCount / (float)preBufferAmount * 100);
+        ULONG percentDone = (preBufferCount * 100) / preBufferAmount;
+
         logger->log("PlayerRadioLive", Log::DEBUG, "Prebuffering %lu%%", percentDone);
         
         Message* m = new Message();

diff --git a/seriesinfo.h b/seriesinfo.h
index adea7497db916f35890133033bd2e376c7766a1a..ab68a1bda6100ab10d966ea8985e7783bcc67f97 100644 (file)
--- a/seriesinfo.h
+++ b/seriesinfo.h
@@ -36,7 +36,7 @@ public:
        std::string firstAired;
        std::string guestStars;
        std::string overview;
-       float rating ;
+       double rating;
        TVMedia image;
 
 

diff --git a/vdrrequestpacket.cc b/vdrrequestpacket.cc
index 5b98ada64f450754ec6cdb4ec73e8f281ccaed31..b7e7ed76d6741484236a28dd352d8a90cc00397c 100644 (file)
--- a/vdrrequestpacket.cc
+++ b/vdrrequestpacket.cc
@@ -63,7 +63,7 @@ bool VDR_RequestPacket::init(ULONG topcode, bool setUserDataLength, ULONG userDa
     userDataLength = 0; // so the below will write a zero
   }
   
-  buffer = (UCHAR*)malloc(bufSize);
+  buffer = static_cast<UCHAR*>(malloc(bufSize));
   if (!buffer) return false;
   
   channel = VDR::CHANNEL_REQUEST_RESPONSE;