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

(Auto)update libjingle 66322380-> 66326258

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6067 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org 2014-05-06 22:11:02 +00:00
parent 3129e684a3
commit 861d4b0de9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,6 @@
#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
@ -51,8 +49,6 @@
#endif
#endif
namespace {
bool StringMatchWithWildcard(
@ -101,7 +97,7 @@ DeviceManager::~DeviceManager() {
bool DeviceManager::Init() {
if (!initialized()) {
if (watcher() && !watcher()->Start()) {
if (!watcher()->Start()) {
return false;
}
set_initialized(true);
@ -111,9 +107,7 @@ bool DeviceManager::Init() {
void DeviceManager::Terminate() {
if (initialized()) {
if (watcher()) {
watcher()->Stop();
}
watcher()->Stop();
set_initialized(false);
}
}