From 916a284b48e3bafd9e717112dcb81cca184cb090 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 25 Feb 2018 03:21:01 +0100 Subject: [PATCH] DATV demod: message formatting and boolean test correction --- plugins/channelrx/demoddatv/datvideorender.cpp | 10 +++++----- plugins/channelrx/demoddatv/datvideorender.h | 13 +++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugins/channelrx/demoddatv/datvideorender.cpp b/plugins/channelrx/demoddatv/datvideorender.cpp index c16cc4a0a..41e58a21d 100644 --- a/plugins/channelrx/demoddatv/datvideorender.cpp +++ b/plugins/channelrx/demoddatv/datvideorender.cpp @@ -341,14 +341,14 @@ bool DATVideoRender::RenderStream() int intGotFrame; bool blnNeedRenderingSetup; - if(m_blnIsOpen=false) + if (!m_blnIsOpen) { - qDebug() << "DATVideoProcess::RenderStream Stream not open"; + qDebug() << "DATVideoProcess::RenderStream: Stream not open"; return false; } - if(m_blnRunning==true) + if (m_blnRunning) { return false; } @@ -508,9 +508,9 @@ bool DATVideoRender::CloseStream(QIODevice *objDevice) return false; } - if(m_blnIsOpen=false) + if (!m_blnIsOpen) { - qDebug() << "DATVideoProcess::CloseStream Stream not open"; + qDebug() << "DATVideoProcess::CloseStream: Stream not open"; return false; } diff --git a/plugins/channelrx/demoddatv/datvideorender.h b/plugins/channelrx/demoddatv/datvideorender.h index a6fb1860d..3d44cad3a 100644 --- a/plugins/channelrx/demoddatv/datvideorender.h +++ b/plugins/channelrx/demoddatv/datvideorender.h @@ -160,12 +160,13 @@ class DATVideoRenderThread: public QThread if(m_objRenderer->OpenStream(m_objStream)) { - printf("PID: %d W: %d H: %d Codec: %s Data: %s %s\r\n",m_objRenderer->MetaData.PID - ,m_objRenderer->MetaData.Width - ,m_objRenderer->MetaData.Height - ,m_objRenderer->MetaData.CodecDescription.toStdString().c_str() - ,m_objRenderer->MetaData.Program.toStdString().c_str() - ,m_objRenderer->MetaData.Stream.toStdString().c_str()); + qInfo("DATVideoRenderThread::run: PID: %d W: %d H: %d Codec: %s Data: %s Service: %s", + m_objRenderer->MetaData.PID, + m_objRenderer->MetaData.Width, + m_objRenderer->MetaData.Height, + m_objRenderer->MetaData.CodecDescription.toStdString().c_str(), + m_objRenderer->MetaData.Program.toStdString().c_str(), + m_objRenderer->MetaData.Stream.toStdString().c_str()); m_blnRenderingVideo=true; }