Remove mm-log dependency

Use dlog directly instead of mm-log through mm_debug.h

[Version] 0.10.134
[Profile] Common
[Issue Type]
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-unified_20170913.3]

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

diff --git a/configure.ac b/configure.ac
index af61d55..730b106 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,10 @@ PKG_CHECK_MODULES(DPM, dpm)
 AC_SUBST(DPM_CFLAGS)
 AC_SUBST(DPM_LIBS)
 
+PKG_CHECK_MODULES(DLOG, dlog)
+AC_SUBST(DLOG_CFLAGS)
+AC_SUBST(DLOG_LIBS)
+
 AC_ARG_ENABLE(product-tv, AC_HELP_STRING([--enable-product-tv],[enable tv defined code]),
 [
   case "${enableval}" in

diff --git a/mm-camcorder.pc.in b/mm-camcorder.pc.in
index eb5870c..8df7220 100644 (file)
--- a/mm-camcorder.pc.in
+++ b/mm-camcorder.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: mm-camcorder
 Description: Multimedia Framework Camcorder Library
-Requires: gstreamer-1.0 gstreamer-base-1.0 mm-common mm-log libexif
+Requires: gstreamer-1.0 gstreamer-base-1.0 mm-common libexif
 Version: $VERSION
 Libs: -L${libdir} -lmmfcamcorder
 Cflags: -I${includedir}/ -I${includedir}/mmf

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index d804c54..1a1b598 100644 (file)
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.10.133
+Version:    0.10.134
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
@@ -31,6 +31,7 @@ BuildRequires:  pkgconfig(aul)
 BuildRequires:  pkgconfig(ttrace)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(dpm)
+BuildRequires:  pkgconfig(dlog)
 
 %description
 Camera and recorder function supported library.

diff --git a/src/Makefile.am b/src/Makefile.am
index c811116..4835358 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,6 +48,7 @@ libmmfcamcorder_la_CFLAGS = -I$(srcdir)/include \
                             $(STORAGE_CFLAGS) \
                             $(TTRACE_CFLAGS) \
                             $(DPM_CFLAGS) \
+                            $(DLOG_CFLAGS) \
                             $(SYSTEMINFO_CFLAGS)
 
 libmmfcamcorder_la_LIBADD = \
@@ -66,6 +67,7 @@ libmmfcamcorder_la_LIBADD = \
                            $(TBM_LIBS) \
                            $(TTRACE_LIBS) \
                            $(DPM_LIBS) \
+                           $(DLOG_LIBS) \
                            $(STORAGE_LIBS)
 
 libmmfcamcorder_la_CFLAGS += -DMMF_LOG_OWNER=0x010 -D_FILE_OFFSET_BITS=64

diff --git a/src/include/mm_camcorder_internal.h b/src/include/mm_camcorder_internal.h
index d944dac..c8523fe 100644 (file)
--- a/src/include/mm_camcorder_internal.h
+++ b/src/include/mm_camcorder_internal.h
@@ -42,9 +42,9 @@
 #include <ttrace.h>
 #include <errno.h>
 #include <restriction.h> /* device policy manager */
+#include <dlog.h>
 
 #include "mm_camcorder.h"
-#include "mm_debug.h"
 
 #ifdef _MMCAMCORDER_MURPHY_SUPPORT
 #include "mm_camcorder_resource.h"
@@ -67,6 +67,11 @@
 #include <rm_api.h>
 #endif /* _MMCAMCORDER_RM_SUPPORT */
 
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+#define LOG_TAG "MM_CAMCORDER"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -74,11 +79,11 @@ extern "C" {
 /*=======================================================================================
 | MACRO DEFINITIONS                                                                    |
 ========================================================================================*/
-#define _mmcam_dbg_verb(fmt, args...)  debug_verbose(" "fmt"\n", ##args);
-#define _mmcam_dbg_log(fmt, args...)   debug_log(" "fmt"\n", ##args);
-#define _mmcam_dbg_warn(fmt, args...)  debug_warning(" "fmt"\n", ##args);
-#define _mmcam_dbg_err(fmt, args...)   debug_error(" "fmt"\n", ##args);
-#define _mmcam_dbg_crit(fmt, args...)  debug_critical(" "fmt"\n", ##args);
+#define _mmcam_dbg_verb(fmt, args...)  SLOGI(fmt, ##args);
+#define _mmcam_dbg_log(fmt, args...)   SLOGD(fmt, ##args);
+#define _mmcam_dbg_warn(fmt, args...)  SLOGW(fmt, ##args);
+#define _mmcam_dbg_err(fmt, args...)   SLOGE(fmt, ##args);
+#define _mmcam_dbg_crit(fmt, args...)  SLOGF(fmt, ##args);
 
 /**
  *     Macro for checking validity and debugging

diff --git a/src/mm_camcorder_exifinfo.c b/src/mm_camcorder_exifinfo.c
index 4c66a3b..302350a 100644 (file)
--- a/src/mm_camcorder_exifinfo.c
+++ b/src/mm_camcorder_exifinfo.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include <mm_debug.h>
 #include <mm_error.h>
 
 #define MM_EXIFINFO_USE_BINARY_EXIFDATA         1