generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 66299810-> 66301332

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6063 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-05-06 17:28:28 +00:00
parent 0b53bd29af
commit e65c9a6e67
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
talk/media/devices/devicemanager.cc
View File

@ -39,6 +39,8 @@
#include "talk/media/devices/filevideocapturer.h"
#include "talk/media/devices/yuvframescapturer.h"
#if !defined(IOS)
#if defined(HAVE_WEBRTC_VIDEO)
#include "talk/media/webrtc/webrtcvideocapturer.h"
#endif
@ -49,6 +51,8 @@
#endif
#endif
namespace {
bool StringMatchWithWildcard(
@ -97,7 +101,7 @@ DeviceManager::~DeviceManager() {
bool DeviceManager::Init() {
if (!initialized()) {
if (!watcher()->Start()) {
if (watcher() && !watcher()->Start()) {
return false;
}
set_initialized(true);
@ -107,7 +111,9 @@ bool DeviceManager::Init() {
void DeviceManager::Terminate() {
if (initialized()) {
watcher()->Stop();
if (watcher()) {
watcher()->Stop();
}
set_initialized(false);
}
}