From: jinhyung.jo Date: Fri, 3 Jul 2015 08:27:43 +0000 (+0900) Subject: maru-camera: Modified camera check routine on MacOS X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~322 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e7e8398d7285db280fd6b4c32ea2818b42143c;p=sdk%2Femulator%2Fqemu.git maru-camera: Modified camera check routine on MacOS QTKit is deprecated since OS X 10.8, so return false more than 10.8. Change-Id: I2bccc0f7767138977786fca3af52d62013c2df6c Signed-off-by: Jinhyung Jo (cherry picked from commit 5be9e20e3435933c7fcfccd11afdb84f7789bf0c) --- diff --git a/tizen/src/hw/pci/maru_camera_darwin_pci.m b/tizen/src/hw/pci/maru_camera_darwin_pci.m index c75aa596a1..9c005e7fba 100644 --- a/tizen/src/hw/pci/maru_camera_darwin_pci.m +++ b/tizen/src/hw/pci/maru_camera_darwin_pci.m @@ -537,8 +537,22 @@ static void *marucam_worker_thread(void *thread_param) int marucam_device_check(int log_flag) { /* FIXME: check the device parameters */ - INFO("Checking camera device\n"); - return 1; + SInt32 versMaj, versMin, versBugFix; + Gestalt(gestaltSystemVersionMajor, &versMaj); + Gestalt(gestaltSystemVersionMinor, &versMin); + Gestalt(gestaltSystemVersionBugFix, &versBugFix); + + INFO("Checking camera device: OS X Version: %d.%d.%d\n", + versMaj, versMin, versBugFix); + if (versMaj == 10 && versMin >= 8) { + INFO("QTKit is deprecated, camera is not supported\n"); + return 0; + } else if (versMaj == 10 && versMin >= 5) { + return 1; + } else { + ERR("No available\n"); + return 0; + } } /**********************************************