Index: webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc |
diff --git a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc |
index b8c19a28afe2fde7bfb86aabb186805cb5eaafb2..bdbccde05012ec35cd71048008e5a0182216fa57 100644 |
--- a/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc |
+++ b/webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc |
@@ -207,7 +207,7 @@ int32_t AudioDeviceLinuxALSA::Terminate() |
// RECORDING |
if (_ptrThreadRec) |
{ |
- PlatformThread* tmpThread = _ptrThreadRec.release(); |
+ rtc::PlatformThread* tmpThread = _ptrThreadRec.release(); |
_critSect.Leave(); |
tmpThread->Stop(); |
@@ -219,7 +219,7 @@ int32_t AudioDeviceLinuxALSA::Terminate() |
// PLAYOUT |
if (_ptrThreadPlay) |
{ |
- PlatformThread* tmpThread = _ptrThreadPlay.release(); |
+ rtc::PlatformThread* tmpThread = _ptrThreadPlay.release(); |
_critSect.Leave(); |
tmpThread->Stop(); |
@@ -1363,21 +1363,11 @@ int32_t AudioDeviceLinuxALSA::StartRecording() |
return -1; |
} |
// RECORDING |
- const char* threadName = "webrtc_audio_module_capture_thread"; |
- _ptrThreadRec = |
- PlatformThread::CreateThread(RecThreadFunc, this, threadName); |
+ _ptrThreadRec.reset(new rtc::PlatformThread( |
+ RecThreadFunc, this, "webrtc_audio_module_capture_thread")); |
- if (!_ptrThreadRec->Start()) |
- { |
- WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id, |
- " failed to start the rec audio thread"); |
- _recording = false; |
- _ptrThreadRec.reset(); |
- delete [] _recordingBuffer; |
- _recordingBuffer = NULL; |
- return -1; |
- } |
- _ptrThreadRec->SetPriority(kRealtimePriority); |
+ _ptrThreadRec->Start(); |
+ _ptrThreadRec->SetPriority(rtc::kRealtimePriority); |
errVal = LATE(snd_pcm_prepare)(_handleRecord); |
if (errVal < 0) |
@@ -1517,20 +1507,10 @@ int32_t AudioDeviceLinuxALSA::StartPlayout() |
} |
// PLAYOUT |
- const char* threadName = "webrtc_audio_module_play_thread"; |
- _ptrThreadPlay = |
- PlatformThread::CreateThread(PlayThreadFunc, this, threadName); |
- if (!_ptrThreadPlay->Start()) |
- { |
- WEBRTC_TRACE(kTraceCritical, kTraceAudioDevice, _id, |
- " failed to start the play audio thread"); |
- _playing = false; |
- _ptrThreadPlay.reset(); |
- delete [] _playoutBuffer; |
- _playoutBuffer = NULL; |
- return -1; |
- } |
- _ptrThreadPlay->SetPriority(kRealtimePriority); |
+ _ptrThreadPlay.reset(new rtc::PlatformThread( |
+ PlayThreadFunc, this, "webrtc_audio_module_play_thread")); |
+ _ptrThreadPlay->Start(); |
+ _ptrThreadPlay->SetPriority(rtc::kRealtimePriority); |
int errVal = LATE(snd_pcm_prepare)(_handlePlayout); |
if (errVal < 0) |