- android audio subsystem - initial implementation with oboe library
This commit is contained in:
parent
4aae4c36e8
commit
cb9c2b693e
|
|
@ -87,7 +87,10 @@ if (CMAKE_SYSTEM MATCHES "Darwin*")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (CMAKE_SYSTEM MATCHES "Android")
|
if (CMAKE_SYSTEM MATCHES "Android")
|
||||||
find_package (oboe REQUIRED CONFIG)
|
message("Adding the Oboe library")
|
||||||
|
set (OBOE_DIR libs/oboe)
|
||||||
|
add_subdirectory (${OBOE_DIR} ./oboe)
|
||||||
|
include_directories (${OBOE_DIR}/include)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (USE_AQUA_LIB)
|
if (USE_AQUA_LIB)
|
||||||
|
|
@ -212,7 +215,7 @@ target_link_libraries(rtphone
|
||||||
uuid
|
uuid
|
||||||
${OPENSSL_SSL}
|
${OPENSSL_SSL}
|
||||||
${OPENSSL_CRYPTO}
|
${OPENSSL_CRYPTO}
|
||||||
${LIBS} oboe::oboe)
|
${LIBS} oboe)
|
||||||
|
|
||||||
|
|
||||||
target_include_directories(rtphone
|
target_include_directories(rtphone
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
|
|
||||||
namespace Audio
|
namespace Audio
|
||||||
{
|
{
|
||||||
|
|
||||||
class AndroidEnumerator: public Enumerator
|
class AndroidEnumerator: public Enumerator
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,8 @@ OsEngine* OsEngine::instance()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TARGET_ANDROID
|
#ifdef TARGET_ANDROID
|
||||||
return &OpenSLEngine::instance();
|
return nullptr; // As we use Oboe library for now
|
||||||
|
//return &OpenSLEngine::instance();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue