Remove global extern variable - mmcam_log_level

[Version] 0.3.40
[Issue Type] SAM Improvement

Change-Id: I0d48bb23158135586960a90fd19808b8cf37b393
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/legacy/include/legacy_camera.h b/legacy/include/legacy_camera.h
index 00499e3206cc8e407babc4f3fb5816d575e53361..213e725698f703f907c3e02fee95d8930d73b687 100644 (file)
--- a/legacy/include/legacy_camera.h
+++ b/legacy/include/legacy_camera.h
@@ -3859,43 +3859,42 @@ bool legacy_camera_wait(camera_h camera, unsigned int timeout);
 void legacy_camera_lock(camera_h camera, bool is_lock);
 void legacy_camera_send_signal(camera_h camera);
 int legacy_camera_get_platform_privilege(camera_h camera, const char **platform_privilege);
+int legacy_camera_get_log_level(void);
 
-/* log level - it will be set in libmm-camcorder. */
-extern int mmcam_log_level;
 
 #define CAM_LOG_CRITICAL(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_CRITICAL) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_CRITICAL) \
                        SLOGF(format, ##args); \
        } while (0)
 
 #define CAM_LOG_ERROR(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_ERROR) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_ERROR) \
                        SLOGE(format, ##args); \
        } while (0)
 
 #define CAM_LOG_WARNING(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_WARNING) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_WARNING) \
                        SLOGW(format, ##args); \
        } while (0)
 
 #define CAM_LOG_INFO(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_INFO) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_INFO) \
                        SLOGI(format, ##args); \
        } while (0)
 
 #define CAM_LOG_DEBUG(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_DEBUG) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_DEBUG) \
                        SLOGD(format, ##args); \
        } while (0)
 
 #define CAM_LOG_VERBOSE(format, args...) \
        do { \
-               if (mmcam_log_level >= MM_CAMCORDER_LOG_LEVEL_VERBOSE) \
+               if (mm_camcorder_get_log_level() >= MM_CAMCORDER_LOG_LEVEL_VERBOSE) \
                        SLOGD("[V] "format, ##args); \
        } while (0)
 

diff --git a/legacy/src/legacy_camera.c b/legacy/src/legacy_camera.c
index 2a34a60d42ff78b2f593974adb01553826bfffed..d18a31f538488c414a5b67fe38bdcb72ca886d60 100644 (file)
--- a/legacy/src/legacy_camera.c
+++ b/legacy/src/legacy_camera.c
@@ -4224,3 +4224,9 @@ int legacy_camera_attr_get_flash_brightness_range(camera_h camera, int *min, int
 
        return __convert_camera_error_code(__func__, ret);
 }
+
+
+int legacy_camera_get_log_level(void)
+{
+       return mm_camcorder_get_log_level();
+}

diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c
index 0a09d76ff2147ba42d3b3c5ad63373c9c39f0990..39cd7f3ac8bff822ffb6e5aca07693c474a458d0 100644 (file)
--- a/muse/src/muse_camera_dispatcher.c
+++ b/muse/src/muse_camera_dispatcher.c
@@ -1455,7 +1455,7 @@ int camera_dispatcher_create(muse_module_h module)
                MUSE_TYPE_INT, PARAM_RET, ret,
                MUSE_TYPE_INT, "preview_format", preview_format,
                MUSE_TYPE_INT, "user_buffer_supported", user_buffer_supported,
-               MUSE_TYPE_INT, "log_level", mmcam_log_level,
+               MUSE_TYPE_INT, "log_level", legacy_camera_get_log_level(),
                MUSE_TYPE_POINTER, "handle", muse_camera,
                0);
 

diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec
index a65858179bbf4c26af7a2adc137eb901f30fc7f9..3d4aa4d4d1538691412adc5eae73d7b54d8a8efe 100644 (file)
--- a/packaging/mmsvc-camera.spec
+++ b/packaging/mmsvc-camera.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-camera
 Summary:    A Camera module for muse server
-Version:    0.3.39
+Version:    0.3.40
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0