From 7db179a579e06b4f96dd70601891792444099519 Mon Sep 17 00:00:00 2001 From: Jungmin Kim Date: Wed, 2 May 2012 09:32:04 +0900 Subject: [PATCH] Remove unused code relation with DRM --- call-engine/core/include/vc-core-util.h | 5 ----- call-engine/voice-call-sound.c | 6 ------ 2 files changed, 11 deletions(-) diff --git a/call-engine/core/include/vc-core-util.h b/call-engine/core/include/vc-core-util.h index 1a0327c..02bef8a 100755 --- 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 8482f35..ecc428d 100755 --- 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);*/ -- 2.34.1