From 8cde60b1bb4ae36962e8b9b962540785748eb1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Thu, 26 Sep 2024 07:47:09 +0000 Subject: [PATCH] [Ref] openmpt123: Cleanup libsndfile text encoding. git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@21753 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- openmpt123/openmpt123_sndfile.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openmpt123/openmpt123_sndfile.hpp b/openmpt123/openmpt123_sndfile.hpp index 550c83d497..d4efb31fc5 100644 --- a/openmpt123/openmpt123_sndfile.hpp +++ b/openmpt123/openmpt123_sndfile.hpp @@ -117,7 +117,7 @@ class sndfile_stream_raii : public file_audio_stream_base { case match_recurse: break; case match_exact: - if ( mpt::transcode( mpt::common_encoding::utf8, extension ) == format_info.extension ) { + if ( mpt::transcode( sndfile_encoding, extension ) == format_info.extension ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format == SF_FORMAT_PCM_16 ) ) { @@ -126,7 +126,7 @@ class sndfile_stream_raii : public file_audio_stream_base { } break; case match_better: - if ( mpt::transcode( mpt::common_encoding::utf8, extension ) == format_info.extension ) { + if ( mpt::transcode( sndfile_encoding, extension ) == format_info.extension ) { if ( flags.use_float && ( subformat_info.format == SF_FORMAT_FLOAT || subformat_info.format == SF_FORMAT_DOUBLE ) ) { return matched_result( format, format_info, subformat_info, match_mode ); } else if ( !flags.use_float && ( subformat_info.format & ( subformat_info.format == SF_FORMAT_PCM_16 || subformat_info.format == SF_FORMAT_PCM_24 || subformat_info.format == SF_FORMAT_PCM_32 ) ) ) { @@ -135,7 +135,7 @@ class sndfile_stream_raii : public file_audio_stream_base { } break; case match_any: - if ( mpt::transcode( mpt::common_encoding::utf8, extension ) == format_info.extension ) { + if ( mpt::transcode( sndfile_encoding, extension ) == format_info.extension ) { return matched_result( format, format_info, subformat_info, match_mode ); } break;