mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 15:02:50 +02:00
fix pip
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4279ed9522
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2024-01-02 (Tue, 02 Jan 2024)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -4932,7 +4932,7 @@ void CNeutrinoApp::saveEpg(int _mode)
|
||||
}
|
||||
}
|
||||
|
||||
void CNeutrinoApp::tvMode( bool rezap )
|
||||
void CNeutrinoApp::tvMode(bool rezap)
|
||||
{
|
||||
if (mode == NeutrinoModes::mode_webradio) {
|
||||
CMoviePlayerGui::getInstance().setLastMode(NeutrinoModes::mode_unknown);
|
||||
@@ -4961,6 +4961,12 @@ void CNeutrinoApp::tvMode( bool rezap )
|
||||
videoDecoder->Standby(false);
|
||||
}
|
||||
|
||||
#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));
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) {
|
||||
//printf("standby on: autoshift ! stopping ...\n");
|
||||
@@ -5028,7 +5034,7 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
|
||||
#endif // !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
|
||||
}
|
||||
|
||||
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
||||
void CNeutrinoApp::standbyMode(bool bOnOff, bool fromDeepStandby)
|
||||
{
|
||||
//static bool wasshift = false;
|
||||
INFO("%s", bOnOff ? "ON" : "OFF" );
|
||||
@@ -5215,7 +5221,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
|
||||
lockStandbyCall = false;
|
||||
}
|
||||
|
||||
void CNeutrinoApp::radioMode( bool rezap)
|
||||
void CNeutrinoApp::radioMode(bool rezap)
|
||||
{
|
||||
//printf("radioMode: rezap %s\n", rezap ? "yes" : "no");
|
||||
INFO("rezap %d current mode %s", rezap, neutrinoMode_to_string(mode));
|
||||
@@ -5237,6 +5243,12 @@ void CNeutrinoApp::radioMode( bool rezap)
|
||||
videoDecoder->Standby(false);
|
||||
}
|
||||
|
||||
#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));
|
||||
#endif
|
||||
|
||||
CRecordManager::getInstance()->StopAutoRecord();
|
||||
|
||||
if (mode != NeutrinoModes::mode_webtv && mode != NeutrinoModes::mode_webradio) {
|
||||
@@ -5314,7 +5326,7 @@ void CNeutrinoApp::StartAVInputPiP() {
|
||||
pipVideoDemux[0]->Start();
|
||||
pipVideoDecoder[0]->Start(0, 0, 0);
|
||||
pipVideoDecoder[0]->open_AVInput_Device();
|
||||
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);
|
||||
pipVideoDecoder[0]->ShowPig(1);
|
||||
avinput_pip = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user