TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-09 20:41:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: potential macro clash on Windows

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2024-05-14 17:58:53 +02:00
parent 7c5db2a994
commit 70e64a1b40
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dwarfs/categorizer/pcmaudio_categorizer.cpp
View File

@ -927,8 +927,8 @@ bool pcmaudio_categorizer_<LoggerPolicy>::check_wav_like(
static_assert(sizeof(file_hdr_t) == FormatPolicy::file_header_size); static_assert(sizeof(file_hdr_t) == FormatPolicy::file_header_size);
static_assert(sizeof(chunk_hdr_t) == FormatPolicy::chunk_header_size); static_assert(sizeof(chunk_hdr_t) == FormatPolicy::chunk_header_size);
static constexpr uint16_t const WAVE_FORMAT_PCM{0x0001}; static constexpr uint16_t const DWARFS_WAVE_FORMAT_PCM{0x0001};
static constexpr uint16_t const WAVE_FORMAT_EXTENSIBLE{0xFFFE}; static constexpr uint16_t const DWARFS_WAVE_FORMAT_EXTENSIBLE{0xFFFE};
iff_parser<LoggerPolicy, WavChunkPolicy<FormatPolicy>, chunk_hdr_t> parser( iff_parser<LoggerPolicy, WavChunkPolicy<FormatPolicy>, chunk_hdr_t> parser(
LOG_GET_LOGGER, path, data, sizeof(file_hdr_t)); LOG_GET_LOGGER, path, data, sizeof(file_hdr_t));
@ -988,9 +988,10 @@ bool pcmaudio_categorizer_<LoggerPolicy>::check_wav_like(
fmt.sub_format_code = 0; fmt.sub_format_code = 0;
} }
if (!(fmt.format_code == WAVE_FORMAT_PCM || if (!(fmt.format_code == DWARFS_WAVE_FORMAT_PCM ||
(fmt.format_code == WAVE_FORMAT_EXTENSIBLE && chunk->size() == 40 && (fmt.format_code == DWARFS_WAVE_FORMAT_EXTENSIBLE &&
fmt.sub_format_code == WAVE_FORMAT_PCM))) { chunk->size() == 40 &&
fmt.sub_format_code == DWARFS_WAVE_FORMAT_PCM))) {
LOG_WARN << "[" << FormatPolicy::format_name << "] " << path LOG_WARN << "[" << FormatPolicy::format_name << "] " << path
<< ": unsupported format: " << fmt.format_code << "/" << ": unsupported format: " << fmt.format_code << "/"
<< fmt.sub_format_code; << fmt.sub_format_code;