Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: webrtc/examples/peerconnection/client/conductor.cc

Issue 1715883002: Remove DeviceManager and DeviceInfo. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: address comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/examples/peerconnection/client/conductor.cc
diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc
index 2facf94585740bc9f84034f738798584fe3b8e64..ee230977fc6bde51c666d9b27b4970cbfa08ace1 100644
--- a/webrtc/examples/peerconnection/client/conductor.cc
+++ b/webrtc/examples/peerconnection/client/conductor.cc
@@ -19,7 +19,6 @@
#include "webrtc/base/json.h"
#include "webrtc/base/logging.h"
#include "webrtc/examples/peerconnection/client/defaults.h"
-#include "webrtc/media/devices/devicemanager.h"
// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";
@@ -369,25 +368,7 @@ void Conductor::ConnectToPeer(int peer_id) {
}
cricket::VideoCapturer* Conductor::OpenVideoCaptureDevice() {
- rtc::scoped_ptr<cricket::DeviceManagerInterface> dev_manager(
- cricket::DeviceManagerFactory::Create());
- if (!dev_manager->Init()) {
- LOG(LS_ERROR) << "Can't create device manager";
- return NULL;
- }
- std::vector<cricket::Device> devs;
- if (!dev_manager->GetVideoCaptureDevices(&devs)) {
- LOG(LS_ERROR) << "Can't enumerate video devices";
- return NULL;
- }
- std::vector<cricket::Device>::iterator dev_it = devs.begin();
- cricket::VideoCapturer* capturer = NULL;
- for (; dev_it != devs.end(); ++dev_it) {
- capturer = dev_manager->CreateVideoCapturer(*dev_it);
- if (capturer != NULL)
- break;
- }
- return capturer;
+ return nullptr;
}
void Conductor::AddStreams() {

Powered by Google App Engine
This is Rietveld 408576698