oal: fix crash if load failed

zjun522 · Jun 11, 2016 · 3ace8ab · 3ace8ab
1 parent 2b25d08
commit 3ace8ab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/contrib/capi b/contrib/capi
diff --git a/src/capi/openal_api.h b/src/capi/openal_api.h
@@ -47,6 +47,7 @@ namespace openal {
 #ifndef CAPI_LINK_OPENAL
 using namespace capi; // original header is in namespace capi, types are changed
 #endif // CAPI_LINK_OPENAL
+namespace capi { bool loaded();} // For link or NS style. Or load test for class style. api.loaded for class style.
 class api_dll;
 class api
 {

diff --git a/src/output/audio/AudioOutputOpenAL.cpp b/src/output/audio/AudioOutputOpenAL.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
-    QtAV:  Media play library based on Qt and FFmpeg
+    QtAV:  Multimedia framework based on Qt and FFmpeg
     Copyright (C) 2012-2016 Wang Bin <[email protected]>
     
 *   This file is part of QtAV
@@ -222,6 +222,12 @@ AudioOutputOpenAL::AudioOutputOpenAL(QObject *parent)
     , format_al(AL_FORMAT_STEREO16)
     , state(0)
 {
+#if QTAV_HAVE(CAPI)
+    if (!openal::capi::loaded()) {
+        available = false;
+        return;
+    }
+#endif
     //setDeviceFeatures(AudioOutput::SetVolume);
     // ensure we have a context to check format support
     // TODO: AudioOutput::getDevices() => ao.setDevice() => ao.open
+10 −4		capi.h
+2 −1		test/zlib/zlib_api.h
+2 −1		test/zlib/zlib_api_test.cpp