From e833e53c58917ddfa27592474171a6a92aa84f96 Mon Sep 17 00:00:00 2001
From: Chris Tallon <chris@vomp.tv>
Date: Thu, 15 Oct 2009 21:37:56 +0000
Subject: [PATCH] Compilation fixes

---
 demuxerts.cc | 14 +++++++-------
 player.cc    |  6 +++---
 player.h     |  8 ++++----
 vvideorec.cc |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/demuxerts.cc b/demuxerts.cc
index 252aa64..e2f8b57 100644
--- a/demuxerts.cc
+++ b/demuxerts.cc
@@ -191,7 +191,7 @@ int DemuxerTS::findPTS(UCHAR* buf, int len, ULLONG* dest)
                   else 
                   {
                       foundpid = foundpid & 0x1FFF; //clear upper 3 bits
-                      int pos=0;
+                      //int pos=0; UNUSED?
                       if (streamtype==3 || streamtype ==4) {
                           scanaid=foundpid;
                       }
@@ -199,7 +199,7 @@ int DemuxerTS::findPTS(UCHAR* buf, int len, ULLONG* dest)
                   p += eslength; //skip es descriptor
               }
           } else if (pid == scanaid) {     
-              UINT framelength = ((UINT)curbuf[4] << 8) | curbuf[5];
+           //   UINT framelength = ((UINT)curbuf[4] << 8) | curbuf[5];  UNUSED?
               
               if ( curbuf[7] & 0x80 ) // PTS_DTS_flags indicate that PTS is present
               {
@@ -360,7 +360,7 @@ int DemuxerTS::processTS(UCHAR* buf)
         new_channelinfo.name=NULL;
         new_channelinfo.tpid=0xFFFFF; //unused, check this
         new_channelinfo.vpid=0xFFFFF; //unused, check this
-        new_channelinfo.index=NULL;
+        new_channelinfo.index=0;
 
         new_channelinfo.apids.clear();
         new_channelinfo.dpids.clear();
@@ -446,14 +446,14 @@ int DemuxerTS::processTS(UCHAR* buf)
         
 	    }
         bool audioPIDpresent=false; //Check if pids chnages
-        int i;
+        ULONG i;
         for (i=0;i<channelinfo.numAPids;i++) {
-            if (aID ==channelinfo.apids[i].pid) {
+            if (aID == (int)channelinfo.apids[i].pid) {
                 audioPIDpresent=true;
             }
         }
         for (i=0;i<channelinfo.numDPids && (! audioPIDpresent);i++) {
-            if (aID ==channelinfo.dpids[i].pid) {
+            if (aID == (int)channelinfo.dpids[i].pid) {
                 audioPIDpresent=true;
             }
         }
@@ -744,7 +744,7 @@ bool DemuxerTS::scanForVideo(UCHAR* buf, UINT len)
                   else 
                   {
                       foundpid = foundpid & 0x1FFF; //clear upper 3 bits
-                      int pos=0;
+                   //   int pos=0; UNUSED?
                       if (streamtype==1 || streamtype ==2) {
                           return true;
                       }
diff --git a/player.cc b/player.cc
index f68ae01..359cbef 100644
--- a/player.cc
+++ b/player.cc
@@ -69,7 +69,7 @@ Player::~Player()
   if (initted) shutdown();
 }
 
-int Player::init(bool isPesRecording)
+int Player::init(bool p_isPesRecording)
 {
   if (initted) return 0;
 #ifndef WIN32
@@ -77,8 +77,8 @@ int Player::init(bool isPesRecording)
 #else
   mutex=CreateMutex(NULL,FALSE,NULL);
 #endif
-  is_pesrecording=isPesRecording;
-  if (isPesRecording)
+  is_pesrecording = p_isPesRecording;
+  if (is_pesrecording)
     demuxer = new DemuxerVDR();
   else
     demuxer = new DemuxerTS();
diff --git a/player.h b/player.h
index b339e8f..135292f 100644
--- a/player.h
+++ b/player.h
@@ -58,7 +58,7 @@ class Player : public Thread_TYPE, public Callback
     Player(MessageQueue* messageQueue, void* messageReceiver, OSDReceiver* osdReceiver);
     virtual ~Player();
 
-    int init(bool IsPesRecording);
+    int init(bool p_isPesRecording);
     int shutdown();
     void setStartFrame(ULONG frameNum);
     void setLengthBytes(ULLONG length);
@@ -67,7 +67,7 @@ class Player : public Thread_TYPE, public Callback
     void setSubtitleChannel(int newChannel);
     bool toggleSubtitles();
     void turnSubtitlesOn(bool ison); 
-    bool isSubtitlesOn() {return subtitlesShowing;};
+    bool isSubtitlesOn() { return subtitlesShowing; }
 
     void play();
     void stop();
@@ -90,10 +90,10 @@ class Player : public Thread_TYPE, public Callback
     int *getTeletxtSubtitlePages();
     int getCurrentAudioChannel();
     int getCurrentSubtitleChannel();
-    bool isPesRecording() {return is_pesrecording;};
+    bool isPesRecording() { return is_pesrecording; }
     Channel getDemuxerChannel();
 
-   TeletextDecoderVBIEBU * getTeletextDecoder(){return teletext;};
+   TeletextDecoderVBIEBU * getTeletextDecoder() { return teletext; }
 
     void call(void*); // for callback interface
 
diff --git a/vvideorec.cc b/vvideorec.cc
index eaea08b..1a506ed 100644
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -665,8 +665,8 @@ void VVideoRec::doAudioSelector()
         RecInfo *cur_info= myRec->recInfo;
         unsigned char numchan_recinfo = cur_info->numComponents;
         unsigned char numchan_subtitles_siz = temp_channel.numSPids;
-        int mp_audcounter = 0;
-        int ac3_counter = 0;
+        ULONG mp_audcounter = 0;
+        ULONG ac3_counter = 0;
         int dvb_subcounter = 1;
         
         unsigned char type;
@@ -675,7 +675,7 @@ void VVideoRec::doAudioSelector()
         int i;
         for (i = 0; i < numchan_recinfo; i++)
         {   
-            apid *ac=NULL;
+            apid* ac = NULL;
             type = cur_info->types[i];
             lang = cur_info->languages[i];
             description = cur_info->descriptions[i];
-- 
2.39.2