| Index: webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
|
| diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
|
| index 1052f86143d006e1a42db225dca6d4e3f9a3b045..549f6e9e8320441ca79b6fd68079e88c15c031dc 100644
|
| --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
|
| +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc
|
| @@ -10,7 +10,7 @@
|
|
|
| #include "webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h"
|
|
|
| -#include "webrtc/system_wrappers/include/trace.h"
|
| +#include "webrtc/rtc_base/logging.h"
|
|
|
| #ifdef WEBRTC_LINUX
|
| #include <dlfcn.h>
|
| @@ -39,8 +39,7 @@ DllHandle InternalLoadDll(const char dll_name[]) {
|
| #error Not implemented
|
| #endif
|
| if (handle == kInvalidDllHandle) {
|
| - WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, -1,
|
| - "Can't load %s : %s", dll_name, GetDllError());
|
| + LOG(LS_WARNING) << "Can't load " << dll_name << " : " << GetDllError();
|
| }
|
| return handle;
|
| }
|
| @@ -56,8 +55,7 @@ void InternalUnloadDll(DllHandle handle) {
|
| // https://code.google.com/p/address-sanitizer/issues/detail?id=89
|
| #if !defined(ADDRESS_SANITIZER)
|
| if (dlclose(handle) != 0) {
|
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
|
| - "%s", GetDllError());
|
| + LOG(LS_ERROR) << GetDllError();
|
| }
|
| #endif // !defined(ADDRESS_SANITIZER)
|
| #else
|
| @@ -72,12 +70,10 @@ static bool LoadSymbol(DllHandle handle,
|
| *symbol = dlsym(handle, symbol_name);
|
| char *err = dlerror();
|
| if (err) {
|
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
|
| - "Error loading symbol %s : %d", symbol_name, err);
|
| + LOG(LS_ERROR) << "Error loading symbol " << symbol_name << " : " << err;
|
| return false;
|
| } else if (!*symbol) {
|
| - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1,
|
| - "Symbol %s is NULL", symbol_name);
|
| + LOG(LS_ERROR) << "Symbol " << symbol_name << " is NULL";
|
| return false;
|
| }
|
| return true;
|
|
|