From 967e4bd826c0fe4cc252c8b39d45bb6bf808094e Mon Sep 17 00:00:00 2001 From: nightshad Date: Fri, 28 May 2010 15:23:25 +0000 Subject: [PATCH] Changes for CEC. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@607 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/54c12db9cc4034ac25b5b4b800de4d79c3e3a74e Author: nightshad Date: 2010-05-28 (Fri, 28 May 2010) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 4 ++++ src/neutrino_menue.cpp | 8 +++----- src/zapit/src/zapit.cpp | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 358c00f08..9fc7217f4 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2412,6 +2412,10 @@ int CNeutrinoApp::run(int argc, char **argv) audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false); videoDecoder->SetDBDR(g_settings.video_dbdr); + videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); + videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); + videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); + audioSetupNotifier->changeNotify(LOCALE_AUDIOMENU_AVSYNC, NULL); if(display_language_selection) diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index ef3e388d1..5186f9d3b 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -437,18 +437,16 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void *) { cec1->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); cec2->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); - videoDecoder->SetCEC((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); + videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); } -#if 0 else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_STANDBY)) { - videoDecoder->enableCECStandby(g_settings.hdmi_cec_standby); + videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON)) { - videoDecoder->enableCECView(g_settings.hdmi_cec_view_on); + videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); } -#endif else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_DBDR)) { videoDecoder->SetDBDR(g_settings.video_dbdr); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index f9443587f..059d78522 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2106,6 +2106,7 @@ int zapit_main_thread(void *data) pcrDemux->Open(DMX_PCR_ONLY_CHANNEL, videoDemux->getBuffer()); videoDecoder = new cVideo(2, videoDemux->getChannel(), videoDemux->getBuffer());//PAL + videoDecoder->Standby(false); videoDecoder->SetVideoSystem(video_mode); //videoDecoder = new cVideo(video_mode, videoDemux->getChannel(), videoDemux->getBuffer());//PAL