137 changes: 42 additions & 95 deletions mythtv/libs/libmythtv/cardutil.cpp
View file

Large diffs are not rendered by default.

36 changes: 16 additions & 20 deletions mythtv/libs/libmythtv/channelscan/channelscanner.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +330,11 @@ DTVConfParser::return_t ChannelScanner::ImportDVBUtils(
return ret;
}

bool ChannelScanner::ImportM3U(uint cardid, const QString &inputname,
uint sourceid, bool is_mpts)
bool ChannelScanner::ImportM3U([[maybe_unused]] uint cardid,
[[maybe_unused]] const QString &inputname,
uint sourceid,
bool is_mpts)
{
(void) cardid;
(void) inputname;
m_sourceid = sourceid;

if (!m_scanMonitor)
Expand All @@ -354,8 +354,11 @@ bool ChannelScanner::ImportM3U(uint cardid, const QString &inputname,
return true;
}

bool ChannelScanner::ImportVBox(uint cardid, const QString &inputname, uint sourceid,
bool ftaOnly, ServiceRequirements serviceType)
bool ChannelScanner::ImportVBox([[maybe_unused]] uint cardid,
[[maybe_unused]] const QString &inputname,
uint sourceid,
[[maybe_unused]] bool ftaOnly,
[[maybe_unused]] ServiceRequirements serviceType)
{
m_sourceid = sourceid;
#ifdef USING_VBOX
Expand All @@ -371,13 +374,12 @@ bool ChannelScanner::ImportVBox(uint cardid, const QString &inputname, uint sour

return true;
#else
(void) cardid;
(void) inputname;
return false;
#endif
}

bool ChannelScanner::ImportExternRecorder(uint cardid, const QString &inputname,
bool ChannelScanner::ImportExternRecorder([[maybe_unused]] uint cardid,
[[maybe_unused]] const QString &inputname,
uint sourceid)
{
m_sourceid = sourceid;
Expand All @@ -397,15 +399,14 @@ bool ChannelScanner::ImportExternRecorder(uint cardid, const QString &inputname,

return true;
#else
(void) cardid;
(void) inputname;

return false;
#endif
}

bool ChannelScanner::ImportHDHR(uint cardid, const QString &inputname, uint sourceid,
ServiceRequirements serviceType)
bool ChannelScanner::ImportHDHR([[maybe_unused]] uint cardid,
[[maybe_unused]] const QString &inputname,
uint sourceid,
[[maybe_unused]] ServiceRequirements serviceType)
{
m_sourceid = sourceid;
#ifdef USING_HDHOMERUN
Expand All @@ -421,9 +422,6 @@ bool ChannelScanner::ImportHDHR(uint cardid, const QString &inputname, uint sour

return true;
#else
(void) cardid;
(void) inputname;
(void) serviceType;
return false;
#endif
}
Expand All @@ -433,7 +431,7 @@ void ChannelScanner::PreScanCommon(
uint cardid,
const QString &inputname,
uint sourceid,
bool do_ignore_signal_timeout,
[[maybe_unused]] bool do_ignore_signal_timeout,
bool do_test_decryption)
{
bool monitor_snr = false;
Expand Down Expand Up @@ -481,8 +479,6 @@ void ChannelScanner::PreScanCommon(

m_channel = new DVBChannel(device);
}
#else
(void)do_ignore_signal_timeout;
#endif

#ifdef USING_V4L2
Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/channelscan/hdhrchannelfetcher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ hdhr_chan_map_t *getChannels(const QString& ip)
return result;
}

QString HDHRIPv4Address(const QString &device)
QString HDHRIPv4Address([[maybe_unused]] const QString &device)
{
#ifdef USING_HDHOMERUN
hdhomerun_device_t *hdhr =
Expand All @@ -172,7 +172,6 @@ QString HDHRIPv4Address(const QString &device)

return QString("%1.%2.%3.%4").arg(ipv4>>24&0xff).arg(ipv4>>16&0xff).arg(ipv4>>8&0xff).arg(ipv4&0xff);
#else
(void) device;
return {};
#endif
}
Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/channelsettings.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,8 @@ ChannelOptionsCommon::ChannelOptionsCommon(const ChannelID &id,
}
};

void ChannelOptionsCommon::onAirGuideChanged(bool fValue)
void ChannelOptionsCommon::onAirGuideChanged([[maybe_unused]] bool fValue)
{
(void)fValue;
}

void ChannelOptionsCommon::sourceChanged(const QString& sourceid)
Expand Down
5 changes: 1 addition & 4 deletions mythtv/libs/libmythtv/dbcheck.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,10 @@ to check for duplicates in the BUSQ
*/
bool UpgradeTVDatabaseSchema(const bool upgradeAllowed,
const bool upgradeIfNoUI,
const bool informSystemd)
[[maybe_unused]] const bool informSystemd)
{
#ifdef IGNORE_SCHEMA_VER_MISMATCH
return true;
#endif
#if CONFIG_SYSTEMD_NOTIFY == 0
Q_UNUSED(informSystemd);
#endif
SchemaUpgradeWizard *schema_wizard = nullptr;

Expand Down
18 changes: 5 additions & 13 deletions mythtv/libs/libmythtv/decoders/avformatdecoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,7 @@ void AvFormatDecoder::ScanDSMCCStreams(void)
desc += 2; // Skip data ID
while (desc != endDesc)
{
uint appTypeCode = desc[0]<<8 | desc[1];
[[maybe_unused]] uint appTypeCode = desc[0]<<8 | desc[1];
desc += 3; // Skip app type code and boot priority hint
uint appSpecDataLen = *desc++;
#ifdef USING_MHEG
Expand All @@ -1903,8 +1903,6 @@ void AvFormatDecoder::ScanDSMCCStreams(void)
}
}
else
#else
(void) appTypeCode;
#endif // USING_MHEG
{
desc += appSpecDataLen;
Expand Down Expand Up @@ -3740,10 +3738,8 @@ bool AvFormatDecoder::ProcessVideoFrame(AVStream *Stream, AVFrame *AvFrame)
* \sa CC608Decoder, TeletextDecoder
*/
void AvFormatDecoder::ProcessVBIDataPacket(
const AVStream *stream, const AVPacket *pkt)
[[maybe_unused]] const AVStream *stream, const AVPacket *pkt)
{
(void) stream;

const uint8_t *buf = pkt->data;
uint64_t linemask = 0;
std::chrono::microseconds utc = m_lastCcPtsu;
Expand Down Expand Up @@ -3882,7 +3878,8 @@ void AvFormatDecoder::ProcessDVBDataPacket(
/** \fn AvFormatDecoder::ProcessDSMCCPacket(const AVStream*, const AVPacket*)
* \brief Process DSMCC object carousel packet.
*/
void AvFormatDecoder::ProcessDSMCCPacket(const AVStream *str, const AVPacket *pkt)
void AvFormatDecoder::ProcessDSMCCPacket([[maybe_unused]] const AVStream *str,
[[maybe_unused]] const AVPacket *pkt)
{
#ifdef USING_MHEG
if (!m_itv && ! (m_itv = m_parent->GetInteractiveTV()))
Expand Down Expand Up @@ -3914,9 +3911,6 @@ void AvFormatDecoder::ProcessDSMCCPacket(const AVStream *str, const AVPacket *pk
length -= sectionLen;
data += sectionLen;
}
#else
Q_UNUSED(str);
Q_UNUSED(pkt);
#endif // USING_MHEG
}

Expand Down Expand Up @@ -4023,7 +4017,7 @@ bool AvFormatDecoder::ProcessRawTextPacket(AVPacket* Packet)
}

bool AvFormatDecoder::ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
DecodeType decodetype)
[[maybe_unused]] DecodeType decodetype)
{
enum AVCodecID codec_id = curstream->codecpar->codec_id;

Expand All @@ -4044,8 +4038,6 @@ bool AvFormatDecoder::ProcessDataPacket(AVStream *curstream, AVPacket *pkt,
#ifdef USING_MHEG
if (!(decodetype & kDecodeVideo))
m_allowedQuit |= (m_itv && m_itv->ImageHasChanged());
#else
Q_UNUSED(decodetype);
#endif // USING_MHEG:
break;
}
Expand Down
6 changes: 3 additions & 3 deletions mythtv/libs/libmythtv/decoders/avformatdecoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ class AvFormatDecoder : public DecoderBase
bool IsLastFrameKey(void) const override { return false; } // DecoderBase

/// This is a No-op for this class.
void WriteStoredData(MythMediaBuffer *Buffer, bool storevid,
std::chrono::milliseconds timecodeOffset) override // DecoderBase
{ (void)Buffer; (void)storevid; (void)timecodeOffset;}
void WriteStoredData([[maybe_unused]] MythMediaBuffer *Buffer,
[[maybe_unused]] bool storevid,
[[maybe_unused]] std::chrono::milliseconds timecodeOffset) override {} // DecoderBase

/// This is a No-op for this class.
void SetRawAudioState(bool state) override { (void)state; } // DecoderBase
Expand Down
11 changes: 6 additions & 5 deletions mythtv/libs/libmythtv/decoders/mythcodeccontext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ MythCodecContext::MythCodecContext(DecoderBase *Parent, MythCodecID CodecID)
{
}

MythCodecContext *MythCodecContext::CreateContext(DecoderBase *Parent, MythCodecID Codec)
MythCodecContext *MythCodecContext::CreateContext(DecoderBase *Parent,
[[maybe_unused]] MythCodecID Codec)
{
MythCodecContext *mctx = nullptr;
#ifdef USING_VAAPI
Expand Down Expand Up @@ -105,7 +106,6 @@ MythCodecContext *MythCodecContext::CreateContext(DecoderBase *Parent, MythCodec
if (codec_is_drmprime(Codec))
mctx = new MythDRMPRIMEContext(Parent, Codec);
#endif
Q_UNUSED(Codec);

if (!mctx)
mctx = new MythCodecContext(Parent, Codec);
Expand Down Expand Up @@ -243,8 +243,10 @@ void MythCodecContext::GetDecoders(RenderOptions &Opts, bool Reinit /*=false*/)
#endif
}

MythCodecID MythCodecContext::FindDecoder(const QString &Decoder, AVStream *Stream,
AVCodecContext **Context, const AVCodec **Codec)
MythCodecID MythCodecContext::FindDecoder(const QString &Decoder,
[[maybe_unused]] AVStream *Stream,
AVCodecContext **Context,
const AVCodec **Codec)
{
MythCodecID result = kCodec_NONE;
uint streamtype = mpeg_version((*Context)->codec_id);
Expand All @@ -260,7 +262,6 @@ MythCodecID MythCodecContext::FindDecoder(const QString &Decoder, AVStream *Stre
return result;
#endif
#ifdef USING_VTB
(void)Stream;
result = MythVTBContext::GetSupportedCodec(Context, Codec, Decoder, streamtype);
if (codec_is_vtb(result) || codec_is_vtb_dec(result))
return result;
Expand Down
43 changes: 16 additions & 27 deletions mythtv/libs/libmythtv/diseqc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,8 @@ bool DiSEqCDevTree::Store(uint cardid, const QString &device)
return true;
}

bool DiSEqCDevTree::SetTone(bool on) const
bool DiSEqCDevTree::SetTone([[maybe_unused]] bool on) const
{
(void) on;

bool success = false;

#ifdef USING_DVB
Expand Down Expand Up @@ -671,7 +669,9 @@ static bool send_diseqc(int fd, const dvb_diseqc_master_cmd cmd)
* \param data_len Length of optional data.
* \param data Pointer to optional data.
*/
bool DiSEqCDevTree::SendCommand(uint adr, uint cmd, uint repeats,
bool DiSEqCDevTree::SendCommand([[maybe_unused]] uint adr,
[[maybe_unused]] uint cmd,
[[maybe_unused]] uint repeats,
cmd_vec_t &data) const
{
// check payload validity
Expand All @@ -683,9 +683,6 @@ bool DiSEqCDevTree::SendCommand(uint adr, uint cmd, uint repeats,

#ifndef USING_DVB

(void) adr;
(void) cmd;
(void) repeats;
return false;

#else // if USING_DVB
Expand Down Expand Up @@ -1359,14 +1356,10 @@ void DiSEqCDevSwitch::SetNumPorts(uint num_ports)
m_numPorts = num_ports;
}

bool DiSEqCDevSwitch::ExecuteLegacy(const DiSEqCDevSettings &settings,
const DTVMultiplex &tuning,
uint pos)
bool DiSEqCDevSwitch::ExecuteLegacy([[maybe_unused]] const DiSEqCDevSettings &settings,
[[maybe_unused]] const DTVMultiplex &tuning,
[[maybe_unused]] uint pos)
{
(void) settings;
(void) tuning;
(void) pos;

#if defined(USING_DVB) && defined(FE_DISHNETWORK_SEND_LEGACY_CMD)
static const cmd_vec_t kSw21Cmds { 0x34, 0x65, };
static const cmd_vec_t kSw42Cmds { 0x46, 0x17, };
Expand Down Expand Up @@ -1512,12 +1505,10 @@ bool DiSEqCDevSwitch::ExecuteTone(const DiSEqCDevSettings &/*settings*/,
return false;
}

bool DiSEqCDevSwitch::ExecuteVoltage(const DiSEqCDevSettings &settings,
const DTVMultiplex &tuning, uint pos)
bool DiSEqCDevSwitch::ExecuteVoltage([[maybe_unused]] const DiSEqCDevSettings &settings,
[[maybe_unused]] const DTVMultiplex &tuning,
uint pos)
{
(void) settings;
(void) tuning;

LOG(VB_CHANNEL, LOG_INFO, LOC + "Changing to Voltage Switch port " +
QString("%1/2").arg(pos + 1));

Expand All @@ -1534,12 +1525,10 @@ bool DiSEqCDevSwitch::ExecuteVoltage(const DiSEqCDevSettings &settings,
return false;
}

bool DiSEqCDevSwitch::ExecuteMiniDiSEqC(const DiSEqCDevSettings &settings,
const DTVMultiplex &tuning, uint pos)
bool DiSEqCDevSwitch::ExecuteMiniDiSEqC([[maybe_unused]] const DiSEqCDevSettings &settings,
[[maybe_unused]] const DTVMultiplex &tuning,
uint pos)
{
(void) settings;
(void) tuning;

LOG(VB_CHANNEL, LOG_INFO, LOC + "Changing to MiniDiSEqC Switch port " +
QString("%1/2").arg(pos + 1));

Expand Down Expand Up @@ -2202,10 +2191,10 @@ bool DiSEqCDevSCR::PowerOff(void) const
return SendCommand(DISEQC_CMD_ODU, m_repeat, data);
}

bool DiSEqCDevSCR::SendCommand(uint cmd, uint repeats, cmd_vec_t &data) const
bool DiSEqCDevSCR::SendCommand(uint cmd,
[[maybe_unused]] uint repeats,
cmd_vec_t &data) const
{
(void) repeats;

// power on bus
if (!m_tree.SetVoltage(SEC_VOLTAGE_18))
return false;
Expand Down
6 changes: 2 additions & 4 deletions mythtv/libs/libmythtv/mpeg/AVCParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,17 +780,15 @@ void AVCParser::decode_SPS(BitReader& br)
8.2.1. The value of offset_for_non_ref_pic shall be in the
range of -231 to 231 - 1, inclusive.
*/
int offset_for_non_ref_pic = br.get_se_golomb();
(void) offset_for_non_ref_pic; // suppress unused var warning
[[maybe_unused]] int offset_for_non_ref_pic = br.get_se_golomb();

/*
offset_for_top_to_bottom_field is used to calculate the
picture order count of a bottom field as specified in
subclause 8.2.1. The value of offset_for_top_to_bottom_field
shall be in the range of -231 to 231 - 1, inclusive.
*/
int offset_for_top_to_bottom_field = br.get_se_golomb();
(void) offset_for_top_to_bottom_field; // suppress unused var warning
[[maybe_unused]] int offset_for_top_to_bottom_field = br.get_se_golomb();

/*
offset_for_ref_frame[ i ] is an element of a list of
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,9 @@ bool MPEGStreamData::CreatePMTSingleProgram(const ProgramMapTable &pmt)
/** \fn MPEGStreamData::IsRedundant(uint pid, const PSIPTable&) const
* \brief Returns true if table already seen.
*/
bool MPEGStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
bool MPEGStreamData::IsRedundant([[maybe_unused]] uint pid,
const PSIPTable &psip) const
{
(void) pid;
const int table_id = psip.TableID();
const int version = psip.Version();

Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/mpeg/mpegtables.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,9 +328,8 @@ bool PSIPTable::VerifyPSIP(bool verify_crc) const
return true;
}

ProgramAssociationTable* ProgramAssociationTable::CreateBlank(bool smallPacket)
ProgramAssociationTable* ProgramAssociationTable::CreateBlank([[maybe_unused]] bool smallPacket)
{
(void) smallPacket; // currently always a small packet..
TSPacket *tspacket = TSPacket::CreatePayloadOnlyPacket();
auto *dst = tspacket->data() + sizeof(TSHeader) + 1; /* start of field pointer */
std::copy(DEFAULT_PAT_HEADER.cbegin(), DEFAULT_PAT_HEADER.cend(), dst);
Expand Down
14 changes: 5 additions & 9 deletions mythtv/libs/libmythtv/mythplayercaptionsui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,8 @@ InteractiveTV* MythPlayerCaptionsUI::GetInteractiveTV()
* parameter. This is fine as long as there is only one signal/slot connection but
* I'm guessing won't work as well if signalled across threads.
*/
void MythPlayerCaptionsUI::ITVHandleAction(const QString &Action, bool& Handled)
void MythPlayerCaptionsUI::ITVHandleAction([[maybe_unused]] const QString &Action,
[[maybe_unused]] bool& Handled)
{
#ifdef USING_MHEG
if (!GetInteractiveTV())
Expand All @@ -558,14 +559,13 @@ void MythPlayerCaptionsUI::ITVHandleAction(const QString &Action, bool& Handled)

QMutexLocker locker(&m_itvLock);
Handled = m_interactiveTV->OfferKey(Action);
#else
Q_UNUSED(Action);
Q_UNUSED(Handled);
#endif
}

/// \brief Restart the MHEG/MHP engine.
void MythPlayerCaptionsUI::ITVRestart(uint Chanid, uint Cardid, bool IsLiveTV)
void MythPlayerCaptionsUI::ITVRestart([[maybe_unused]] uint Chanid,
[[maybe_unused]] uint Cardid,
[[maybe_unused]] bool IsLiveTV)
{
#ifdef USING_MHEG
if (!GetInteractiveTV())
Expand All @@ -574,10 +574,6 @@ void MythPlayerCaptionsUI::ITVRestart(uint Chanid, uint Cardid, bool IsLiveTV)
QMutexLocker locker(&m_itvLock);
m_interactiveTV->Restart(static_cast<int>(Chanid), static_cast<int>(Cardid), IsLiveTV);
m_itvVisible = false;
#else
Q_UNUSED(Chanid);
Q_UNUSED(Cardid);
Q_UNUSED(IsLiveTV);
#endif
}

Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/opengl/mythopengltonemap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ MythOpenGLTonemap::~MythOpenGLTonemap()
m_colourSpace->DecrRef();
}

void MythOpenGLTonemap::UpdateColourSpace(bool PrimariesChanged)
void MythOpenGLTonemap::UpdateColourSpace([[maybe_unused]] bool PrimariesChanged)
{
(void)PrimariesChanged;
OpenGLLocker locker(m_render);
if (m_shader)
{
Expand Down
13 changes: 4 additions & 9 deletions mythtv/libs/libmythtv/opengl/mythvaapidrminterop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,9 +407,9 @@ static inline void VADRMtoPRIME(VADRMPRIMESurfaceDescriptor* VaDRM, AVDRMFrameDe
* for testing DRM PRIME functionality on desktops.
*/
std::vector<MythVideoTextureOpenGL*>
MythVAAPIInteropDRM::AcquirePrime(VASurfaceID Id,
MythRenderOpenGL* Context,
MythVideoFrame* Frame)
MythVAAPIInteropDRM::AcquirePrime([[maybe_unused]] VASurfaceID Id,
[[maybe_unused]] MythRenderOpenGL* Context,
[[maybe_unused]] MythVideoFrame* Frame)
{
std::vector<MythVideoTextureOpenGL*> result;

Expand All @@ -419,15 +419,11 @@ MythVAAPIInteropDRM::AcquirePrime(VASurfaceID Id,
if (!m_drmFrames.contains(Id))
return result;
result = CreateTextures(m_drmFrames[Id], Context, Frame, false);
#else
(void)Id;
(void)Context;
(void)Frame;
#endif
return result;
}

AVDRMFrameDescriptor* MythVAAPIInteropDRM::GetDRMFrameDescriptor(VASurfaceID Id)
AVDRMFrameDescriptor* MythVAAPIInteropDRM::GetDRMFrameDescriptor([[maybe_unused]] VASurfaceID Id)
{
#if VA_CHECK_VERSION(1, 1, 0)
INIT_ST;
Expand All @@ -442,7 +438,6 @@ AVDRMFrameDescriptor* MythVAAPIInteropDRM::GetDRMFrameDescriptor(VASurfaceID Id)
VADRMtoPRIME(&vadesc, drmdesc);
return drmdesc;
#else
(void)Id;
return nullptr;
#endif
}
Expand Down
24 changes: 8 additions & 16 deletions mythtv/libs/libmythtv/playercontext.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,26 +230,22 @@ QString PlayerContext::GetPreviousChannel(void) const
return preChan;
}

void PlayerContext::LockPlayingInfo(const char *file, int line) const
void PlayerContext::LockPlayingInfo([[maybe_unused]] const char *file,
[[maybe_unused]] int line) const
{
#if 0
LOG(VB_GENERAL, LOG_DEBUG, QString("LockPlayingInfo(%1,%2)")
.arg(file).arg(line));
#else
Q_UNUSED(file);
Q_UNUSED(line);
#endif
m_playingInfoLock.lock();
}

void PlayerContext::UnlockPlayingInfo(const char *file, int line) const
void PlayerContext::UnlockPlayingInfo([[maybe_unused]] const char *file,
[[maybe_unused]] int line) const
{
#if 0
LOG(VB_GENERAL, LOG_DEBUG, QString("UnlockPlayingInfo(%1,%2)")
.arg(file).arg(line));
#else
Q_UNUSED(file);
Q_UNUSED(line);
#endif
m_playingInfoLock.unlock();
}
Expand All @@ -259,29 +255,25 @@ void PlayerContext::UnlockPlayingInfo(const char *file, int line) const
* used to ensure player can only be deleted after
* osd in TV() is unlocked.
*/
void PlayerContext::LockDeletePlayer(const char *file, int line) const
void PlayerContext::LockDeletePlayer([[maybe_unused]] const char *file,
[[maybe_unused]] int line) const
{
#if 0
LOG(VB_GENERAL, LOG_DEBUG, QString("LockDeletePlayer(%1,%2)")
.arg(file).arg(line));
#else
Q_UNUSED(file);
Q_UNUSED(line);
#endif
m_deletePlayerLock.lock();
}

/**
* \brief allow player to be deleted.
*/
void PlayerContext::UnlockDeletePlayer(const char *file, int line) const
void PlayerContext::UnlockDeletePlayer([[maybe_unused]] const char *file,
[[maybe_unused]] int line) const
{
#if 0
LOG(VB_GENERAL, LOG_DEBUG, QString("UnlockDeletePlayer(%1,%2)")
.arg(file).arg(line));
#else
Q_UNUSED(file);
Q_UNUSED(line);
#endif
m_deletePlayerLock.unlock();
}
Expand Down
13 changes: 4 additions & 9 deletions mythtv/libs/libmythtv/recorders/ExternalStreamHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ ExternIO::~ExternIO(void)
delete[] m_buffer;
}

bool ExternIO::Ready(int fd, std::chrono::milliseconds timeout, const QString & what)
bool ExternIO::Ready([[maybe_unused]] int fd,
[[maybe_unused]] std::chrono::milliseconds timeout,
[[maybe_unused]] const QString & what)
{
#if !defined( USING_MINGW ) && !defined( _MSC_VER )
std::array<struct pollfd,2> m_poll {};
Expand Down Expand Up @@ -100,10 +102,6 @@ bool ExternIO::Ready(int fd, std::chrono::milliseconds timeout, const QString &
m_error = "poll overflow";
return false;
}
#else
Q_UNUSED(fd);
Q_UNUSED(timeout);
Q_UNUSED(what);
#endif // !defined( USING_MINGW ) && !defined( _MSC_VER )
return false;
}
Expand Down Expand Up @@ -242,16 +240,13 @@ bool ExternIO::Run(void)
}

/* Return true if the process is not, or is no longer running */
bool ExternIO::KillIfRunning(const QString & cmd)
bool ExternIO::KillIfRunning([[maybe_unused]] const QString & cmd)
{
#if defined(Q_OS_DARWIN) || defined(__FreeBSD__) || defined(__OpenBSD__)
Q_UNUSED(cmd);
return false;
#elif defined USING_MINGW
Q_UNUSED(cmd);
return false;
#elif defined( _MSC_VER )
Q_UNUSED(cmd);
return false;
#else
QString grp = QString("pgrep -x -f -- \"%1\" 2>&1 > /dev/null").arg(cmd);
Expand Down
4 changes: 1 addition & 3 deletions mythtv/libs/libmythtv/recorders/HLS/HLSSegment.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HLSRecSegment::HLSRecSegment(int seq, std::chrono::seconds duration,
}

HLSRecSegment::HLSRecSegment(int seq, std::chrono::seconds duration, QString title,
QUrl uri, const QString& current_key_path)
QUrl uri, [[maybe_unused]] const QString& current_key_path)
: m_sequence(seq),
m_duration(duration),
m_title(std::move(title)),
Expand All @@ -38,8 +38,6 @@ HLSRecSegment::HLSRecSegment(int seq, std::chrono::seconds duration, QString tit
LOG(VB_RECORD, LOG_DEBUG, LOC + "ctor");
#ifdef USING_LIBCRYPTO
m_psz_key_path = current_key_path;
#else
Q_UNUSED(current_key_path);
#endif
}

Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/recorders/cetonrtsp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,7 @@ bool CetonRTSP::Setup(ushort clientPort1, ushort clientPort2,
m_timeout = std::chrono::seconds(params["timeout"].toInt());
}

QString transport = readParameters("Transport", params);
Q_UNUSED(transport);
// QString transport = readParameters("Transport", params);
if (params.contains("ssrc"))
{
bool ok = false;
Expand Down
10 changes: 3 additions & 7 deletions mythtv/libs/libmythtv/recorders/channelbase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,8 +361,8 @@ void ChannelBase::HandleScript(const QString &freqid)
}
}

bool ChannelBase::ChangeInternalChannel(const QString &freqid,
uint inputid) const
bool ChannelBase::ChangeInternalChannel([[maybe_unused]] const QString &freqid,
[[maybe_unused]] uint inputid) const
{
#ifdef USING_FIREWIRE
FirewireDevice *device = nullptr;
Expand Down Expand Up @@ -402,8 +402,6 @@ bool ChannelBase::ChangeInternalChannel(const QString &freqid,
device = nullptr;
return true;
#else
Q_UNUSED(freqid);
Q_UNUSED(inputid);
return false;
#endif
}
Expand Down Expand Up @@ -699,7 +697,7 @@ ChannelBase *ChannelBase::CreateChannel(
TVRec *tvrec,
const GeneralDBOptions &genOpt,
const DVBDBOptions &dvbOpt,
const FireWireDBOptions &fwOpt,
[[maybe_unused]] const FireWireDBOptions &fwOpt,
const QString &startchannel,
bool enter_power_save_mode,
QString &rbFileExt,
Expand All @@ -721,8 +719,6 @@ ChannelBase *ChannelBase::CreateChannel(
{
#ifdef USING_FIREWIRE
channel = new FirewireChannel(tvrec, genOpt.m_videoDev, fwOpt);
#else
Q_UNUSED(fwOpt);
#endif
}
#ifdef USING_HDHOMERUN
Expand Down
7 changes: 3 additions & 4 deletions mythtv/libs/libmythtv/recorders/dtvchannel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,14 @@ class DTVChannel : public ChannelBase
/// This is only called when there is no frequency set. This is used
/// to implement "Channel Numbers" in analog tuning scenarios and to
/// implement "Virtual Channels" in the OCUR and Firewire tuners.
bool Tune(const QString &freqid, int finetune) override // ChannelBase
bool Tune([[maybe_unused]] const QString &freqid,
[[maybe_unused]] int finetune) override // ChannelBase
{
(void) freqid; (void) finetune;
return false;
}

virtual bool Tune(uint64_t frequency)
virtual bool Tune([[maybe_unused]] uint64_t frequency)
{
(void) frequency;
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion mythtv/libs/libmythtv/recorders/dummychannel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DummyChannel : public ChannelBase
{
public:
explicit DummyChannel(TVRec *parent): ChannelBase(parent)
{ (void)parent; m_curChannelName.clear(); m_curInputName.clear(); }
{ m_curChannelName.clear(); m_curInputName.clear(); }
~DummyChannel(void) override = default;

bool IsTunable(const QString &/*channum*/) const override // ChannelBase
Expand Down
5 changes: 2 additions & 3 deletions mythtv/libs/libmythtv/recorders/dvbdev/dvbci.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,10 +864,9 @@ int cCiSession::SendData(int Tag, int Length, const uint8_t *Data)
return m_tc->SendData(buffer);
}

bool cCiSession::Process(int Length, const uint8_t *Data)
bool cCiSession::Process([[maybe_unused]] int Length,
[[maybe_unused]] const uint8_t *Data)
{
(void)Length;
(void)Data;
return true;
}

Expand Down
11 changes: 0 additions & 11 deletions mythtv/libs/libmythtv/recorders/firewirerecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,17 +173,6 @@ bool FirewireRecorder::ProcessTSPacket(const TSPacket &tspacket)
return true;
}

void FirewireRecorder::SetOptionsFromProfile(RecordingProfile *profile,
const QString &videodev,
const QString &audiodev,
const QString &vbidev)
{
(void)videodev;
(void)audiodev;
(void)vbidev;
(void)profile;
}

// documented in recorderbase.cpp
bool FirewireRecorder::PauseAndWait(std::chrono::milliseconds timeout)
{
Expand Down
8 changes: 4 additions & 4 deletions mythtv/libs/libmythtv/recorders/firewirerecorder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ class FirewireRecorder :
bool ProcessTSPacket(const TSPacket &tspacket) override; // DTVRecorder

// Sets
void SetOptionsFromProfile(RecordingProfile *profile,
const QString &videodev,
const QString &audiodev,
const QString &vbidev) override; // DTVRecorder
void SetOptionsFromProfile([[maybe_unused]] RecordingProfile *profile,
[[maybe_unused]] const QString &videodev,
[[maybe_unused]] const QString &audiodev,
[[maybe_unused]] const QString &vbidev) override {}; // DTVRecorder

protected:
void InitStreamData(void) override; // DTVRecorder
Expand Down
10 changes: 3 additions & 7 deletions mythtv/libs/libmythtv/recorders/importrecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,11 @@
#define LOC QString("ImportRec[%1](%2): ") \
.arg(TVREC_CARDNUM, m_videodevice)

void ImportRecorder::SetOptionsFromProfile(RecordingProfile *profile,
void ImportRecorder::SetOptionsFromProfile([[maybe_unused]] RecordingProfile *profile,
const QString &videodev,
const QString &audiodev,
const QString &vbidev)
[[maybe_unused]] const QString &audiodev,
[[maybe_unused]] const QString &vbidev)
{
(void)audiodev;
(void)vbidev;
(void)profile;

QString testVideoDev = videodev;

if (videodev.startsWith("file:", Qt::CaseInsensitive))
Expand Down
7 changes: 2 additions & 5 deletions mythtv/libs/libmythtv/recorders/mpegrecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,12 +267,9 @@ void MpegRecorder::SetOption(const QString &opt, const QString &value)

void MpegRecorder::SetOptionsFromProfile(RecordingProfile *profile,
const QString &videodev,
const QString &audiodev,
const QString &vbidev)
[[maybe_unused]] const QString &audiodev,
[[maybe_unused]] const QString &vbidev)
{
(void)audiodev;
(void)vbidev;

if (videodev.startsWith("file:", Qt::CaseInsensitive))
{
m_deviceIsMpegFile = true;
Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/recorders/recorderbase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,8 @@ bool RecorderBase::IsRecordingRequested(void)
* \param clear if true any generated timecodes should be reset.
* \sa Unpause(), WaitForPause()
*/
void RecorderBase::Pause(bool clear)
void RecorderBase::Pause([[maybe_unused]] bool clear)
{
(void) clear;
QMutexLocker locker(&m_pauseLock);
m_requestPause = true;
}
Expand Down
4 changes: 2 additions & 2 deletions mythtv/libs/libmythtv/recorders/rtp/rtppacketbuffer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ void RTPPacketBuffer::PushDataPacket(const UDPPacket &udp_packet)
}

void RTPPacketBuffer::PushFECPacket(
const UDPPacket &packet, uint fec_stream_num)
const UDPPacket &packet,
[[maybe_unused]] uint fec_stream_num)
{
(void) fec_stream_num;
// TODO IMPLEMENT
// for now just free the packet for immediate reuse
FreePacket(packet);
Expand Down
9 changes: 3 additions & 6 deletions mythtv/libs/libmythtv/recorders/signalmonitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,11 @@ extern "C" {
HDHRSignalMonitor, SignalMonitorValue
*/

SignalMonitor *SignalMonitor::Init(const QString& cardtype, int db_cardnum,
ChannelBase *channel,
SignalMonitor *SignalMonitor::Init([[maybe_unused]] const QString& cardtype,
[[maybe_unused]] int db_cardnum,
[[maybe_unused]] ChannelBase *channel,
bool release_stream)
{
(void) cardtype;
(void) db_cardnum;
(void) channel;

SignalMonitor *signalMonitor = nullptr;

if (cardtype == "GuaranteedToFail")
Expand Down
8 changes: 2 additions & 6 deletions mythtv/libs/libmythtv/recorders/streamhandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ void StreamHandler::WriteMPTS(const unsigned char * buffer, uint len)
m_mptsTfw->Write(buffer, len);
}

bool StreamHandler::AddNamedOutputFile(const QString &file)
bool StreamHandler::AddNamedOutputFile([[maybe_unused]] const QString &file)
{
#if !defined( USING_MINGW ) && !defined( _MSC_VER )
QMutexLocker lk(&m_mptsLock);
Expand Down Expand Up @@ -397,13 +397,11 @@ bool StreamHandler::AddNamedOutputFile(const QString &file)
.arg(m_mptsBaseFile, fn));
}
}
#else
Q_UNUSED(file);
#endif // !defined( USING_MINGW ) && !defined( _MSC_VER )
return true;
}

void StreamHandler::RemoveNamedOutputFile(const QString &file)
void StreamHandler::RemoveNamedOutputFile([[maybe_unused]] const QString &file)
{
#if !defined( USING_MINGW ) && !defined( _MSC_VER )
QMutexLocker lk(&m_mptsLock);
Expand All @@ -418,7 +416,5 @@ void StreamHandler::RemoveNamedOutputFile(const QString &file)
m_mptsTfw = nullptr;
}
}
#else
Q_UNUSED(file);
#endif // !defined( USING_MINGW ) && !defined( _MSC_VER )
}
7 changes: 2 additions & 5 deletions mythtv/libs/libmythtv/recorders/v4l2encrecorder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,11 @@ void V4L2encRecorder::SetStrOption(RecordingProfile *profile, const QString &nam

void V4L2encRecorder::SetOptionsFromProfile(RecordingProfile *profile,
const QString &videodev,
const QString &audiodev,
const QString &vbidev)
[[maybe_unused]] const QString &audiodev,
[[maybe_unused]] const QString &vbidev)
{
LOG(VB_GENERAL, LOG_INFO, LOC + "SetOptionsFromProfile() -- begin"); //debugging

(void)audiodev;
(void)vbidev;

SetOption("videodevice", videodev);
SetOption("vbidevice", vbidev);
SetOption("audiodevice", audiodev);
Expand Down
24 changes: 9 additions & 15 deletions mythtv/libs/libmythtv/recorders/vbitext/vbi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,11 @@ vbi_line(struct vbi *vbi, const unsigned char *p)
// called when new vbi data is waiting

void
vbi_handler(struct vbi *vbi, int fd)
vbi_handler(struct vbi *vbi, [[maybe_unused]] int fd)
{
int n = 0;
unsigned int seq = 0;

(void)fd;

n = read(vbi->fd, rawbuf, vbi->bufsize);

if (dl_empty(vbi->clients))
Expand Down Expand Up @@ -545,7 +543,7 @@ set_decode_parms(struct vbi *vbi, struct v4l2_vbi_format *p)
#endif // USING_V4L2

static int
setup_dev(struct vbi *vbi)
setup_dev([[maybe_unused]] struct vbi *vbi)
{
#ifdef USING_V4L2
struct v4l2_format v4l2_format {};
Expand Down Expand Up @@ -581,21 +579,21 @@ setup_dev(struct vbi *vbi)

return 0;
#else
(void)vbi;
return -1;
#endif // USING_V4L2
}



struct vbi *
vbi_open(const char *vbi_dev_name, struct cache *ca, int fine_tune, int big_buf)
vbi_open(const char *vbi_dev_name,
[[maybe_unused]] struct cache *ca,
int fine_tune,
int big_buf)
{
static int s_inited = 0;
struct vbi *vbi = nullptr;

(void)ca;

if (! s_inited)
lang_init();
s_inited = 1;
Expand Down Expand Up @@ -652,14 +650,13 @@ vbi_close(struct vbi *vbi)


struct vt_page *
vbi_query_page(struct vbi *vbi, int pgno, int subno)
vbi_query_page([[maybe_unused]] struct vbi *vbi,
[[maybe_unused]] int pgno,
[[maybe_unused]] int subno)
{
#ifdef IMPLEMENTED
struct vt_page *vtp = 0;

(void)pgno;
(void)subno;

if (vbi->cache)
vtp = vbi->cache->op->get(vbi->cache, pgno, subno);
if (vtp == 0)
Expand All @@ -671,9 +668,6 @@ vbi_query_page(struct vbi *vbi, int pgno, int subno)
vbi_send(vbi, EV_PAGE, 1, 0, 0, vtp);
return vtp;
#else
(void)vbi;
(void)pgno;
(void)subno;
return nullptr;
#endif
}
Expand Down
12 changes: 3 additions & 9 deletions mythtv/libs/libmythtv/recordingprofile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ class AudioCompressionSettings : public GroupSetting
{
public:
AudioCompressionSettings(const RecordingProfile &parentProfile,
V4L2util* v4l2) :
[[maybe_unused]] V4L2util* v4l2) :
m_parent(parentProfile)
{
setName(QObject::tr("Audio Quality"));
Expand Down Expand Up @@ -511,8 +511,6 @@ class AudioCompressionSettings : public GroupSetting
}
}
}
#else
Q_UNUSED(v4l2);
#endif // USING_V4L2
}

Expand Down Expand Up @@ -895,7 +893,7 @@ class VideoCompressionSettings : public GroupSetting
{
public:
VideoCompressionSettings(const RecordingProfile &parentProfile,
V4L2util* v4l2) :
[[maybe_unused]] V4L2util* v4l2) :
m_parent(parentProfile)
{
setName(QObject::tr("Video Compression"));
Expand Down Expand Up @@ -1127,8 +1125,6 @@ class VideoCompressionSettings : public GroupSetting
}
}
}
#else
Q_UNUSED(v4l2);
#endif // USING_V4L2
}

Expand Down Expand Up @@ -1486,7 +1482,7 @@ void RecordingProfile::FiltersChanged(const QString &val)
}

bool RecordingProfile::loadByType(const QString &name, const QString &card,
const QString &videodev)
[[maybe_unused]] const QString &videodev)
{
QString hostname = gCoreContext->GetHostName().toLower();
QString cardtype = card;
Expand All @@ -1499,8 +1495,6 @@ bool RecordingProfile::loadByType(const QString &name, const QString &card,
if (m_v4l2util->IsOpen())
cardtype = m_v4l2util->ProfileName();
}
#else
Q_UNUSED(videodev);
#endif

MSqlQuery result(MSqlQuery::InitCon());
Expand Down
4 changes: 1 addition & 3 deletions mythtv/libs/libmythtv/tv_rec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2780,14 +2780,12 @@ void TVRec::InitAutoRunJobs(RecordingInfo *rec, AutoRunInitType t,
* RecStatus::Cancelled, and set to -1 to base the decision of the recording
* group.
*/
void TVRec::SetLiveRecording(int recording)
void TVRec::SetLiveRecording([[maybe_unused]] int recording)
{
LOG(VB_GENERAL, LOG_INFO, LOC +
QString("SetLiveRecording(%1)").arg(recording));
QMutexLocker locker(&m_stateChangeLock);

(void) recording;

RecStatus::Type recstat = RecStatus::Cancelled;
bool was_rec = m_pseudoLiveTVRecording;
CheckForRecGroupChange();
Expand Down
5 changes: 3 additions & 2 deletions mythtv/libs/libmythtv/videoout_d3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,10 @@ bool VideoOutputD3D::CreatePauseFrame(void)
return true;
}

void VideoOutputD3D::RenderFrame(MythVideoFrame *buffer, FrameScanType t, OSD *osd)
void VideoOutputD3D::RenderFrame(MythVideoFrame *buffer,
FrameScanType t,
[[maybe_unused]] OSD *osd)
{
(void)osd;
if (IsErrored())
{
LOG(VB_GENERAL, LOG_ERR, LOC +
Expand Down
27 changes: 8 additions & 19 deletions mythtv/libs/libmythtv/videosource.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -829,11 +829,9 @@ class VideoDevice : public CaptureCardComboBoxSetting
* \param dir The directory to open and search for devices.
* \param absPath Ignored. The function always uses absolute paths.
*/
void fillSelectionsFromDir(const QDir &dir, bool absPath = true)
void fillSelectionsFromDir(const QDir &dir,
[[maybe_unused]] bool absPath = true)
{
// Needed to make both compiler and doxygen happy.
(void) absPath;

fillSelectionsFromDir(dir, 0, 255, QString(), QRegularExpression(), false);
}

Expand Down Expand Up @@ -940,11 +938,9 @@ class VBIDevice : public CaptureCardComboBoxSetting
* \param dir The directory to open and search for devices.
* \param absPath Ignored. The function always uses absolute paths.
*/
void fillSelectionsFromDir(const QDir &dir, bool absPath = true)
void fillSelectionsFromDir(const QDir &dir,
[[maybe_unused]] bool absPath = true)
{
// Needed to make both compiler and doxygen happy.
(void) absPath;

fillSelectionsFromDir(dir, QString(), QString());
}

Expand Down Expand Up @@ -1326,21 +1322,17 @@ FirewireModel::FirewireModel(const CaptureCard &parent,
setHelpText(help);
}

void FirewireModel::SetGUID(const QString &_guid)
void FirewireModel::SetGUID([[maybe_unused]] const QString &_guid)
{
(void) _guid;

#ifdef USING_FIREWIRE
AVCInfo info = m_guid->GetAVCInfo(_guid);
QString model = FirewireDevice::GetModelName(info.m_vendorid, info.m_modelid);
setValue(std::max(getValueIndex(model), 0));
#endif // USING_FIREWIRE
}

void FirewireDesc::SetGUID(const QString &_guid)
void FirewireDesc::SetGUID([[maybe_unused]] const QString &_guid)
{
(void) _guid;

setLabel(tr("Description"));

#ifdef USING_FIREWIRE
Expand Down Expand Up @@ -1909,7 +1901,7 @@ ASIConfigurationGroup::ASIConfigurationGroup(CaptureCard& a_parent,
probeCard(m_device->getValue());
};

void ASIConfigurationGroup::probeCard(const QString &device)
void ASIConfigurationGroup::probeCard([[maybe_unused]] const QString &device)
{
#ifdef USING_ASI
if (device.isEmpty())
Expand All @@ -1935,7 +1927,6 @@ void ASIConfigurationGroup::probeCard(const QString &device)
}
m_cardInfo->setValue(tr("Valid DVEO ASI card"));
#else
Q_UNUSED(device);
m_cardInfo->setValue(QString("Not compiled with ASI support"));
#endif
}
Expand Down Expand Up @@ -2471,7 +2462,7 @@ V4L2encGroup::V4L2encGroup(CaptureCard &parent, CardType& cardtype) :
probeCard(device_name);
}

void V4L2encGroup::probeCard(const QString &device_name)
void V4L2encGroup::probeCard([[maybe_unused]] const QString &device_name)
{
#ifdef USING_V4L2
QString card_name = tr("Failed to open");
Expand Down Expand Up @@ -2518,8 +2509,6 @@ void V4L2encGroup::probeCard(const QString &device_name)
m_device->addTargetedChild(m_driverName,
new ChannelTimeout(m_parent, 15s, 2s));
}
#else
Q_UNUSED(device_name);
#endif // USING_V4L2
}

Expand Down
3 changes: 1 addition & 2 deletions mythtv/libs/libmythtv/videosource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ static inline bool is_grabber_external(const QString &grabber)
grabber == "/bin/true");
}

static inline bool is_grabber_labs(const QString &grabber)
static inline bool is_grabber_labs([[maybe_unused]] const QString &grabber)
{
Q_UNUSED(grabber);
return false;
}

Expand Down
5 changes: 1 addition & 4 deletions mythtv/libs/libmythtv/visualisations/goom/filters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ getAsmUse ()
void
zoomFilterFastRGB (Uint * pix1, Uint * pix2, ZoomFilterData * zf, Uint resx, Uint resy, int switchIncr, float switchMult)
{
static unsigned char s_pertedec = 8;
[[maybe_unused]] static unsigned char s_pertedec = 8;
static char s_firstTime = 1;

static constexpr int8_t INTERLACE_INCR { 16 };
Expand Down Expand Up @@ -547,9 +547,6 @@ zoomFilterFastRGB (Uint * pix1, Uint * pix2, ZoomFilterData * zf, Uint resx, Uin
noisify = zf->noisify;
}

/* Silence a gcc warning */
(void)s_pertedec;

/** generation d'un effet **/
if (s_firstTime || zf) {

Expand Down
5 changes: 1 addition & 4 deletions mythtv/libs/libmythtv/visualisations/goom/surf3d.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,10 @@ void surf3d_draw (surf3d *s, int color, int dist, int *buf, int *back, int W,int
for (int i=0;i<s->nbvertex;i++) {
V3D_TO_V2D(s->svertex[i],v2,W,H,dist);
int *p1 = buf + v2.x + (v2.y*static_cast<ptrdiff_t>(W));
int *p2 = back + v2.x + (v2.y*static_cast<ptrdiff_t>(W));
[[maybe_unused]] int *p2 = back + v2.x + (v2.y*static_cast<ptrdiff_t>(W));
if ((v2.x>=0) && (v2.y>=0) && (v2.x<W) && (v2.y<H)) {
*p1 = color;
}

/* Squelch a gcc warning */
(void)p2;
}
}

Expand Down
21 changes: 8 additions & 13 deletions mythtv/libs/libmythtv/visualisations/goom/zoom_filter_mmx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,15 @@ int zoom_filter_mmx_supported () {
return 0;
}

void zoom_filter_mmx (int prevX, int prevY,
const unsigned int *expix1, unsigned int *expix2,
const int *brutS, const int *brutD, int buffratio,
const GoomCoefficients &precalCoef)
void zoom_filter_mmx ([[maybe_unused]] int prevX,
[[maybe_unused]] int prevY,
[[maybe_unused]] const unsigned int *expix1,
[[maybe_unused]] unsigned int *expix2,
[[maybe_unused]] const int *brutS,
[[maybe_unused]] const int *brutD,
[[maybe_unused]] int buffratio,
[[maybe_unused]] const GoomCoefficients &precalCoef)
{
(void)prevX;
(void)prevY;
(void)expix1;
(void)expix2;
(void)brutS;
(void)brutD;
(void)buffratio;
(void)precalCoef;
return;
}

#endif
Expand Down
16 changes: 8 additions & 8 deletions mythtv/libs/libmythtv/visualisations/goom/zoom_filter_xmmx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,14 @@ void zoom_filter_xmmx (int prevX, int prevY,
int zoom_filter_xmmx_supported () {
return 0;
}
void zoom_filter_xmmx (int prevX, int prevY,
unsigned int *expix1, unsigned int *expix2,//NOLINT(readability-non-const-parameter)
const int *brutS, const int *brutD, int buffratio,
GoomCoefficients& precalCoef)
void zoom_filter_xmmx ([[maybe_unused]] int prevX,
[[maybe_unused]] int prevY,
[[maybe_unused]] unsigned int *expix1,
[[maybe_unused]] unsigned int *expix2,
[[maybe_unused]] const int *brutS,
[[maybe_unused]] const int *brutD,
[[maybe_unused]] int buffratio,
[[maybe_unused]] GoomCoefficients& precalCoef)
{
(void) prevX; (void) prevY;
(void) expix1; (void) expix2;
(void) brutS; (void) brutD;
(void) buffratio; (void) precalCoef;
}
#endif
10 changes: 3 additions & 7 deletions mythtv/libs/libmythtv/vulkan/mythvideotexturevulkan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,12 @@ void MythVideoTextureVulkan::DeleteTexture(MythVulkanObject* Vulkan,
}

std::vector<MythVideoTextureVulkan*>
MythVideoTextureVulkan::CreateSoftwareTextures(MythVulkanObject* Vulkan,
VkCommandBuffer CommandBuffer,
VideoFrameType Type,
MythVideoTextureVulkan::CreateSoftwareTextures([[maybe_unused]] MythVulkanObject* Vulkan,
[[maybe_unused]] VkCommandBuffer CommandBuffer,
[[maybe_unused]] VideoFrameType Type,
VideoFrameType Format,
QSize Size)
{
(void)Vulkan;
(void)CommandBuffer;
(void)Type;

std::vector<MythVideoTextureVulkan*> result;

uint count = MythVideoFrame::GetNumPlanes(Format);
Expand Down