Remove unnecessary code for TV Product mode

_USE_TVPD_MODE is always enabled for scanner-v2

Change-Id: I83ead7c703e2e83f59447f46f166bec6c8626d8e

diff --git a/src/scanner-v2/media-scanner-db-manage-v2.c b/src/scanner-v2/media-scanner-db-manage-v2.c
index 4731311402963944286e096f86e8c8156b24fa4d..40b51699bec2947456f8aa99ddf162a48c0f5983 100755 (executable)
--- a/src/scanner-v2/media-scanner-db-manage-v2.c
+++ b/src/scanner-v2/media-scanner-db-manage-v2.c
@@ -49,9 +49,9 @@ int msc_check_db_size(uid_t uid, int scan_type)
 
                        ms_check_size_mediadb(uid, &db_size);
                        if (db_size >= MEDIA_DB_SIZE_LIMIT_2) {
-#ifdef _USE_TVPD_MODE
+
                                ms_config_set_int(MS_DB_LIMIT, 0);
-#endif
+
                                MS_DBG_ERR("DB IS FULL. CANNOT UPDATE");
                                return MS_MEDIA_ERR_DB_FULL_FAIL;
                        }

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 0df869aef46819d95e13dd91ca8145a1c4f7dc3c..aa342d1994ec8dc9c022d9b2dafc34fb0d271cb2 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1222,7 +1222,6 @@ static int __msc_dir_scan_cb(void)
 
 static void __msc_check_pvr_svc(void)
 {
-#ifdef _USE_TVPD_MODE
        if (ms_is_support_pvr()) {
                MS_DBG_ERR("Waiting PVR service");
                while (!_msc_is_power_off()) {
@@ -1237,9 +1236,6 @@ static void __msc_check_pvr_svc(void)
                        }
                }
        }
-#else
-       MS_DBG("NOT SUPPORT RECORED CONTENT");
-#endif
 }
 
 gpointer msc_storage_scan_thread(gpointer data)
@@ -1766,9 +1762,9 @@ static int __msc_check_remain_space(uid_t uid)
        } else {
                if (free_space < MEDIA_DB_SPACE_LIMIT) {
                        MS_DBG_ERR("NOT ENOUGH SPACE WE DO NOT UPDATE MEDIA DB FREE SPACE [%lf]", free_space);
-#ifdef _USE_TVPD_MODE
+
                        ms_config_set_int(MS_DB_LIMIT, 0);
-#endif
+
                        return MS_MEDIA_ERR_NOT_ENOUGH_SPACE;
                }
        }
@@ -1786,9 +1782,9 @@ static int __msc_check_remain_space(uid_t uid)
 
                        ms_check_size_mediadb(uid, &db_size);
                        if (db_size >= MEDIA_DB_SIZE_LIMIT_2) {
-#ifdef _USE_TVPD_MODE
+
                                ms_config_set_int(MS_DB_LIMIT, 0);
-#endif
+
                                MS_DBG_ERR("DB IS FULL. CANNOT UPDATE[%lf]", db_size);
                                return MS_MEDIA_ERR_DB_FULL_FAIL;
                        }

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 419fdb562f4356f3a54c138218c533736f3819e8..8724a902c91cbdda8a8f5ee6e3aac14f2a66fc8b 100644 (file)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -163,10 +163,8 @@ int main(int argc, char **argv)
        msc_send_ready();
        MS_DBG_INFO("Scanner-V2 is running");
 
-#ifdef _USE_TVPD_MODE
        /*Set VIP Process*/
        ms_set_vip_process();
-#endif
 
        g_main_loop_run(scanner_mainloop2);