Some more compiler warning fixes

diff --git a/boxx.cc b/boxx.cc
index e775ea83598f11eb3a79b15901ad5b9f579d2821..e6d7a6152a8fa938bd520b0a9eb395b81b9d0204 100644 (file)
--- a/boxx.cc
+++ b/boxx.cc
@@ -575,8 +575,8 @@ Surface* Boxx::getSurface()
 
 bool Boxx::mouseMove(int x, int y)
 {
-       if ((x >=  area.x) && (x<area.x2())
-               && (y >= area.y) && (y < area.y2()))
+       if ((x >=  (int)area.x) && (x<(int)area.x2())
+               && (y >= (int)area.y) && (y < (int)area.y2()))
        {
                return true;
        }
@@ -588,8 +588,8 @@ bool Boxx::mouseMove(int x, int y)
 
 bool Boxx::mouseLBDOWN(int x, int y)
 {
-       if ((x >= area.x) && (x<area.x2())
-               && (y >= area.y) && (y < area.y2()))
+       if ((x >= (int)area.x) && (x<(int)area.x2())
+               && (y >= (int)area.y) && (y < (int)area.y2()))
        {
                return true;
        }

diff --git a/player.cc b/player.cc
index c93c7333713accd6d57210cf39e7ff5a245ce875..e1cc01bedb547b05dd955f9f7ccfc3ecc5c22295 100644 (file)
--- a/player.cc
+++ b/player.cc
@@ -1225,30 +1225,17 @@ void Player::threadPTSFeedScan()
 
   UINT playtime=0;
 
-#ifndef WIN32
-  struct timeval clock0 = {0,0};  // Time stamp after fetching I-frame info
-  struct timeval clock1 = {0,0};  // Time stamp after fetching I-frame data
-  struct timeval clock2 = {0,0} ; // Time stamp after displaying I-frame
-#else
-  DWORD clock0 = 0, clock1 = 0, clock2 = 0;
-#endif
-
   int frameTimeOffset = 0; // Time in msec between frames
-  int disp_msec = 0;  // Time taken to display data
-  int total_msec = 0; // Time taken to fetch data and display it
-  int sleepTime = 0;
 
-  if (state == S_FFWD) {
-         direction = 1; // and 0 for backward
-         dir_fac=1;
+  if (state == S_FFWD)
+  {
+    direction = 1; // and 0 for backward
+    dir_fac = 1;
   }
   video->EnterIframePlayback();
 
   while(1)
   {
-    // Fetch I-frames until we get one that can be displayed in good time
-    // Repeat while clock0 + total_msec > clock2 + frameTimeOffset
-
     baseFrameNumber = currentfeedFrameNumber;
 
     threadCheckExit();

diff --git a/vepg.cc b/vepg.cc
index 6f2b8003185648cabe4e3c5f2e537a8f19a4e906..dac571d27a6471dfdda2221c3395058bf8cd2657 100644 (file)
--- a/vepg.cc
+++ b/vepg.cc
@@ -528,7 +528,7 @@ void VEpg::drawgrid() // redraws grid and select programme
     listTop = chanListbox.getTopOption();
     updateEventList();
   }
-  if ((selTime >= ltime + window_width * 60) || (selTime <= ltime))
+  if ((selTime >= ltime + (int)window_width * 60) || (selTime <= ltime))
   {
   // we have cursored back before left time of window
   //TODO check that this and above don't happen together
@@ -716,7 +716,7 @@ void VEpg::paintCell(Event* event, int yOffset, const DrawStyle& bg, const DrawS
     //if (w > 155 + MINUTE_SCALE * WINDOW_WIDTH -x)
      // w = w + x - 155 - MINUTE_SCALE * WINDOW_WIDTH; // ends outside window
   }
-  if (w > 155 + window_width * MINUTE_SCALE - x)
+  if (w > 155 + (int)window_width * MINUTE_SCALE - x)
     w = 155 + window_width * MINUTE_SCALE -x; // limit cells to RHS of window
   rectangle(x, y, w, h, bg);
   char* tt = new char[strlen(event->title) + 1];

diff --git a/vepglistadvanced.cc b/vepglistadvanced.cc
index 22fb0a26141fa5f5a511ca51b76e4342d147f8a9..e7f3d4e15d10c8039671082b427f071791cd3150 100644 (file)
--- a/vepglistadvanced.cc
+++ b/vepglistadvanced.cc
@@ -288,7 +288,7 @@ void VEpgListAdvanced::doRecord()
                for(listIndex = 0; listIndex < chanlistsize; listIndex++)
                {
                        chan = (*chanList)[listIndex];
-                       if (chan->number == channel) break;
+                       if ((int)chan->number == channel) break;
                }
 
                Log::getInstance()->log("VEpgSummary", Log::DEBUG, "ID %lu TIME %lu DURATION %lu TITLE %s", current->id, current->time,
@@ -529,7 +529,7 @@ void VEpgListAdvanced::drawDataNowNext(bool next, bool doIndexPop)
          chan = (*chanList)[listIndex];
 
          EventList* eventList = eventLista[listIndex];
-         if (eventList && eventList->size()>=minevents) {
+         if (eventList && ((int)eventList->size() >= minevents)) {
                  j = eventList->begin();
 
                  currentEvent = j[minevents-1];
@@ -835,7 +835,7 @@ int VEpgListAdvanced::handleCommand(int command)
          for(listIndex = 0; listIndex < chanlistsize; listIndex++)
          {
                  chan = (*chanList)[listIndex];
-                 if (chan->number == channel) break;
+                 if ((int)chan->number == channel) break;
          }
 
          VEpgSummary* vr = new VEpgSummary(current, (*chanList)[listIndex]);

diff --git a/vepgsummary.cc b/vepgsummary.cc
index b60aa3268f5f55f22c12d1aa204b3243854df8f3..188dede1ddef9595e32865509fcf6f03b037d9c1 100644 (file)
--- a/vepgsummary.cc
+++ b/vepgsummary.cc
@@ -233,9 +233,9 @@ void VEpgSummary::processMessage(Message* m)
                if (cancel)
                {
                        //check if press is outside this view! then simulate cancel
-                       int x=(m->parameter.num>>16)-getScreenX();
-                       int y=(m->parameter.num&0xFFFF)-getScreenY();
-                       if (x<0 || y <0 || x>(int)getWidth() || y>(int)getHeight())
+                       int checkX=(m->parameter.num>>16)-getScreenX();
+                       int checkY=(m->parameter.num&0xFFFF)-getScreenY();
+                       if (checkX<0 || checkY <0 || checkX>(int)getWidth() || checkY>(int)getHeight())
                        {
                                BoxStack::getInstance()->handleCommand(Remote::BACK); //simulate cancel press
                        }

diff --git a/vopts.cc b/vopts.cc
index 00d8919fa07ea77cfa8142516fd8c5f672ddf2ba..66bb4b0768a57580e029c8e3b6d779be231f55cb 100644 (file)
--- a/vopts.cc
+++ b/vopts.cc
@@ -65,16 +65,18 @@ VOpts::VOpts()
   WOptionPane* wop;
   
   //  --- edit options start here
-  
+#ifdef MVP_REMOTE_TYPES
   static const char* options1[] = {"Old", "New"};
-
+#endif
   static const char* options5[] = {"Chop sides", "Letterbox"};
   static const char* options6[] = {"On", "Off", "Last state"};
   static const char* options7[] = {"All", "FTA only"};
   static const char* options15[] = {"Alphabetical", "Chronological"};
 
   static const char* options13[] = {"Auto","1024", "2048", "4096", "8192", "16384", "32768", "65536"};
+#ifdef PAL_WSS
   static const char* options14[] = {"No", "Yes"};
+#endif
   static const char* options18[] = {"Off", "On"};
 #ifdef ADVANCED_MENUES
   static const char* options19[] = { "Advanced","Classic"};