mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/neutrino-images/ni-neutrino

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: dd5e00bd59
Author: FlatTV <FlatTV@gmx.de>
Date: 2021-05-30 (Sun, 30 May 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
FlatTV
2021-05-30 12:30:24 +02:00
parent dca6721300 6b966d8dab
commit f9b60e982a
12 changed files with 111 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/rcinput.cpp
View File

@@ -1757,7 +1757,7 @@ int CRCInput::translate(int code)
case KEY_CHANNELDOWN:
return RC_page_down;
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE
case KEY_VIDEO:
return RC_favorites;
case KEY_TV2:

13
src/gui/videosettings.cpp
View File

@@ -285,7 +285,7 @@ CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_O
{ -1, NONEXISTANT_LOCALE, "2160p 50Hz" },
{ -1, NONEXISTANT_LOCALE, "Auto" }
};
#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_H7 || BOXMODEL_BRE2ZE4K || BOXMODEL_VUPLUS_ALL
#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_VUPLUS_ALL
CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
{ -1, NONEXISTANT_LOCALE, "NTSC" },
@@ -530,7 +530,7 @@ int CVideoSettings::showVideoSetup()
#endif
#ifdef ENABLE_PIP
CPipSetup pip;
CMenuForwarder * pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, true, NULL, &pip);
CMenuForwarder * pipsetup = new CMenuForwarder(LOCALE_VIDEOMENU_PIP, g_info.hw_caps->can_pip, NULL, &pip);
pipsetup->setHint("", LOCALE_MENU_HINT_VIDEO_PIP);
videosetup->addItem(pipsetup);
#endif
@@ -690,7 +690,8 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /*
g_Zapit->setMode43(g_settings.video_43mode);
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
if (pipDecoder != NULL)
pipDecoder->setAspectRatio(g_settings.video_Format, g_settings.video_43mode);
#endif
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOMODE))
@@ -758,7 +759,8 @@ void CVideoSettings::next43Mode(void)
g_settings.video_43mode = videomenu_43mode_options[curmode].key;
g_Zapit->setMode43(g_settings.video_43mode);
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(-1, g_settings.video_43mode);
if (pipDecoder != NULL)
pipDecoder->setAspectRatio(-1, g_settings.video_43mode);
#endif
ShowHint(LOCALE_VIDEOMENU_43MODE, g_Locale->getText(text), 450, 2);
}
@@ -785,7 +787,8 @@ void CVideoSettings::SwitchFormat()
videoDecoder->setAspectRatio(g_settings.video_Format, -1);
#ifdef ENABLE_PIP
pipDecoder->setAspectRatio(g_settings.video_Format, -1);
if (pipDecoder != NULL)
pipDecoder->setAspectRatio(g_settings.video_Format, -1);
#endif
ShowHint(LOCALE_VIDEOMENU_VIDEOFORMAT, g_Locale->getText(text), 450, 2);
}

33
src/neutrino.cpp
View File

@@ -344,7 +344,7 @@ static SNeutrinoSettings::usermenu_t usermenu_default[] = {
{ CRCInput::RC_green, "6", "", "green" },
{ CRCInput::RC_yellow, "7,35", "", "yellow" },
{ CRCInput::RC_blue, "27,28,21,20,1,39,10,11,24,19,14", "", "blue" },
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE
{ CRCInput::RC_playpause, "9", "", "5" },
#else
{ CRCInput::RC_play, "9", "", "5" },
@@ -3422,7 +3422,7 @@ void CNeutrinoApp::RealRun()
CRecordManager::getInstance()->StartTimeshift();
}
#ifdef ENABLE_PIP
else if (msg == (neutrino_msg_t) g_settings.key_pip_close) {
else if ((msg == (neutrino_msg_t) g_settings.key_pip_close) && g_info.hw_caps->can_pip) {
int boxmode = getBoxMode();
if (boxmode > -1 && boxmode != 12)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_BOXMODE12_NOT_ACTIVATED, CMsgBox::mbrOk, CMsgBox::mbOk, NEUTRINO_ICON_ERROR);
@@ -3436,7 +3436,7 @@ void CNeutrinoApp::RealRun()
}
}
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
else if ((msg == (neutrino_msg_t) g_settings.key_pip_close_avinput) && ((g_info.hw_caps->has_SCART_input) || (g_info.hw_caps->has_HDMI_input))) {
else if ((msg == (neutrino_msg_t) g_settings.key_pip_close_avinput) && ((g_info.hw_caps->has_SCART_input) || (g_info.hw_caps->has_HDMI_input)) && g_info.hw_caps->can_pip) {
int boxmode = getBoxMode();
if (boxmode > -1 && boxmode != 12)
ShowMsg(LOCALE_MESSAGEBOX_ERROR, LOCALE_BOXMODE12_NOT_ACTIVATED, CMsgBox::mbrOk, CMsgBox::mbOk, NEUTRINO_ICON_ERROR);
@@ -3452,11 +3452,11 @@ void CNeutrinoApp::RealRun()
}
}
#endif
else if (msg == (neutrino_msg_t) g_settings.key_pip_setup) {
else if ((msg == (neutrino_msg_t) g_settings.key_pip_setup) && g_info.hw_caps->can_pip) {
CPipSetup pipsetup;
pipsetup.exec(NULL, "");
}
else if (msg == (neutrino_msg_t) g_settings.key_pip_swap) {
else if ((msg == (neutrino_msg_t) g_settings.key_pip_swap) && g_info.hw_caps->can_pip) {
t_channel_id pip_channel_id = CZapit::getInstance()->GetPipChannelID();
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
if (pip_channel_id && (pip_channel_id != live_channel_id)) {
@@ -4826,9 +4826,12 @@ void CNeutrinoApp::tvMode( bool rezap )
}
#ifdef ENABLE_PIP
pipDecoder->Pig(g_settings.pip_x, g_settings.pip_y,
if (g_info.hw_caps->can_pip)
{
pipDecoder->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*/) {
@@ -5107,9 +5110,12 @@ void CNeutrinoApp::radioMode( bool rezap)
}
#ifdef ENABLE_PIP
pipDecoder->Pig(g_settings.pip_radio_x, g_settings.pip_radio_y,
if (g_info.hw_caps->can_pip)
{
pipDecoder->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();
@@ -5173,6 +5179,9 @@ void CNeutrinoApp::switchTvRadioMode(const int prev_mode)
#ifdef ENABLE_PIP
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
void CNeutrinoApp::StartAVInputPiP() {
if (!g_info.hw_caps->can_pip)
return;
if (!pipDemux) {
pipDemux = new cDemux(1);
pipDemux->Open(DMX_PIP_CHANNEL);
@@ -5191,6 +5200,9 @@ void CNeutrinoApp::StartAVInputPiP() {
}
void CNeutrinoApp::StopAVInputPiP() {
if (!g_info.hw_caps->can_pip)
return;
pipDecoder->ShowPig(0);
pipDemux->Stop();
pipDecoder->Stop();
@@ -5673,7 +5685,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.key_list_start = tconfig->getInt32( "key_list_start", (unsigned int)CRCInput::RC_nokey );
g_settings.key_list_end = tconfig->getInt32( "key_list_end", (unsigned int)CRCInput::RC_nokey );
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_nokey ); // FIXME
#elif BOXMODEL_VUPLUS_ALL
g_settings.key_timeshift = tconfig->getInt32( "key_timeshift", CRCInput::RC_playpause );
@@ -5709,7 +5721,7 @@ void CNeutrinoApp::loadKeys(const char * fname)
g_settings.mpkey_rewind = tconfig->getInt32( "mpkey.rewind", CRCInput::RC_rewind );
g_settings.mpkey_forward = tconfig->getInt32( "mpkey.forward", CRCInput::RC_forward );
g_settings.mpkey_stop = tconfig->getInt32( "mpkey.stop", CRCInput::RC_stop );
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE
g_settings.mpkey_play = tconfig->getInt32( "mpkey.play", CRCInput::RC_playpause );
g_settings.mpkey_pause = tconfig->getInt32( "mpkey.pause", CRCInput::RC_playpause );
#elif BOXMODEL_VUPLUS_ALL
@@ -5979,6 +5991,9 @@ void CNeutrinoApp::getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::s
bool CNeutrinoApp::StartPip(const t_channel_id channel_id)
{
bool ret = false;
if (!g_info.hw_caps->can_pip)
return ret;
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
if (!channel)
return ret;

2
src/neutrino_menue.cpp
View File

@@ -174,7 +174,7 @@ void CNeutrinoApp::InitMenuMain()
personalize.addItem(MENU_MAIN, avinputmode, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT]);
#ifdef ENABLE_PIP
CMenuForwarder *avinputmode_pip = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE_PIP, true, NULL, this, "avinput_pip");
CMenuForwarder *avinputmode_pip = new CMenuForwarder(LOCALE_MAINMENU_AVINPUTMODE_PIP, g_info.hw_caps->can_pip, NULL, this, "avinput_pip");
avinputmode_pip->setHint(NEUTRINO_ICON_HINT_AVINPUTMODE_PIP, LOCALE_MENU_HINT_AVINPUTMODE_PIP);
personalize.addItem(MENU_MAIN, avinputmode_pip, &g_settings.personalize[SNeutrinoSettings::P_MAIN_AVINPUT_PIP]);
#endif

2
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -899,7 +899,7 @@ unsigned int revert_translate(unsigned int code)
case RC_page_down:
return KEY_CHANNELDOWN;
#ifdef HAVE_ARM_HARDWARE
#if BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
#if BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
case RC_favorites:
return KEY_VIDEO;
#endif

2
src/system/helpers.cpp
View File

@@ -2108,7 +2108,7 @@ int getActivePartition()
}
fclose(f);
}
#elif BOXMODEL_HD51 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
#elif BOXMODEL_HD51 || BOXMODEL_BRE2ZE4K || BOXMODEL_H7 || BOXMODEL_HD60 || BOXMODEL_HD61 || BOXMODEL_MULTIBOXSE || BOXMODEL_OSMIO4K || BOXMODEL_OSMIO4KPLUS
FILE *f;
// first check for subdirboot layout
f = fopen("/sys/firmware/devicetree/base/chosen/bootargs", "r");

36
src/zapit/src/zapit.cpp
View File

@@ -667,6 +667,9 @@ bool CZapit::ZapIt(const t_channel_id channel_id, bool forupdate, bool startplay
#ifdef ENABLE_PIP
bool CZapit::StopPip()
{
if (!g_info.hw_caps->can_pip)
return false;
#if !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
if (CNeutrinoApp::getInstance()->avinput_pip) {
CNeutrinoApp::getInstance()->StopAVInputPiP();
@@ -690,6 +693,9 @@ bool CZapit::StopPip()
bool CZapit::StartPip(const t_channel_id channel_id)
{
if (!g_info.hw_caps->can_pip)
return false;
CZapitChannel* newchannel;
bool transponder_change;
/* do lock if live is running, or in record mode -
@@ -2577,10 +2583,13 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
audioDecoder->SetVideo(videoDecoder);
#ifdef ENABLE_PIP
pipDemux = new cDemux(dnum);
pipDemux->Open(DMX_PIP_CHANNEL);
pipDecoder = cVideo::GetDecoder(1);
pipDecoder->SetDemux(pipDemux);
if (g_info.hw_caps->can_pip)
{
pipDemux = new cDemux(dnum);
pipDemux->Open(DMX_PIP_CHANNEL);
pipDecoder = cVideo::GetDecoder(1);
pipDecoder->SetDemux(pipDemux);
}
#endif
#else
#if HAVE_CST_HARDWARE
@@ -2595,14 +2604,17 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
audioDecoder = new cAudio(audioDemux->getBuffer(), videoDecoder->GetTVEnc(), NULL /*videoDecoder->GetTVEncSD()*/);
#ifdef ENABLE_PIP
if (g_info.hw_caps->can_pip)
{
#if HAVE_CST_HARDWARE
pipDemux = new cDemux(dnum);
pipDemux->Open(DMX_PIP_CHANNEL);
pipDecoder = new cVideo(video_mode, pipDemux->getChannel(), pipDemux->getBuffer(), 1);
pipDemux = new cDemux(dnum);
pipDemux->Open(DMX_PIP_CHANNEL);
pipDecoder = new cVideo(video_mode, pipDemux->getChannel(), pipDemux->getBuffer(), 1);
#else
pipDecoder = new cVideo(0, NULL, NULL, 1);
pipDecoder->ShowPig(0);
pipDecoder = new cVideo(0, NULL, NULL, 1);
pipDecoder->ShowPig(0);
#endif
}
#endif
#endif
@@ -2818,8 +2830,10 @@ void CZapit::run()
delete audioDemux;
#ifdef ENABLE_PIP
StopPip();
delete pipDecoder;
delete pipDemux;
if (pipDecoder)
delete pipDecoder;
if (pipDemux)
delete pipDemux;
#endif
INFO("demuxes/decoders deleted");