From: xiaolong_.ma <xiaolong_.ma@samsung.com>
Date: Sat, 8 Sep 2012 07:09:01 +0000 (+0800)
Subject: [Request]Change the timer tone and remove unused tone files.
X-Git-Tag: 2.0_alpha^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=HEAD;p=apps%2Fhome%2Fclock.git

[Request]Change the timer tone and remove unused tone files.
---

diff --git a/packaging/org.tizen.clock.spec b/packaging/org.tizen.clock.spec
index ab104e0..9e0df41 100755
--- a/packaging/org.tizen.clock.spec
+++ b/packaging/org.tizen.clock.spec
@@ -2,7 +2,7 @@
 Name:      org.tizen.clock
 Summary:    background image library
 Version:    0.2.0
-Release:    50
+Release:    51
 License:    TBD
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  cmake
diff --git a/ring/res/sounds/A toy watch (Default timer alarm).wav b/ring/res/sounds/A toy watch (Default timer alarm).wav
deleted file mode 100644
index fb84bab..0000000
Binary files a/ring/res/sounds/A toy watch (Default timer alarm).wav and /dev/null differ
diff --git a/ring/res/sounds/Good morning (Default alarm).wav b/ring/res/sounds/Good morning (Default alarm).wav
deleted file mode 100644
index a29dcef..0000000
Binary files a/ring/res/sounds/Good morning (Default alarm).wav and /dev/null differ
diff --git a/ring/res/sounds/On time (Default schedule alarm).wav b/ring/res/sounds/On time (Default schedule alarm).wav
deleted file mode 100644
index 393d76d..0000000
Binary files a/ring/res/sounds/On time (Default schedule alarm).wav and /dev/null differ
diff --git a/ring/res/sounds/alarm1.wav b/ring/res/sounds/alarm1.wav
deleted file mode 100644
index 66a31ec..0000000
Binary files a/ring/res/sounds/alarm1.wav and /dev/null differ
diff --git a/timer/CMakeLists.txt b/timer/CMakeLists.txt
index 619fcfe..311c92a 100644
--- a/timer/CMakeLists.txt
+++ b/timer/CMakeLists.txt
@@ -11,8 +11,8 @@ SET(LIB_SRCS
 
 #set define
 SET(ALARMRING_PKGNAME ${PKGNAME_RING})
-#SET(ALARM_SOUND_PATH "/opt/apps/${ALARMRING_PKGNAME}/res/sounds")
-SET(ALARM_SOUND_PATH "/opt/share/settings/Alarms")
+SET(ALARM_SOUND_PATH "/opt/apps/${ALARMRING_PKGNAME}/res/sounds")
+#SET(ALARM_SOUND_PATH "/opt/share/settings/Alarms")
 SET(PACKAGE timer)
 #SET(LOCALEDIR "${RESDIR}/locale/timer")
 
diff --git a/timer/include/timer_define.h b/timer/include/timer_define.h
index d24e232..5fc7752 100644
--- a/timer/include/timer_define.h
+++ b/timer/include/timer_define.h
@@ -36,7 +36,7 @@
 #define CONTENT_SETTING "content/setting"
 #define CONTENT_MOTION "content/motion"
 #define MOTION_CLOCK  "motion/clock"
-#define SOUND_A_TOY_WATCH "Ticktac.mp3"
+#define SOUND_A_TOY_WATCH "General notification_sdk.wav"
 #define TIMER_DEF_TONE SOUND_A_TOY_WATCH
 #define IMAGE_PATH IMAGEDIR"/code"
 #define IMAGES_PATH_HOUR IMAGE_PATH"/hour"