diff options
| author | David Skoland <davidskoland@gmail.com> | 2017-06-11 10:31:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 10:31:55 +0200 |
| commit | a8104c9ef2ef4cf6f92caf32fd52d727a74576c2 (patch) | |
| tree | 5223fbfceb5b90e5e2f848570f0bae74940e1a82 | |
| parent | a91206d87bb5a4b30b191aca9867b65e7890fc1a (diff) | |
| parent | 69bc8e86eafbd1bc2bd850b257a46a355d8fcc6a (diff) | |
Merge pull request #6 from oldmud0/bass-unicode
Unicode support for BASS
| -rw-r--r-- | aoblipplayer.cpp | 2 | ||||
| -rw-r--r-- | aomusicplayer.cpp | 2 | ||||
| -rw-r--r-- | aosfxplayer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp index 9c6a0b11..f2124533 100644 --- a/aoblipplayer.cpp +++ b/aoblipplayer.cpp @@ -18,7 +18,7 @@ void AOBlipPlayer::set_blips(QString p_sfx) { BASS_StreamFree(m_stream_list[n_stream]); - m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.toStdString().c_str(), 0, 0, 0); + m_stream_list[n_stream] = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_UNICODE | BASS_ASYNCFILE); } set_volume(m_volume); diff --git a/aomusicplayer.cpp b/aomusicplayer.cpp index 4d0a0931..a9a9baf1 100644 --- a/aomusicplayer.cpp +++ b/aomusicplayer.cpp @@ -21,7 +21,7 @@ void AOMusicPlayer::play(QString p_song) QString f_path = ao_app->get_music_path(p_song); - m_stream = BASS_StreamCreateFile(FALSE, f_path.toStdString().c_str(), 0, 0, BASS_STREAM_AUTOFREE); + m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE); this->set_volume(m_volume); diff --git a/aosfxplayer.cpp b/aosfxplayer.cpp index b783616d..6ad59bae 100644 --- a/aosfxplayer.cpp +++ b/aosfxplayer.cpp @@ -23,7 +23,7 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char) else f_path = ao_app->get_sounds_path() + p_sfx; - m_stream = BASS_StreamCreateFile(FALSE, f_path.toStdString().c_str(), 0, 0, BASS_STREAM_AUTOFREE); + m_stream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, BASS_STREAM_AUTOFREE | BASS_UNICODE | BASS_ASYNCFILE); set_volume(m_volume); |