Merged revision(s) 21753 from trunk/OpenMPT:

[Ref] openmpt123: Cleanup libsndfile text encoding. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21754 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Sep 26, 2024 · e414805 · e414805
1 parent 484ce62
commit e414805
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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<std::string>( mpt::common_encoding::utf8, extension ) == format_info.extension ) {
+						if ( mpt::transcode<std::string>( 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<std::string>( mpt::common_encoding::utf8, extension ) == format_info.extension ) {
+						if ( mpt::transcode<std::string>( 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<std::string>( mpt::common_encoding::utf8, extension ) == format_info.extension ) {
+						if ( mpt::transcode<std::string>( sndfile_encoding, extension ) == format_info.extension ) {
 							return matched_result( format, format_info, subformat_info, match_mode );
 						}
 						break;