From 7e7615dc79676ff1c36f043bf7465ed49c4028a4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 2 Jan 2024 19:37:54 +0100 Subject: [PATCH] neutrino: re-add missing pip_recalc_pos_x/y functions Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/70f59f915465c4073acfb31603c2e8880473b19b Author: vanhofen Date: 2024-01-02 (Tue, 02 Jan 2024) Origin message was: ------------------ - neutrino: re-add missing pip_recalc_pos_x/y functions ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bc6c737ef..0a8918b8f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3256,7 +3256,7 @@ TIMER_STOP("################################## after all ####################### if (g_info.hw_caps->can_pip) { CZapit::getInstance()->OpenPip(0); - pipVideoDecoder[0]->Pig(g_settings.pip_x, g_settings.pip_y, g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x), pip_recalc_pos_y(g_settings.pip_y), g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); usleep(100); CZapit::getInstance()->StopPip(0); } @@ -4964,8 +4964,10 @@ void CNeutrinoApp::tvMode(bool rezap) #ifdef ENABLE_PIP if (g_info.hw_caps->can_pip) + { if (pipVideoDecoder[0]) - pipVideoDecoder[0]->Pig(g_settings.pip_x, g_settings.pip_y, g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x), pip_recalc_pos_y(g_settings.pip_y), g_settings.pip_width, g_settings.pip_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + } #endif #if 0 @@ -5246,8 +5248,10 @@ void CNeutrinoApp::radioMode(bool rezap) #ifdef ENABLE_PIP if (g_info.hw_caps->can_pip) + { if (pipVideoDecoder[0]) - pipVideoDecoder[0]->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y, g_settings.pip_radio_width, g_settings.pip_radio_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_radio_x), pip_recalc_pos_y(g_settings.pip_radio_y), g_settings.pip_radio_width, g_settings.pip_radio_height, frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); + } #endif CRecordManager::getInstance()->StopAutoRecord(); @@ -6211,7 +6215,7 @@ void CNeutrinoApp::pip_rotate(int cw) if (g_settings.pip_rotate_lastpos > PIP_DOWN_LEFT) g_settings.pip_rotate_lastpos = PIP_UP_LEFT; - pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x),pip_recalc_pos_y(g_settings.pip_y),g_settings.pip_width,g_settings.pip_height,g_settings.screen_width,g_settings.screen_height); + pipVideoDecoder[0]->Pig(pip_recalc_pos_x(g_settings.pip_x), pip_recalc_pos_y(g_settings.pip_y), g_settings.pip_width, g_settings.pip_height, g_settings.screen_width, g_settings.screen_height); } } #endif