mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
addition to use autodetect pip
Origin commit data
------------------
Commit: 22a2b49710
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-05-29 (Sat, 29 May 2021)
Origin message was:
------------------
- addition to use autodetect pip
This commit is contained in:
@@ -4820,9 +4820,11 @@ void CNeutrinoApp::tvMode( bool rezap )
|
|||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
if (g_info.hw_caps->can_pip)
|
if (g_info.hw_caps->can_pip)
|
||||||
|
{
|
||||||
pipDecoder->Pig(g_settings.pip_x, g_settings.pip_y,
|
pipDecoder->Pig(g_settings.pip_x, g_settings.pip_y,
|
||||||
g_settings.pip_width, g_settings.pip_height,
|
g_settings.pip_width, g_settings.pip_height,
|
||||||
frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
|
frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#if 0
|
#if 0
|
||||||
if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) {
|
if(mode != NeutrinoModes::mode_ts /*&& autoshift*/) {
|
||||||
@@ -5102,9 +5104,11 @@ void CNeutrinoApp::radioMode( bool rezap)
|
|||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
if (g_info.hw_caps->can_pip)
|
if (g_info.hw_caps->can_pip)
|
||||||
|
{
|
||||||
pipDecoder->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y,
|
pipDecoder->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y,
|
||||||
g_settings.pip_radio_width, g_settings.pip_radio_height,
|
g_settings.pip_radio_width, g_settings.pip_radio_height,
|
||||||
frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
|
frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
CRecordManager::getInstance()->StopAutoRecord();
|
CRecordManager::getInstance()->StopAutoRecord();
|
||||||
|
|
||||||
@@ -5168,7 +5172,8 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
|
|||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
|
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
|
||||||
void CNeutrinoApp::StartAVInputPiP() {
|
void CNeutrinoApp::StartAVInputPiP() {
|
||||||
if (!g_info.hw_caps->can_pip) return;
|
if (!g_info.hw_caps->can_pip)
|
||||||
|
return;
|
||||||
|
|
||||||
if (!pipDemux) {
|
if (!pipDemux) {
|
||||||
pipDemux = new cDemux(1);
|
pipDemux = new cDemux(1);
|
||||||
@@ -5188,7 +5193,8 @@ void CNeutrinoApp::StartAVInputPiP() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CNeutrinoApp::StopAVInputPiP() {
|
void CNeutrinoApp::StopAVInputPiP() {
|
||||||
if (!g_info.hw_caps->can_pip) return;
|
if (!g_info.hw_caps->can_pip)
|
||||||
|
return;
|
||||||
|
|
||||||
pipDecoder->ShowPig(0);
|
pipDecoder->ShowPig(0);
|
||||||
pipDemux->Stop();
|
pipDemux->Stop();
|
||||||
@@ -5978,15 +5984,13 @@ void CNeutrinoApp::getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::s
|
|||||||
bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
|
bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
|
||||||
{
|
{
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
if (!g_info.hw_caps->can_pip) return ret;
|
if (!g_info.hw_caps->can_pip)
|
||||||
|
return ret;
|
||||||
|
|
||||||
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
|
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
|
||||||
if (!channel)
|
if (!channel)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (!g_info.hw_caps->can_pip)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (channel->getRecordDemux() == channel->getPipDemux())
|
if (channel->getRecordDemux() == channel->getPipDemux())
|
||||||
CStreamManager::getInstance()->StopStream(channel_id);
|
CStreamManager::getInstance()->StopStream(channel_id);
|
||||||
|
|
||||||
|
@@ -667,7 +667,8 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
|
|||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
bool CZapit::StopPip()
|
bool CZapit::StopPip()
|
||||||
{
|
{
|
||||||
if (!g_info.hw_caps->can_pip) return false;
|
if (!g_info.hw_caps->can_pip)
|
||||||
|
return false;
|
||||||
|
|
||||||
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
|
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
|
||||||
if (CNeutrinoApp::getInstance()->avinput_pip) {
|
if (CNeutrinoApp::getInstance()->avinput_pip) {
|
||||||
@@ -692,7 +693,8 @@ bool CZapit::StopPip()
|
|||||||
|
|
||||||
bool CZapit::StartPip(const t_channel_id channel_id)
|
bool CZapit::StartPip(const t_channel_id channel_id)
|
||||||
{
|
{
|
||||||
if (!g_info.hw_caps->can_pip) return false;
|
if (!g_info.hw_caps->can_pip)
|
||||||
|
return false;
|
||||||
|
|
||||||
CZapitChannel* newchannel;
|
CZapitChannel* newchannel;
|
||||||
bool transponder_change;
|
bool transponder_change;
|
||||||
|
Reference in New Issue
Block a user