From f09f969bc01495b537e43dbd484b6dfed2907dc6 Mon Sep 17 00:00:00 2001 From: Palana Date: Wed, 25 Jun 2014 22:56:10 +0200 Subject: [PATCH] Disable default device selection for mac-avcapture Since adding a source now opens the config dialog for that source the convenience gain from having a device automatically start capturing is outweighed by the inconvenience from having captured images unintentionally recorded/streamed --- plugins/mac-avcapture/av-capture.m | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/plugins/mac-avcapture/av-capture.m b/plugins/mac-avcapture/av-capture.m index 2c7a2bb5..8f19f8fd 100644 --- a/plugins/mac-avcapture/av-capture.m +++ b/plugins/mac-avcapture/av-capture.m @@ -522,27 +522,11 @@ static NSString *preset_names(NSString *preset) static void av_capture_defaults(obs_data_t settings) { - AVCaptureDevice *dev = [AVCaptureDevice - defaultDeviceWithMediaType:AVMediaTypeVideo]; - if (!dev) - return; - - NSString *highest = nil; - for (NSString *preset in presets()) { - if (![dev supportsAVCaptureSessionPreset:preset]) - continue; - highest = preset; - } - if (!highest) - return; - - obs_data_set_default_string(settings, "device", - dev.uniqueID.UTF8String); - obs_data_set_default_string(settings, "device_name", - dev.localizedName.UTF8String); + //TODO: localize + obs_data_set_default_string(settings, "device_name", "none"); obs_data_set_default_bool(settings, "use_preset", true); - - obs_data_set_default_string(settings, "preset", highest.UTF8String); + obs_data_set_default_string(settings, "preset", + AVCaptureSessionPreset1280x720.UTF8String); } static bool update_device_list(obs_property_t list, -- GitLab