mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use mediastreamdevicescontroller from brightray to enumerate available devices

Browse source
This commit is contained in:
Robo 2016-02-01 17:45:53 +05:30
parent b575cd0ef9
commit ff5fb512b8
2 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_session.cc
View file

@ -400,7 +400,7 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
} }
void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val, void Session::SetPermissionRequestHandler(v8::Local<v8::Value> val,
mate::Arguments* args) { mate::Arguments* args) {
AtomPermissionManager::RequestHandler handler; AtomPermissionManager::RequestHandler handler;
if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &handler))) { if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &handler))) {
args->ThrowError("Must pass null or function"); args->ThrowError("Must pass null or function");

50
atom/browser/web_contents_permission_helper.cc
View file

@ -7,8 +7,8 @@
#include <string> #include <string>
#include "atom/browser/atom_permission_manager.h" #include "atom/browser/atom_permission_manager.h"
#include "brightray/browser/media/media_stream_devices_controller.h"
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/media_capture_devices.h"
#include "content/public/browser/render_process_host.h" #include "content/public/browser/render_process_host.h"
DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPermissionHelper); DEFINE_WEB_CONTENTS_USER_DATA_KEY(atom::WebContentsPermissionHelper);
@ -17,53 +17,15 @@ namespace atom {
namespace { namespace {
const content::MediaStreamDevice* FindDeviceWithId(
const content::MediaStreamDevices& devices,
const std::string& device_id) {
if (device_id.empty())
return &(*devices.begin());
for (const auto& iter : devices)
if (iter.id == device_id)
return &(iter);
return nullptr;
}
void MediaAccessAllowed( void MediaAccessAllowed(
const content::MediaStreamRequest& request, const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback, const content::MediaResponseCallback& callback,
bool allowed) { bool allowed) {
if (!allowed) { brightray::MediaStreamDevicesController controller(request, callback);
callback.Run(content::MediaStreamDevices(), if (allowed)
content::MEDIA_DEVICE_PERMISSION_DENIED, controller.Accept();
scoped_ptr<content::MediaStreamUI>()); else
return; controller.Deny(content::MEDIA_DEVICE_PERMISSION_DENIED);
}
content::MediaStreamDevices devices;
content::MediaStreamRequestResult result = content::MEDIA_DEVICE_NO_HARDWARE;
if (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
const content::MediaStreamDevices& audio_devices =
content::MediaCaptureDevices::GetInstance()->GetAudioCaptureDevices();
const content::MediaStreamDevice* audio_device =
FindDeviceWithId(audio_devices, request.requested_audio_device_id);
if (audio_device)
devices.push_back(*audio_device);
}
if (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE) {
const content::MediaStreamDevices& video_devices =
content::MediaCaptureDevices::GetInstance()->GetVideoCaptureDevices();
const content::MediaStreamDevice* video_device =
FindDeviceWithId(video_devices, request.requested_video_device_id);
if (video_device)
devices.push_back(*video_device);
}
if (!devices.empty())
result = content::MEDIA_DEVICE_OK;
callback.Run(devices, result, scoped_ptr<content::MediaStreamUI>());
} }
void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) { void OnPointerLockResponse(content::WebContents* web_contents, bool allowed) {