From bb556d94d9e6bd48873deedbc435f18afdca869f Mon Sep 17 00:00:00 2001
From: Marten Richter <marten.richter@freenet.de>
Date: Tue, 20 Nov 2012 08:32:41 +0100
Subject: [PATCH] gcc compile fixes reported by sirwio

---
 audioomx.cc  | 7 +++++--
 osdopenvg.cc | 3 ++-
 tfeed.cc     | 4 +---
 videoomx.cc  | 2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/audioomx.cc b/audioomx.cc
index 8947d44..1d72d2b 100644
--- a/audioomx.cc
+++ b/audioomx.cc
@@ -25,6 +25,7 @@
 #include "woptionpane.h"
 
 #include "osdopenvg.h"
+#include <bcm_host.h>
 
 AudioOMX::AudioOMX()
 {
@@ -1685,6 +1686,7 @@ UINT AudioOMX::DeliverMediaPacket(MediaPacket packet, const UCHAR* buffer,
 	if (packet.type != lastAType) {//Format Change //Push data out !
 		firstsynched = false;
 		achange=true;
+		Log::getInstance()->log("Audio", Log::DEBUG,"Notice audio type change %d %d", packet.type,lastAType);
 		lastAType = packet.type;
 		decompress_buffer_filled=0;
 
@@ -1697,6 +1699,7 @@ UINT AudioOMX::DeliverMediaPacket(MediaPacket packet, const UCHAR* buffer,
 			}
 			cur_input_buf_omx = NULL;
 		}
+
 		int oldcancelstate;
 		int oldcanceltype;
 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &oldcancelstate);
@@ -1777,8 +1780,8 @@ UINT AudioOMX::DeliverMediaPacket(MediaPacket packet, const UCHAR* buffer,
 				//cur_input_buf_omx->nFlags|=OMX_BUFFERFLAG_TIME_UNKNOWN;
 			}
 			lastreftimeOMX = packet.presentation_time;
-		//	Log::getInstance()->log("Audio", Log::DEBUG,
-		//			"Time code %lld pts %lld dts %lld", lastreftimeOMX, packet.pts,packet.dts);
+			//Log::getInstance()->log("Audio", Log::DEBUG,
+				//	"Time code %lld pts %lld dts %lld", lastreftimeOMX, packet.pts,packet.dts);
 			lastreftimePTS = packet.pts;
 			cur_input_buf_omx->nTimeStamp = VideoOMX::intToOMXTicks(lastreftimeOMX/10LL); // the clock component is faulty;
 		} else {
diff --git a/osdopenvg.cc b/osdopenvg.cc
index 2dc2d9b..388d47e 100644
--- a/osdopenvg.cc
+++ b/osdopenvg.cc
@@ -33,6 +33,7 @@
 #include <fontconfig/fontconfig.h>
 #include <vector>
 #include <math.h>
+#include <bcm_host.h>
 
 using namespace Magick;
 
@@ -566,7 +567,7 @@ unsigned int OsdOpenVG::loadTTchar(cTeletextChar c)
 	vgSetGlyphToImage(
 			vgttfont,
 			glyph_index,
-			handle, glyphOrigin, escapement);
+			handle, (VGfloat*)glyphOrigin, (VGfloat*)escapement);
 	vgDestroyImage(handle);
 	tt_font_chars[glyph_index]=1;
 
diff --git a/tfeed.cc b/tfeed.cc
index c52005f..b1289e1 100644
--- a/tfeed.cc
+++ b/tfeed.cc
@@ -25,9 +25,7 @@
 #include "callback.h"
 
 
-TFeed::TFeed(Callback* tcb)
-: 
-cb(*tcb)
+TFeed::TFeed(Callback* tcb): cb(*tcb)
 {
   teletextEnabled = 1;
 }
diff --git a/videoomx.cc b/videoomx.cc
index 6c88e6b..449437f 100644
--- a/videoomx.cc
+++ b/videoomx.cc
@@ -28,6 +28,8 @@
 #include "boxstack.h"
 #include "remote.h"
 
+#include <bcm_host.h>
+
 #include <linux/fb.h>
 
 // temp
-- 
2.39.5