From 53f31245d46f5ec35d62cb18c7ddfc6feb2974a5 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 9 Jan 2024 12:17:29 +0100 Subject: [PATCH] zapit: fix build in src/capmt.cpp on disabled PIP - Add missig #if ENABLE_PIP in switch with case PIP Introduced by Cherry-Pick: Fix Compiler Warning 93dd22886d9bda81afbe7ab43afeda8b1dda49f0 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c27ee1803bc29693aca40cfb24668b2374b44a6f Author: Thilo Graf Date: 2024-01-09 (Tue, 09 Jan 2024) ------------------ This commit was generated by Migit --- src/zapit/src/capmt.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index 92fa33a7e..30c75828e 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -266,7 +266,7 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start source = frontend->getNumber(); demux = source; #endif // DYNAMIC_DEMUX -#else +#else // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE source = channel->getStreamDemux(); demux = channel->getStreamDemux(); #endif @@ -283,13 +283,14 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start source = frontend->getNumber(); demux = source; #endif // DYNAMIC_DEMUX -#else +#else // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE source = channel->getRecordDemux(); demux = channel->getRecordDemux(); #endif INFO("RECORD(%d): fe_num %d rec_dmx %d", mode, source, demux); break; case PIP: +#if ENABLE_PIP #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #ifdef DYNAMIC_DEMUX source = channel->getPipDemux(); @@ -307,8 +308,9 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start #else source = channel->getRecordDemux(); demux = channel->getPipDemux(); -#endif +#endif // HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE INFO("PIP: fe_num %d dmx_src %d", source, demux); +#endif // ENABLE_PIP break; }