Changed LOG_TAG conflicts

Change-Id: Id4334063a9f7a0723170fce3f0d52d49b4cf3759
Signed-off-by: bhutani.92 <bhutani.92@samsung.com>

diff --git a/src/include/mp-define.h b/src/include/mp-define.h
index 6d2973710bda0af57ef5ac3bcdc413daf1720540..b8bc90059ca10414d3c4fbd3c7e744bea2b38aff 100755 (executable)
--- a/src/include/mp-define.h
+++ b/src/include/mp-define.h
@@ -40,6 +40,16 @@
 #define EXPORT_API __attribute__((__visibility__("default")))
 #endif
 
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+
+#ifdef MP_SOUND_PLAYER
+#define LOG_TAG "SOUND_PLAYER"
+#else
+#define LOG_TAG "MUSIC_PLAYER"
+#endif
+
 #ifndef MP_IMAGE_ROTATE_FEATURE
 //efine MP_IMAGE_ROTATE_FEATURE
 #endif

diff --git a/src/include/mp-player-debug.h b/src/include/mp-player-debug.h
index 719a029132e2547ed53b4cac56eb1739c50fb39d..c004e0ed9deeed15963db318dfb78d463fa62d12 100644 (file)
--- a/src/include/mp-player-debug.h
+++ b/src/include/mp-player-debug.h
@@ -41,16 +41,6 @@
 #ifdef USE_DLOG_SYSTEM
 #include <dlog.h>
 
-#ifdef LOG_TAG
-#undef LOG_TAG
-#endif //LOG_TAG
-
-#ifdef MP_SOUND_PLAYER
-#define LOG_TAG "SOUND_PLAYER"
-#else
-#define LOG_TAG "MUSIC_PLAYER"
-#endif
-
 #ifndef TRUE
 #define TRUE 1
 #endif

diff --git a/src/include/music.h b/src/include/music.h
index 2955bf06f3a86d97a24ad1531046fd8214fa5852..3464ae8a5bd79f4f657faf9a49000b123ef589ea 100755 (executable)
--- a/src/include/music.h
+++ b/src/include/music.h
@@ -41,7 +41,6 @@
 #include "mp-resource.h"
 #include "mp-player-debug.h"
 
-#include "mp-define.h"
 #include "mp-playlist-mgr.h"
 
 #include "mp-http-mgr.h"

diff --git a/src/mp-main.c b/src/mp-main.c
index 9d55818cca20fd2a7c1597a08d4e3dcd34427012..5a57e692502866ac37942388e53de1ff889bc308 100755 (executable)
--- a/src/mp-main.c
+++ b/src/mp-main.c
@@ -15,8 +15,8 @@
 *
 */
 
-#include "mp-ta.h"
 #include "music.h"
+#include "mp-ta.h"
 #include "mp-widget.h"
 #include "mp-util.h"
 #include "mp-setting-ctrl.h"