Merge pull request #5840 from ya-isakov/dev

Make libcanberra optional
2020-08-16 15:05:45 +02:00
parent 4888cb76f2 70c052cc76
commit d5af712497
2 changed files with 7 additions and 3 deletions
--- a/rtgui/soundman.cc
+++ b/rtgui/soundman.cc
@@ -26,7 +26,7 @@
 #include <mmsystem.h>
 #endif

-#ifdef __linux__
+#if defined(__linux__) && defined(USE_CANBERRA)
 #include <canberra-gtk.h>
 #endif

@@ -67,7 +67,7 @@ void SoundManager::playSoundAsync(const Glib::ustring &sound)
    wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
    PlaySoundW(wfilename, NULL, sndParam);
    g_free( wfilename );
-#elif defined(__linux__)
+#elif defined(__linux__) && defined(USE_CANBERRA)
    ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL);
 #endif
 }