liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5840 from ya-isakov/dev

Browse Source 
Make libcanberra optional
This commit is contained in:
Floessie 2020-08-16 15:05:45 +02:00 committed by GitHub
commit d5af712497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -493,7 +493,11 @@ endif()
# Check for libcanberra-gtk3 (sound events on Linux): # Check for libcanberra-gtk3 (sound events on Linux):
if(UNIX AND (NOT APPLE)) if(UNIX AND (NOT APPLE))
pkg_check_modules(CANBERRA-GTK REQUIRED libcanberra-gtk3) option(USE_LIBCANBERRA "Build with libcanberra" ON)
if(USE_LIBCANBERRA)
pkg_check_modules(CANBERRA-GTK REQUIRED libcanberra-gtk3)
add_definitions(-DUSE_CANBERRA)
endif()
endif() endif()
if(WITH_MYFILE_MMAP) if(WITH_MYFILE_MMAP)

4
rtgui/soundman.cc
View File

@ -26,7 +26,7 @@
#include <mmsystem.h> #include <mmsystem.h>
#endif #endif
#ifdef __linux__ #if defined(__linux__) && defined(USE_CANBERRA)
#include <canberra-gtk.h> #include <canberra-gtk.h>
#endif #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); wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
PlaySoundW(wfilename, NULL, sndParam); PlaySoundW(wfilename, NULL, sndParam);
g_free( wfilename ); 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); ca_context_play(ca_gtk_context_get(), 0, CA_PROP_EVENT_ID, sound.c_str(), CA_PROP_MEDIA_FILENAME, sound.c_str(), NULL);
#endif #endif
} }