From db5e1f2c8c7d887c12bd1c73b707096772eca003 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 19 Aug 2023 00:44:43 +0200 Subject: [PATCH] Fix check for presence of frame field in Xing header --- mpegaudio/mpegaudioframe.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mpegaudio/mpegaudioframe.h b/mpegaudio/mpegaudioframe.h index 0f032f4..7f95a0d 100644 --- a/mpegaudio/mpegaudioframe.h +++ b/mpegaudio/mpegaudioframe.h @@ -174,7 +174,7 @@ constexpr XingHeaderFlags MpegAudioFrame::xingHeaderFlags() const */ constexpr bool MpegAudioFrame::isXingFramefieldPresent() const { - return (isXingHeaderAvailable()) ? ((m_xingHeaderFlags & XingHeaderFlags::HasFramesField) == XingHeaderFlags::HasFramesField) : false; + return isXingHeaderAvailable() && ((m_xingHeaderFlags & XingHeaderFlags::HasFramesField) == XingHeaderFlags::HasFramesField); } /*! @@ -182,7 +182,7 @@ constexpr bool MpegAudioFrame::isXingFramefieldPresent() const */ constexpr bool MpegAudioFrame::isXingBytesfieldPresent() const { - return (isXingHeaderAvailable()) ? ((m_xingHeaderFlags & XingHeaderFlags::HasFramesField) == XingHeaderFlags::HasFramesField) : false; + return isXingHeaderAvailable() && ((m_xingHeaderFlags & XingHeaderFlags::HasBytesField) == XingHeaderFlags::HasBytesField); } /*! @@ -190,7 +190,7 @@ constexpr bool MpegAudioFrame::isXingBytesfieldPresent() const */ constexpr bool MpegAudioFrame::isXingTocFieldPresent() const { - return (isXingHeaderAvailable()) ? ((m_xingHeaderFlags & XingHeaderFlags::HasTocField) == XingHeaderFlags::HasTocField) : false; + return isXingHeaderAvailable() && ((m_xingHeaderFlags & XingHeaderFlags::HasTocField) == XingHeaderFlags::HasTocField); } /*! @@ -198,7 +198,7 @@ constexpr bool MpegAudioFrame::isXingTocFieldPresent() const */ constexpr bool MpegAudioFrame::isXingQualityIndicatorFieldPresent() const { - return (isXingHeaderAvailable()) ? ((m_xingHeaderFlags & XingHeaderFlags::HasQualityIndicator) == XingHeaderFlags::HasQualityIndicator) : false; + return isXingHeaderAvailable() && ((m_xingHeaderFlags & XingHeaderFlags::HasQualityIndicator) == XingHeaderFlags::HasQualityIndicator); } /*!