From 7f1a9471858e0a4c2055941890d2e75a77658b27 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 2 Jan 2024 01:22:58 +0100 Subject: [PATCH] zapit/channel.h: simplify ifdef ENABLE_PIP Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2cffd27e1fd97476b01bfb9c22a6b1e681b68a6f Author: vanhofen Date: 2024-01-02 (Tue, 02 Jan 2024) Origin message was: ------------------ - zapit/channel.h: simplify ifdef ENABLE_PIP --- src/zapit/include/zapit/channel.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h index d6d0861de..211e71cd5 100644 --- a/src/zapit/include/zapit/channel.h +++ b/src/zapit/include/zapit/channel.h @@ -302,16 +302,18 @@ class CZapitChannel void dumpServiceXml(FILE * fd, const char * action = NULL); void dumpBouquetXml(FILE * fd, bool bUser); + void setRecordDemux(uint8_t num) { record_demux = num; }; + int getRecordDemux() { return record_demux; }; + #ifdef ENABLE_PIP void setPipDemux(uint8_t num) { pip_demux = num; }; -#endif - void setStreamDemux(uint8_t num) { stream_demux = num; }; - int getRecordDemux() { return record_demux; }; -#ifdef ENABLE_PIP int getPipDemux() { return pip_demux; }; #endif + + void setStreamDemux(uint8_t num) { stream_demux = num; }; int getStreamDemux() { return stream_demux; }; + static t_channel_id makeChannelId(t_satellite_position sat, freq_id_t freq, t_transport_stream_id tsid, t_original_network_id onid, t_service_id sid) {