mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "introduce hdmi_cec to driver"

Browse Source 
This reverts commit 35df18cfb5 and the following hdmi_cec commits.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9338ea7226
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-12-28 (Wed, 28 Dec 2022)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-12-28 21:29:54 +01:00
parent b0a026bebf
commit 1d7ff96338
16 changed files with 31 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/neutrino.cpp
View File

@@ -63,9 +63,6 @@
#include <driver/display.h>
#include <driver/radiotext.h>
#include <driver/scanepg.h>
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include <driver/hdmi_cec.h>
#endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include "gui/psisetup.h"
@@ -476,10 +473,8 @@ int CNeutrinoApp::loadSetup(const char *fname)
// hdmi cec
g_settings.hdmi_cec_mode = configfile.getInt32("hdmi_cec_mode", 0);
g_settings.hdmi_cec_view_on = configfile.getInt32("hdmi_cec_view_on", 0);
g_settings.hdmi_cec_sleep = configfile.getInt32("hdmi_cec_sleep", 0);
g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0);
g_settings.hdmi_cec_volume = configfile.getInt32("hdmi_cec_volume", 0);
g_settings.hdmi_cec_wakeup = configfile.getInt32("hdmi_cec_wakeup", 01);
// volume
g_settings.current_volume = configfile.getInt32("current_volume", 75);
@@ -1578,10 +1573,8 @@ void CNeutrinoApp::saveSetup(const char *fname)
// hdmi cec
configfile.setInt32("hdmi_cec_mode", g_settings.hdmi_cec_mode);
configfile.setInt32("hdmi_cec_view_on", g_settings.hdmi_cec_view_on);
configfile.setInt32("hdmi_cec_sleep", g_settings.hdmi_cec_sleep);
configfile.setInt32("hdmi_cec_standby", g_settings.hdmi_cec_standby);
configfile.setInt32("hdmi_cec_volume", g_settings.hdmi_cec_volume);
configfile.setInt32("hdmi_cec_wakeup", g_settings.hdmi_cec_wakeup);
// volume
configfile.setInt32( "current_volume", g_settings.current_volume );
@@ -4496,11 +4489,6 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
else if( msg == NeutrinoMessages::STANDBY_ON ) {
if( mode != NeutrinoModes::mode_standby ) {
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (data)
standbyModeFromCEC( true );
else
#endif
standbyMode( true );
}
g_RCInput->clearRCMsg();
@@ -4508,11 +4496,6 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
else if( msg == NeutrinoMessages::STANDBY_OFF ) {
if( mode == NeutrinoModes::mode_standby ) {
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (data)
standbyModeFromCEC( false );
else
#endif
standbyMode( false );
}
g_RCInput->clearRCMsg();
@@ -4678,21 +4661,13 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
else if (msg == NeutrinoMessages::EVT_HDMI_CEC_VIEW_ON) {
if(g_settings.hdmi_cec_view_on)
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECAutoView(g_settings.hdmi_cec_view_on);
#else
videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on);
#endif
return messages_return::handled;
}
else if (msg == NeutrinoMessages::EVT_HDMI_CEC_STANDBY) {
if(g_settings.hdmi_cec_standby)
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECAutoStandby(g_settings.hdmi_cec_standby);
#else
videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby);
#endif
return messages_return::handled;
}
@@ -4886,10 +4861,6 @@ void CNeutrinoApp::ExitRun(int exit_code)
if (exit_code == CNeutrinoApp::EXIT_SHUTDOWN)
cGLCD::SetBrightness(0);
#endif
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (exit_code == CNeutrinoApp::EXIT_SHUTDOWN)
g_hdmicec->SetCECState(true);
#endif
Cleanup();
@@ -4972,9 +4943,6 @@ void CNeutrinoApp::tvMode( bool rezap )
if( mode == NeutrinoModes::mode_standby ) {
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
videoDecoder->Standby(false);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECState(false);
#endif
}
#if ENABLE_PIP
@@ -5051,16 +5019,8 @@ void CNeutrinoApp::AVInputMode(bool bOnOff)
(void)bOnOff; // avoid compiler warning
#endif // !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE
}
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
void CNeutrinoApp::standbyModeFromCEC( bool bOnOff )
{
standbyMode(bOnOff, false, true);
}
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby, bool fromcec )
#else
void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
#endif
{
//static bool wasshift = false;
INFO("%s", bOnOff ? "ON" : "OFF" );
@@ -5108,10 +5068,6 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
videoDecoder->Standby(true);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (!fromcec)
g_hdmicec->SetCECState(true);
#endif
g_Sectionsd->setServiceChanged(0, false);
g_Sectionsd->setPauseScanning(!fromDeepStandby);
@@ -5169,10 +5125,6 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
videoDecoder->Standby(false);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
if (!fromcec)
g_hdmicec->SetCECState(false);
#endif
CEpgScan::getInstance()->Stop();
CSectionsdClient::CurrentNextInfo dummy;
g_InfoViewer->getEPG(0, dummy);
@@ -5409,11 +5361,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey)
}
else if (actionKey=="restart")
{
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
#else
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
#endif
ExitRun(CNeutrinoApp::EXIT_RESTART);
returnval = menu_return::RETURN_NONE;
}
@@ -5733,11 +5681,7 @@ void stop_daemons(bool stopall, bool for_flash)
printf("zapit shutdown\n");
if(!for_flash && !stopall && g_settings.hdmi_cec_mode && g_settings.hdmi_cec_standby)
{
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
#else
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
#endif
}
if(InfoClock)
delete InfoClock;