Merged revision(s) 24070 from branches/OpenMPT-1.31/libopenmpt/in_openmpt:

Merged revision(s) 24069 from branches/OpenMPT-1.32:
Merged revision(s) 24068 from trunk/OpenMPT:
[Fix] in_openmpt: Compile fix for GCC < 9.
........
........
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.30@24071 56274372-70c3-4bfc-bfc3-4c3a0b034d27

Author: manxorist

libopenmpt/in_openmpt.cpp

@@ -108,6 +108,12 @@ static const char * in_openmpt_string = "in_openmpt " OPENMPT_API_VERSION_STRING
 
 #define SHORT_TITLE "in_openmpt"
 
+#if defined(__GNUC__) && !defined(__clang__)
+#if (__GNUC__ < 9)
+#define MPT_IN_OPENMPT_FSTREAM_NO_WCHAR
+#endif
+#endif
+
 static void apply_options();
 
 static std::string StringEncode( const std::wstring &src, UINT codepage )
@@ -309,7 +315,11 @@ static int play( const in_char * fn ) {
 		return -1;
 	}
 	try {
+#if defined(UNICODE_INPUT_PLUGIN) && defined(MPT_IN_OPENMPT_FSTREAM_NO_WCHAR)
+		std::ifstream s( StringEncode( StringFromWinamp( fn ), CP_ACP ).c_str(), std::ios::binary );
+#else
 		std::ifstream s( fn, std::ios::binary );
+#endif
 		std::map< std::string, std::string > ctls;
 		ctls["seek.sync_samples"] = "1";
 		self->mod = new openmpt::module( s, std::clog, ctls );
@@ -391,7 +401,11 @@ static void setpan( int pan ) {
 static int infobox( const in_char * fn, HWND hWndParent ) {
 	if ( fn && fn[0] != '\0' && self->cached_filename != std::basic_string<TCHAR>(fn) ) {
 		try {
+#if defined(UNICODE_INPUT_PLUGIN) && defined(MPT_IN_OPENMPT_FSTREAM_NO_WCHAR)
+			std::ifstream s( StringEncode( StringFromWinamp( fn ), CP_ACP ).c_str(), std::ios::binary );
+#else
 			std::ifstream s( fn, std::ios::binary );
+#endif
 			openmpt::module mod( s );
 #if 1
 			libopenmpt::plugin::gui_show_file_info( hWndParent, TEXT(SHORT_TITLE), StringReplace( generate_infotext( fn, mod ), TEXT("\n"), TEXT("\r\n") ) );
@@ -425,7 +439,11 @@ static void getfileinfo( const in_char * filename, in_char * title, int * length
 		}
 	} else {
 		try {
+#if defined(UNICODE_INPUT_PLUGIN) && defined(MPT_IN_OPENMPT_FSTREAM_NO_WCHAR)
+			std::ifstream s( StringEncode( StringFromWinamp( filename ), CP_ACP ).c_str(), std::ios::binary );
+#else
 			std::ifstream s( filename, std::ios::binary );
+#endif
 			openmpt::module mod( s );
 			if ( length_in_ms ) {
 				*length_in_ms = static_cast<int>( mod.get_duration_seconds() * 1000.0 );