Remove unused code relation with DRM

diff --git a/call-engine/core/include/vc-core-util.h b/call-engine/core/include/vc-core-util.h
index 1a0327c2d44be7f4efbd49c40680b9fd1b773b6d..02bef8acc5ac3a2c52881b7828fe16ad22fb5a62 100755 (executable)
--- a/call-engine/core/include/vc-core-util.h
+++ b/call-engine/core/include/vc-core-util.h
@@ -31,11 +31,6 @@
 #include "vc-core-error.h"
 #include "vc-core-engine-types.h"
 
-#ifdef DRM_USED
-#include "drm-service-types.h"
-#include "drm-service.h"
-#endif
-
 #include "TelDefines.h"
 #include "TelNetwork.h"
 #include "TelSim.h"

diff --git a/call-engine/voice-call-sound.c b/call-engine/voice-call-sound.c
index 8482f351047a088347ebf5209a4faeb98a8c993c..ecc428de87c269e85add70645a1b1de394336db6 100755 (executable)
--- a/call-engine/voice-call-sound.c
+++ b/call-engine/voice-call-sound.c
@@ -1204,14 +1204,8 @@ static gboolean __voicecall_snd_start_melody(voicecall_snd_mgr_t *papp_snd, gboo
 
        if (strlen(papp_snd->ring_tone) <= 0) {
                setting_file_path = vconf_get_str(VCONFKEY_SETAPPL_CALL_RINGTONE_PATH_STR);
-#ifdef DRM_USED
-               if ((setting_file_path == NULL) || (strlen(setting_file_path) <= 0) ||
-                       (FALSE == g_file_test(setting_file_path, G_FILE_TEST_EXISTS)) ||
-                       (FALSE == voicecall_util_is_valid_drm_file(setting_file_path, DRM_PERMISSION_PLAY)))
-#else
                if ((setting_file_path == NULL) || (strlen(setting_file_path) <= 0) ||
                (FALSE == g_file_test(setting_file_path, G_FILE_TEST_EXISTS)))
-#endif
                {
                        CALL_ENG_DEBUG(ENG_ERR, "setting ring tone path is invalid : [%s]\n", setting_file_path);
                        /*snprintf(ringtone_path, sizeof(ringtone_path), "file://%s", VOICE_CALL_SND_DEFAULT_RINGTONE_PATH);*/