Remove vconf key for camera status check

Change-Id: If82c170a6f183ddb302b66fda7a9935c3f7dc35d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f82ee3..cc36ffd 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-network-connection
        capi-network-wifi
        capi-media-player
+       capi-media-camera
        capi-media-sound-manager
        capi-media-metadata-extractor
        capi-system-system-settings

diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec
index 9f6dccc..189e4b9 100755 (executable)
--- a/packaging/org.tizen.quickpanel.spec
+++ b/packaging/org.tizen.quickpanel.spec
@@ -28,6 +28,7 @@ BuildRequires: pkgconfig(capi-network-bluetooth)
 BuildRequires: pkgconfig(capi-network-tethering)
 BuildRequires: pkgconfig(capi-network-connection)
 BuildRequires: pkgconfig(capi-media-player)
+BuildRequires: pkgconfig(capi-media-camera)
 BuildRequires: pkgconfig(capi-media-sound-manager)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
 BuildRequires: pkgconfig(capi-system-system-settings)

diff --git a/src/notifications/activenoti.c b/src/notifications/activenoti.c
index 7d276a1..0dd7f7c 100755 (executable)
--- a/src/notifications/activenoti.c
+++ b/src/notifications/activenoti.c
@@ -32,6 +32,7 @@
 #include <tzsh_quickpanel_service.h>
 #include <E_DBus.h>
 #include <app.h>
+#include <camera.h>
 
 
 #include "common.h"
@@ -134,11 +135,25 @@ static void _app_control_del_cb(void *data, Evas *e, Evas_Object *obj, void *eve
 
 static int _is_sound_playable(void)
 {
-       int status = 0, ret = 0;
+       int ret = 0;
+       camera_device_state_e primary;
+       camera_device_state_e secondary;
+
+       ret = camera_get_device_state(CAMERA_DEVICE_CAMERA0, &primary);
+       if (ret != CAMERA_ERROR_NONE) {
+               ERR("Failed to get front camera device state, %d, %s", ret, get_error_message(ret));
+               primary = CAMERA_DEVICE_STATE_NULL;
+       }
+
+       ret = camera_get_device_state(CAMERA_DEVICE_CAMERA1, &secondary);
+       if (ret != CAMERA_ERROR_NONE) {
+               ERR("Failed to get back camera device state, %d, %s", ret, get_error_message(ret));
+               secondary = CAMERA_DEVICE_STATE_NULL;
+       }
 
-       ret = vconf_get_int(VCONFKEY_CAMERA_STATE, &status);
-       if (ret == VCONF_OK && status == VCONFKEY_CAMERA_STATE_RECORDING) {
-               ERR("camcorder is working, don't play notification sound %d %d", ret, status);
+       if (CAMERA_DEVICE_STATE_WORKING == primary ||
+               CAMERA_DEVICE_STATE_WORKING == secondary) {
+               ERR("camcorder is working, don't play notification sound, front=%d, secondary=%d", primary, secondary);
                return 0;
        }