Improve STK rawwave path encoding handling

Still incomplete on Windows due to an upstream issue
LMMS · Jun 4, 2018 · e162527 · e162527
1 parent 0c794b5
commit e162527
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
@@ -620,7 +620,12 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	{
 		Stk::setSampleRate( _sample_rate );
 		Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
-						.toLatin1().constData() );
+#ifdef LMMS_BUILD_WIN32
+						.toLocal8Bit().constData() );
+#else
+						.toUtf8().constData() );
+#endif
+
 #ifndef LMMS_DEBUG
 		Stk::showWarnings( false );
 #endif
@@ -670,7 +675,12 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	{
 		Stk::setSampleRate( _sample_rate );
 		Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
-						.toLatin1().constData() );
+#ifdef LMMS_BUILD_WIN32
+						.toLocal8Bit().constData() );
+#else
+						.toUtf8().constData() );
+#endif
+
 #ifndef LMMS_DEBUG
 		Stk::showWarnings( false );
 #endif
@@ -718,7 +728,12 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	{
 		Stk::setSampleRate( _sample_rate );
 		Stk::setRawwavePath( QDir( ConfigManager::inst()->stkDir() ).absolutePath()
-						.toLatin1().constData() );
+#ifdef LMMS_BUILD_WIN32
+						.toLocal8Bit().constData() );
+#else
+						.toUtf8().constData() );
+#endif
+
 #ifndef LMMS_DEBUG
 		Stk::showWarnings( false );
 #endif