gcc compile fixes reported by sirwio

diff --git a/audioomx.cc b/audioomx.cc
index 8947d443d94789333694a28770dafd6998d748d2..1d72d2bf9dc9b7a35f3ef23f53d048cbdccabb05 100644 (file)
--- 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 2dc2d9bc8411bdd657f419f5e2d995b0bceb13d8..388d47e4c83a977dbd34f8dc73260ea485ec3e00 100644 (file)
--- 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 c52005f81dc5f26433f54221c21670501059789d..b1289e1fbf11627364f63d51deba955effb1c393 100644 (file)
--- 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 6c88e6b3314a19d54446187533724e41d1170c73..449437fa87fc2cc838a859d14a23ebfb35db5d82 100644 (file)
--- 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