Flags cleanup

Remove USE_SUSPEND_MODE (unused)
Merge USE_RECORDED_CONTENT, SET_VIP_PROCESS into USE_TVPD_MODE

Change-Id: Idb4141a49248d55408b58055fe3cb96d230df601
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index b5cefc0..6067040 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -68,7 +68,7 @@ cp %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} .
 %restore_fcommon
 %endif
 %if 0%{?product_tv}
-export CFLAGS="$CFLAGS -D_USE_RECORDED_CONTENT -D_USE_SUSPEND_MODE -D_SET_VIP_PROCESS -D_USE_TVPD_MODE"
+export CFLAGS="$CFLAGS -D_USE_TVPD_MODE"
 %else
 export CFLAGS="$CFLAGS -D_USE_MULTI_USER -D_USE_META_UPDATE -D_USE_DEVICED_DBUS"
 %endif

diff --git a/src/common/include/media-common-utils.h b/src/common/include/media-common-utils.h
index 4615d56..cf99aa1 100755 (executable)
--- a/src/common/include/media-common-utils.h
+++ b/src/common/include/media-common-utils.h
@@ -32,10 +32,6 @@ bool ms_config_set_int(const char *key, int value);
 bool ms_config_get_str(const char *key, char **value);
 int ms_get_remain_space(double *free_space);
 
-#ifdef _USE_RECORDED_CONTENT
-bool ms_is_support_pvr(void);
-#endif
-
 int ms_check_file_path(const char *file_path, uid_t uid);
 int ms_check_ignore_dir(const char *full_path, uid_t uid);
 int ms_check_scan_ignore(char * path, uid_t uid);
@@ -44,7 +40,8 @@ int ms_set_db_status(ms_db_status_type_t status, ms_user_storage_type_e storage_
 int ms_set_power_mode(ms_db_status_type_t status);
 void ms_trim_dir_path(char *dir_path);
 int ms_check_size_mediadb(uid_t uid, double *db_size);
-#ifdef _SET_VIP_PROCESS
+#ifdef _USE_TVPD_MODE
+bool ms_is_support_pvr(void);
 int ms_set_vip_process(void);
 #endif
 

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index 678e6a6..0ea1a48 100644 (file)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -25,7 +25,7 @@
 #include <sys/statvfs.h>
 #include <sys/stat.h>
 
-#ifdef _SET_VIP_PROCESS
+#ifdef _USE_TVPD_MODE
 #include <sys/prctl.h>
 #endif
 #include <system_info.h>
@@ -135,7 +135,7 @@ int ms_get_remain_space(double *free_space)
        return MS_MEDIA_ERR_NONE;
 }
 
-#ifdef _USE_RECORDED_CONTENT
+#ifdef _USE_TVPD_MODE
 bool ms_is_support_pvr(void)
 {
        bool bSupportPVR = false;
@@ -482,7 +482,7 @@ int ms_check_size_mediadb(uid_t uid, double *db_size)
        return ret;
 }
 
-#ifdef _SET_VIP_PROCESS
+#ifdef _USE_TVPD_MODE
 #define PROC_OOM_SCORE_ADJ_PATH                "/proc/%d/oom_score_adj"
 #define VIP_OOM_SCORE_ADJ                      (-1000)
 #define PROC_NAME_MAX 1024

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 9a4c175..aee22a2 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1278,7 +1278,7 @@ static int __msc_dir_scan_cb(void)
 
 static void __msc_check_pvr_svc(void)
 {
-#ifdef _USE_RECORDED_CONTENT
+#ifdef _USE_TVPD_MODE
        if (ms_is_support_pvr()) {
                MS_DBG_ERR("Waiting PVR service");
                while (!power_off2) {

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 5e25a16..34f55db 100644 (file)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
        msc_send_ready();
        MS_DBG_INFO("Scanner-V2 is running");
 
-#ifdef _SET_VIP_PROCESS
+#ifdef _USE_TVPD_MODE
        /*Set VIP Process*/
        ms_set_vip_process();
 #endif

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 8e325d3..1ba996d 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -382,8 +382,7 @@ int main(int argc, char **argv)
 #ifdef _USE_TVPD_MODE
        if (!ms_config_set_int(MS_SERVER_STATUS, 1))
                MS_DBG_ERR("Fail to change sever status");
-#endif
-#ifdef _SET_VIP_PROCESS
+
        /*Set VIP Process*/
        ms_set_vip_process();
 #endif