diff options
Diffstat (limited to 'webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc')
-rw-r--r-- | webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc | 40 |
1 files changed, 10 insertions, 30 deletions
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 8fa4fdf6f0..bdbccde050 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) { - ThreadWrapper* tmpThread = _ptrThreadRec.release(); + rtc::PlatformThread* tmpThread = _ptrThreadRec.release(); _critSect.Leave(); tmpThread->Stop(); @@ -219,7 +219,7 @@ int32_t AudioDeviceLinuxALSA::Terminate() // PLAYOUT if (_ptrThreadPlay) { - ThreadWrapper* 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 = ThreadWrapper::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 = ThreadWrapper::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) |