From 7b26559c79416f58f0476736afe4a1d7c145ad5e Mon Sep 17 00:00:00 2001 From: max_10 Date: Wed, 26 Jun 2019 00:55:22 +0200 Subject: [PATCH] libgeneric-pc: fix build with --enable-clutter Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/4d88d0a13d4a26fa93af04085843474677278150 Author: max_10 Date: 2019-06-26 (Wed, 26 Jun 2019) Origin message was: ------------------ - libgeneric-pc: fix build with --enable-clutter ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libgeneric-pc/clutterfb.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libgeneric-pc/clutterfb.cpp b/libgeneric-pc/clutterfb.cpp index 1d5e2fb..a2e5548 100644 --- a/libgeneric-pc/clutterfb.cpp +++ b/libgeneric-pc/clutterfb.cpp @@ -39,8 +39,8 @@ #include #include #include "glfb_priv.h" -#include "video_priv.h" -#include "audio_priv.h" +#include "video_lib.h" +#include "audio_lib.h" #include @@ -52,8 +52,8 @@ #define hal_info(args...) _hal_info(HAL_DEBUG_INIT, this, args) -extern VDec *vdec; -extern ADec *adec; +extern cVideo *videoDecoder; +extern cAudio *audioDecoder; /* the private class that does stuff only needed inside libstb-hal. * is used e.g. by cVideo... */ @@ -417,10 +417,10 @@ void GLFbPC::bltOSDBuffer() void GLFbPC::bltDisplayBuffer() { // hal_info("GLFB::%s vdec: %p\n", __func__, vdec); - if (!vdec) /* cannot start yet */ + if (!videoDecoder) /* cannot start yet */ return; static bool warn = true; - VDec::SWFramebuffer *buf = vdec->getDecBuf(); + cVideo::SWFramebuffer *buf = videoDecoder->getDecBuf(); if (!buf) { if (warn) hal_info("GLFB::%s did not get a buffer...\n", __func__); @@ -457,8 +457,8 @@ void GLFbPC::bltDisplayBuffer() * better this than nothing... :-) */ int64_t apts = 0; int64_t vpts = buf->pts(); - if (adec) - apts = adec->getPts(); + if (audioDecoder) + apts = audioDecoder->getPts(); if (apts != last_apts) { int rate, dummy1, dummy2; if (apts < vpts) @@ -466,7 +466,7 @@ void GLFbPC::bltDisplayBuffer() else if (sleep_us > 1000) sleep_us -= 1000; last_apts = apts; - vdec->getPictureInfo(dummy1, dummy2, rate); + videoDecoder->getPictureInfo(dummy1, dummy2, rate); if (rate > 0) rate = 2000000 / rate; /* limit to half the frame rate */ else @@ -477,5 +477,5 @@ void GLFbPC::bltDisplayBuffer() sleep_us = 1; } hal_debug("vpts: 0x%" PRIx64 " apts: 0x%" PRIx64 " diff: %6.3f sleep_us %d buf %d\n", - buf->pts(), apts, (buf->pts() - apts)/90000.0, sleep_us, vdec->buf_num); + buf->pts(), apts, (buf->pts() - apts)/90000.0, sleep_us, videoDecoder->buf_num); }