mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "introduce hdmi_cec to driver"

Browse Source 
This reverts commit c8a58afe2feb95954a69e681a4234cd9c1a3f178 and the following hdmi_cec commits.

 Conflicts:
	src/neutrino.cpp
This commit is contained in:
vanhofen
2022-12-28 21:29:54 +01:00
committed by Thilo Graf
parent d67d9de4d3
commit d9f7525b95
16 changed files with 52 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,14 +51,10 @@ extern CPictureViewer *g_PicViewer;
// nhttpd
#include "neutrinoapi.h"
#include "controlapi.h"
#include <hardware/video.h>
#include <zapit/femanager.h>
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
#include <driver/hdmi_cec.h>
#else
#include <hardware/video.h>
extern cVideo * videoDecoder;
#endif
extern CPlugins *g_Plugins;//for relodplugins
extern CBouquetManager *g_bouquetManager;
@@ -593,11 +589,7 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh)
{
//dont use CEC with standbyoff (TV off) --- use: control/standby?off&cec=off
if(g_settings.hdmi_cec_standby && CEC_HDMI_off){
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECAutoStandby(0);
#else
videoDecoder->SetCECAutoStandby(0);
#endif
}
if(CNeutrinoApp::getInstance()->getMode() != 4)
@@ -612,11 +604,7 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh)
{
//dont use CEC with with view on (TV on) --- use: control/standby?off&cec=off
if(g_settings.hdmi_cec_view_on && CEC_HDMI_off){
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
g_hdmicec->SetCECAutoView(0);
#else
videoDecoder->SetCECAutoView(0);
#endif
}
NeutrinoAPI->Zapit->setStandby(false);