mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
neutrino: re-add missing pip_recalc_pos_x/y functions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70f59f9154
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user