From aa010fea135f85f12601e62d494514b789e37bda Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 14 Sep 2016 00:23:23 +0200 Subject: [PATCH] pzapit: fix change video mode; tell neutrino about the new value Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2a4977101032786d9783a4a4ba69081f2f730bb0 Author: vanhofen Date: 2016-09-14 (Wed, 14 Sep 2016) Origin message was: ------------------ - pzapit: fix change video mode; tell neutrino about the new value ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.h | 2 ++ src/zapit/src/zapit.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/neutrino.h b/src/neutrino.h index a0e4df208..1160503bb 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -245,6 +245,8 @@ public: sigc::signal OnBeforeRestart; sigc::signal OnAfterSetupFonts; void channelRezap(); + + void g_settings_video_Mode(int value) { g_settings.video_Mode = value; } }; #endif diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 2815e66b1..cf07ef0d9 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -77,6 +77,8 @@ #include #include +#include + #ifdef PEDANTIC_VALGRIND_SETUP #define VALGRIND_PARANOIA(x) memset(&x, 0, sizeof(x)) #else @@ -1713,14 +1715,13 @@ bool CZapit::ParseCommand(CBasicMessage::Header &rmsg, int connfd) } break; } -#if 0 case CZapitMessages::CMD_SET_VIDEO_SYSTEM: { CZapitMessages::commandInt msg; CBasicServer::receive_data(connfd, &msg, sizeof(msg)); videoDecoder->SetVideoSystem(msg.val); + CNeutrinoApp::getInstance()->g_settings_video_Mode(msg.val); break; } -#endif #if 0 case CZapitMessages::CMD_SET_NTSC: { videoDecoder->SetVideoSystem(8);