Remove PVR features

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

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 8853e2083dcbb2b361097bb5d157540aa3a7af2c..bb9dd179c32ff4217dede99cacfc8aa4f311f386 100644 (file)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -98,18 +98,6 @@ typedef enum {
        MEDIA_EXTRACT_COMPLETE  = 7             /**< Complete extract*/
 } media_scan_status_e;
 
-typedef enum {
-       MS_MEDIA_TYPE_IMAGE     = 0,    /**< Image Content*/
-       MS_MEDIA_TYPE_VIDEO     = 1,    /**< Video Content*/
-       MS_MEDIA_TYPE_SOUND     = 2,    /**< Sound Content like Ringtone*/
-       MS_MEDIA_TYPE_MUSIC     = 3,    /**< Music Content like mp3*/
-       MS_MEDIA_TYPE_OTHER     = 4,    /**< Not media Content*/
-       MS_MEDIA_TYPE_PVR       = 1001, /**< PVR Content*/
-       MS_MEDIA_TYPE_UHD       = 1002, /**< UHD Content*/
-       MS_MEDIA_TYPE_APK       = 1004, /**< APK Content*/
-       MS_MEDIA_TYPE_DOC       = 1005, /**< DOC Content*/
-} ms_media_type_e;
-
 
 /**
  * @}

diff --git a/src/common/include/media-common-utils.h b/src/common/include/media-common-utils.h
index 01ecdfbb43d8ddbbe014fcbbc4ebc93eb6886388..30b73335177565b5827f466bd3f069448f04d5e8 100644 (file)
--- a/src/common/include/media-common-utils.h
+++ b/src/common/include/media-common-utils.h
@@ -46,7 +46,6 @@ int ms_set_db_status(ms_db_status_type_t status);
 int ms_get_remain_space(uint64_t *free_space);
 int ms_check_size_mediadb(uid_t uid, uint64_t *db_size);
 bool ms_storage_mount_status(const char *start_path);
-bool ms_is_support_pvr(void);
 void ms_prevent_oom_killer(void);
 #endif
 

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 6dc4f7f370dd0b225932c031a15edcef096793bd..dae18b1aa403acc3906e0f6879f73da3645ec565 100644 (file)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -27,6 +27,7 @@
 #include <tzplatform_config.h>
 
 #define CONFIG_PATH PATH_LIBDIR"/libmedia-content-plugin.so"
+#define MS_MEDIA_TYPE_OTHER 4
 
 static GMutex db_mutex;
 static void **func_array;

diff --git a/src/common/media-common-utils-tv.c b/src/common/media-common-utils-tv.c
index 491d2be8ec0688062eafa6bf57cd97761a4df1c9..3f10c104afef3237c9f94382e4f349bd15664821 100644 (file)
--- a/src/common/media-common-utils-tv.c
+++ b/src/common/media-common-utils-tv.c
@@ -25,7 +25,6 @@
 #include <vconf.h>
 #include <sys/prctl.h>
 #include <usb-device.h>
-#include <system_info.h>
 
 #include "media-util.h"
 #include "media-common-dbg.h"
@@ -94,19 +93,6 @@ int ms_get_remain_space(uint64_t *free_space)
        return MS_MEDIA_ERR_NONE;
 }
 
-bool ms_is_support_pvr(void)
-{
-       bool bSupportPVR = false;
-       if (system_info_get_custom_bool("com.samsung/featureconf/pvr.pvr_support", &bSupportPVR) != SYSTEM_INFO_ERROR_NONE) {
-               MS_DBG_ERR("Get PVR Support failed");
-               return false;
-       }
-
-       MS_DBG("PVR Support : [%d]", bSupportPVR);
-
-       return bSupportPVR;
-}
-
 static void __ms_check_mount_status(usb_device_h usb_device, void *user_data)
 {
        storage_result_s *data = (storage_result_s *)user_data;

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 62dbadb1c03793590e62c67f893ff4b7b230a497..3ee0e77463df8fa6048fed5511063fbc12fc26f0 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -1011,22 +1011,6 @@ _POWEROFF:
        return NULL;
 }
 
-static void __msc_check_pvr_svc(void)
-{
-       if (!ms_is_support_pvr())
-               return;
-
-       MS_DBG_ERR("Waiting PVR service");
-       while (!_msc_is_power_off()) {
-               if (g_file_test("/run/pvr_ready", G_FILE_TEST_EXISTS))
-                       break;
-
-               sleep(1);
-       }
-
-       MS_DBG_WARN("PVR service is ready");
-}
-
 gpointer msc_storage_scan_thread(gpointer data)
 {
        int ret = MS_MEDIA_ERR_NONE;
@@ -1051,8 +1035,6 @@ gpointer msc_storage_scan_thread(gpointer data)
                        goto NEXT;
                }
 
-               __msc_check_pvr_svc();
-
                ret = ms_connect_db(&handle, scan_data->uid);
                if (ret != MS_MEDIA_ERR_NONE) {
                        MS_DBG_ERR("ms_connect_db failed");