upload tizen1.0 source

9 files changed, 307 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac28b22..2bbbb44 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
-SET(dependents "svi dlog")
+SET(dependents "svi dlog capi-base-common")
+SET(pc_dependents "capi-base-common")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})
@@ -35,6 +36,13 @@ ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 
 TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
 
+SET_TARGET_PROPERTIES(${fw_name}
+    PROPERTIES
+    VERSION ${FULLVER}
+    SOVERSION ${MAJORVER}
+    CLEAN_DIRECT_OUTPUT 1
+)
+
 INSTALL(TARGETS ${fw_name} DESTINATION lib)
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/uix
@@ -44,9 +52,8 @@ INSTALL(
         )
 
 SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${dependents})
+SET(PC_REQUIRED ${pc_dependents})
 SET(PC_LDFLAGS -l${fw_name})
-SET(PC_CFLAGS -I\${includedir}/uix)
 
 CONFIGURE_FILE(
     ${fw_name}.pc.in
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..bbe9d02
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,206 @@
+Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.

+

+                                 Apache License

+                           Version 2.0, January 2004

+                        http://www.apache.org/licenses/

+

+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

+

+   1. Definitions.

+

+      "License" shall mean the terms and conditions for use, reproduction,

+      and distribution as defined by Sections 1 through 9 of this document.

+

+      "Licensor" shall mean the copyright owner or entity authorized by

+      the copyright owner that is granting the License.

+

+      "Legal Entity" shall mean the union of the acting entity and all

+      other entities that control, are controlled by, or are under common

+      control with that entity. For the purposes of this definition,

+      "control" means (i) the power, direct or indirect, to cause the

+      direction or management of such entity, whether by contract or

+      otherwise, or (ii) ownership of fifty percent (50%) or more of the

+      outstanding shares, or (iii) beneficial ownership of such entity.

+

+      "You" (or "Your") shall mean an individual or Legal Entity

+      exercising permissions granted by this License.

+

+      "Source" form shall mean the preferred form for making modifications,

+      including but not limited to software source code, documentation

+      source, and configuration files.

+

+      "Object" form shall mean any form resulting from mechanical

+      transformation or translation of a Source form, including but

+      not limited to compiled object code, generated documentation,

+      and conversions to other media types.

+

+      "Work" shall mean the work of authorship, whether in Source or

+      Object form, made available under the License, as indicated by a

+      copyright notice that is included in or attached to the work

+      (an example is provided in the Appendix below).

+

+      "Derivative Works" shall mean any work, whether in Source or Object

+      form, that is based on (or derived from) the Work and for which the

+      editorial revisions, annotations, elaborations, or other modifications

+      represent, as a whole, an original work of authorship. For the purposes

+      of this License, Derivative Works shall not include works that remain

+      separable from, or merely link (or bind by name) to the interfaces of,

+      the Work and Derivative Works thereof.

+

+      "Contribution" shall mean any work of authorship, including

+      the original version of the Work and any modifications or additions

+      to that Work or Derivative Works thereof, that is intentionally

+      submitted to Licensor for inclusion in the Work by the copyright owner

+      or by an individual or Legal Entity authorized to submit on behalf of

+      the copyright owner. For the purposes of this definition, "submitted"

+      means any form of electronic, verbal, or written communication sent

+      to the Licensor or its representatives, including but not limited to

+      communication on electronic mailing lists, source code control systems,

+      and issue tracking systems that are managed by, or on behalf of, the

+      Licensor for the purpose of discussing and improving the Work, but

+      excluding communication that is conspicuously marked or otherwise

+      designated in writing by the copyright owner as "Not a Contribution."

+

+      "Contributor" shall mean Licensor and any individual or Legal Entity

+      on behalf of whom a Contribution has been received by Licensor and

+      subsequently incorporated within the Work.

+

+   2. Grant of Copyright License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      copyright license to reproduce, prepare Derivative Works of,

+      publicly display, publicly perform, sublicense, and distribute the

+      Work and such Derivative Works in Source or Object form.

+

+   3. Grant of Patent License. Subject to the terms and conditions of

+      this License, each Contributor hereby grants to You a perpetual,

+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

+      (except as stated in this section) patent license to make, have made,

+      use, offer to sell, sell, import, and otherwise transfer the Work,

+      where such license applies only to those patent claims licensable

+      by such Contributor that are necessarily infringed by their

+      Contribution(s) alone or by combination of their Contribution(s)

+      with the Work to which such Contribution(s) was submitted. If You

+      institute patent litigation against any entity (including a

+      cross-claim or counterclaim in a lawsuit) alleging that the Work

+      or a Contribution incorporated within the Work constitutes direct

+      or contributory patent infringement, then any patent licenses

+      granted to You under this License for that Work shall terminate

+      as of the date such litigation is filed.

+

+   4. Redistribution. You may reproduce and distribute copies of the

+      Work or Derivative Works thereof in any medium, with or without

+      modifications, and in Source or Object form, provided that You

+      meet the following conditions:

+

+      (a) You must give any other recipients of the Work or

+          Derivative Works a copy of this License; and

+

+      (b) You must cause any modified files to carry prominent notices

+          stating that You changed the files; and

+

+      (c) You must retain, in the Source form of any Derivative Works

+          that You distribute, all copyright, patent, trademark, and

+          attribution notices from the Source form of the Work,

+          excluding those notices that do not pertain to any part of

+          the Derivative Works; and

+

+      (d) If the Work includes a "NOTICE" text file as part of its

+          distribution, then any Derivative Works that You distribute must

+          include a readable copy of the attribution notices contained

+          within such NOTICE file, excluding those notices that do not

+          pertain to any part of the Derivative Works, in at least one

+          of the following places: within a NOTICE text file distributed

+          as part of the Derivative Works; within the Source form or

+          documentation, if provided along with the Derivative Works; or,

+          within a display generated by the Derivative Works, if and

+          wherever such third-party notices normally appear. The contents

+          of the NOTICE file are for informational purposes only and

+          do not modify the License. You may add Your own attribution

+          notices within Derivative Works that You distribute, alongside

+          or as an addendum to the NOTICE text from the Work, provided

+          that such additional attribution notices cannot be construed

+          as modifying the License.

+

+      You may add Your own copyright statement to Your modifications and

+      may provide additional or different license terms and conditions

+      for use, reproduction, or distribution of Your modifications, or

+      for any such Derivative Works as a whole, provided Your use,

+      reproduction, and distribution of the Work otherwise complies with

+      the conditions stated in this License.

+

+   5. Submission of Contributions. Unless You explicitly state otherwise,

+      any Contribution intentionally submitted for inclusion in the Work

+      by You to the Licensor shall be under the terms and conditions of

+      this License, without any additional terms or conditions.

+      Notwithstanding the above, nothing herein shall supersede or modify

+      the terms of any separate license agreement you may have executed

+      with Licensor regarding such Contributions.

+

+   6. Trademarks. This License does not grant permission to use the trade

+      names, trademarks, service marks, or product names of the Licensor,

+      except as required for reasonable and customary use in describing the

+      origin of the Work and reproducing the content of the NOTICE file.

+

+   7. Disclaimer of Warranty. Unless required by applicable law or

+      agreed to in writing, Licensor provides the Work (and each

+      Contributor provides its Contributions) on an "AS IS" BASIS,

+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+      implied, including, without limitation, any warranties or conditions

+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

+      PARTICULAR PURPOSE. You are solely responsible for determining the

+      appropriateness of using or redistributing the Work and assume any

+      risks associated with Your exercise of permissions under this License.

+

+   8. Limitation of Liability. In no event and under no legal theory,

+      whether in tort (including negligence), contract, or otherwise,

+      unless required by applicable law (such as deliberate and grossly

+      negligent acts) or agreed to in writing, shall any Contributor be

+      liable to You for damages, including any direct, indirect, special,

+      incidental, or consequential damages of any character arising as a

+      result of this License or out of the use or inability to use the

+      Work (including but not limited to damages for loss of goodwill,

+      work stoppage, computer failure or malfunction, or any and all

+      other commercial damages or losses), even if such Contributor

+      has been advised of the possibility of such damages.

+

+   9. Accepting Warranty or Additional Liability. While redistributing

+      the Work or Derivative Works thereof, You may choose to offer,

+      and charge a fee for, acceptance of support, warranty, indemnity,

+      or other liability obligations and/or rights consistent with this

+      License. However, in accepting such obligations, You may act only

+      on Your own behalf and on Your sole responsibility, not on behalf

+      of any other Contributor, and only if You agree to indemnify,

+      defend, and hold each Contributor harmless for any liability

+      incurred by, or claims asserted against, such Contributor by reason

+      of your accepting any such warranty or additional liability.

+

+   END OF TERMS AND CONDITIONS

+

+   APPENDIX: How to apply the Apache License to your work.

+

+      To apply the Apache License to your work, attach the following

+      boilerplate notice, with the fields enclosed by brackets "[]"

+      replaced with your own identifying information. (Don't include

+      the brackets!)  The text should be enclosed in the appropriate

+      comment syntax for the file format. We also recommend that a

+      file or class name and description of purpose be included on the

+      same "printed page" as the copyright notice for easier

+      identification within third-party archives.

+

+   Copyright [yyyy] [name of copyright owner]

+

+   Licensed under the Apache License, Version 2.0 (the "License");

+   you may not use this file except in compliance with the License.

+   You may obtain a copy of the License at

+

+       http://www.apache.org/licenses/LICENSE-2.0

+

+   Unless required by applicable law or agreed to in writing, software

+   distributed under the License is distributed on an "AS IS" BASIS,

+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+   See the License for the specific language governing permissions and

+   limitations under the License.

+

+

+

diff --git a/capi-uix-feedback.pc.in b/capi-uix-feedback.pc.in
index 917265a..973396e 100644
--- a/capi-uix-feedback.pc.in
+++ b/capi-uix-feedback.pc.in
@@ -11,5 +11,5 @@ Description: @PACKAGE_DESCRIPTION@
 Version: @VERSION@
 Requires: @PC_REQUIRED@ 
 Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir} @PC_CFLAGS@
+Cflags: -I${includedir} 
 
diff --git a/debian/changelog b/debian/changelog
index 9a5afc3..dcd2e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+capi-uix-feedback (0.1.0-8) unstable; urgency=low
+
+  * add library dependency to control file
+  * Git: api/feedback
+  * Tag: capi-uix-feedback_0.1.0-8
+
+ -- Hyungdeuk Kim <hd3.kim@samsung.com>  Tue, 13 Mar 2012 18:18:09 +0900
+
+capi-uix-feedback (0.1.0-7) unstable; urgency=low
+
+  * Add feedback_play_type api
+  * Git: api/feedback
+  * Tag: capi-uix-feedback_0.1.0-7
+
+ -- Hyungdeuk Kim <hd3.kim@samsung.com>  Tue, 6 Mar 2012 11:08:09 +0900
+
 capi-uix-feedback (0.1.0-6) unstable; urgency=low
 
   * now, version will be attached to shared object extension.
diff --git a/debian/control b/debian/control
index 4bd253c..f976554 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5), libsvi-dev, libglib2.0-dev, capi-base-common-de
 
 Package: capi-uix-feedback
 Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A Feedback library in Tizen Native API
 
 Package: capi-uix-feedback-dev
diff --git a/debian/rules b/debian/rules
index 57fdce9..8532bec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+FULLVER ?= $(shell dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+MAJORVER ?= $(shell echo $(FULLVER) | cut -d '.' -f 1)
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -13,7 +16,7 @@ CMAKE_BUILD_DIR ?= $(CURDIR)/cmake_build_tmp
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake ..
+	mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake .. -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
 	touch configure-stamp
 
 
diff --git a/include/feedback.h b/include/feedback.h
index 2012c0c..b676f42 100644
--- a/include/feedback.h
+++ b/include/feedback.h
@@ -11,7 +11,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 
 
@@ -46,7 +46,7 @@ extern "C" {
 
 /**
  * @brief Enumerations of the system pre-defined patterns for feedback interface
- * @details 
+ * @details
  * Each feedback pattern can have separate media files of each types.
  * But Depending on vendor design, pattern may not have any type of file.
  *
@@ -81,7 +81,7 @@ typedef enum
     FEEDBACK_ERROR_INVALID_PARAMETER   = TIZEN_ERROR_INVALID_PARAMETER,   /**< Invalid parameter */
     FEEDBACK_ERROR_NOT_INITIALIZED     = TIZEN_ERROR_SYSTEM_CLASS | 0x52, /**< Has not yet been Initialized */
     FEEDBACK_ERROR_OPERATION_FAILED    = TIZEN_ERROR_SYSTEM_CLASS | 0x55, /**< Operation failed */
-} feedback_error_e;                                                     
+} feedback_error_e;
 
 /**
  * @brief Initializes feedback API.
@@ -92,8 +92,8 @@ typedef enum
  *
  * @return 0 on success, otherwise a negative error value.
  * @retval #FEEDBACK_ERROR_NONE               Successful
- * @retval #FEEDBACK_ERROR_OPERATION_FAILED   Operation failed 
- * 
+ * @retval #FEEDBACK_ERROR_OPERATION_FAILED   Operation failed
+ *
  * @see feedback_deinitialize()
  */
 int feedback_initialize(void);
@@ -103,7 +103,7 @@ int feedback_initialize(void);
  *
  * @details This function must be called when feedback functions are no longer needed.
  *
- * @return 0 on success, otherwise a negative error value.  
+ * @return 0 on success, otherwise a negative error value.
  * @retval #FEEDBACK_ERROR_NONE                 Successful
  * @retval #FEEDBACK_ERROR_OPERATION_FAILED     Operation failed
  *
@@ -124,7 +124,7 @@ int feedback_deinitialize(void);
  * For example, when set to silent mode, the device doesn't produce any sound.
  *
  * @param[in] pattern   The pre-defined pattern
- * 
+ *
  * @return 0 on success, otherwise a negative error value.
  * @retval #FEEDBACK_ERROR_NONE               Successful
  * @retval #FEEDBACK_ERROR_INVALID_PARAMETER  Invalid parameter
@@ -132,8 +132,28 @@ int feedback_deinitialize(void);
 int feedback_play(feedback_pattern_e pattern);
 
 /**
+ *
+ * @brief Plays specific type of reactions that are pre-defined.
+ *
+ * @details
+ * This function can be used to react to pre-defined actions. \n
+ * It play specific type of system pre-defined pattern.
+ *
+ * @remarks
+ * Currently, there are two types of reactions: sound and vibration.
+ *
+ * @param[in] type      The pattern type
+ * @param[in] pattern   The pre-defined pattern
+ *
+ * @return 0 on success, otherwise a negative error value.
+ * @retval #FEEDBACK_ERROR_NONE               Successful
+ * @retval #FEEDBACK_ERROR_INVALID_PARAMETER  Invalid parameter
+ */
+int feedback_play_type(feedback_type_e type, feedback_pattern_e pattern);
+
+/**
  * @brief Gets the file path of resource for the given feedback type and pattern.
- * 
+ *
  * @details
  * Depending on the type of each pattern resouorce has a different format. \n
  * Currently, System supports two pattern types. \n
@@ -146,12 +166,12 @@ int feedback_play(feedback_pattern_e pattern);
  * @param[in]  type      The pattern type
  * @param[in]  pattern   The pre-defined pattern
  * @param[out] path      The file path of resource for feedback type and pattern
- * 
+ *
  * @return 0 on success, otherwise a negative error value.
  * @retval #FEEDBACK_ERROR_NONE               Successful
  * @retval #FEEDBACK_ERROR_INVALID_PARAMETER  Invalid parameter
  * @retval #FEEDBACK_ERROR_OPERATION_FAILED   Operation failed
- * 
+ *
  */
 int feedback_get_resource_path(feedback_type_e type, feedback_pattern_e pattern, char **path);
 
diff --git a/packaging/capi-uix-feedback.spec b/packaging/capi-uix-feedback.spec
index 7cb4dc9..897c4dc 100644
--- a/packaging/capi-uix-feedback.spec
+++ b/packaging/capi-uix-feedback.spec
@@ -1,7 +1,7 @@
 Name:       capi-uix-feedback
 Summary:    A Feedback library in Tizen Native API
 Version:    0.1.0
-Release:    1
+Release:    8
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -28,7 +28,8 @@ Requires: %{name} = %{version}-%{release}
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=/usr
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}
@@ -43,10 +44,11 @@ rm -rf %{buildroot}
 
 
 %files
-%{_libdir}/libcapi-uix-feedback.so
+%{_libdir}/libcapi-uix-feedback.so.*
 
 %files devel
 %{_includedir}/uix/*.h
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libcapi-uix-feedback.so
 
 
diff --git a/src/feedback.c b/src/feedback.c
index a15cd0e..3399264 100644
--- a/src/feedback.c
+++ b/src/feedback.c
@@ -11,7 +11,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
- * limitations under the License. 
+ * limitations under the License.
  */
 
 
@@ -110,6 +110,39 @@ int feedback_play(feedback_pattern_e pattern)
     return FEEDBACK_ERROR_NONE;
 }
 
+int feedback_play_type(feedback_type_e type, feedback_pattern_e pattern)
+{
+    int err;
+    if(svi_handle == NOT_ASSIGNED){
+        LOGE("[%s] Not Initialized(0x%08x)", __FUNCTION__, FEEDBACK_ERROR_NOT_INITIALIZED);
+        return FEEDBACK_ERROR_NOT_INITIALIZED;
+    }
+
+    if(pattern < FEEDBACK_PATTERN_TOUCH_TAP || pattern > FEEDBACK_PATTERN_HW_HOLD){
+        LOGE("[%s] Invalid parameter(0x%08x)", __FUNCTION__, FEEDBACK_ERROR_INVALID_PARAMETER);
+        return FEEDBACK_ERROR_INVALID_PARAMETER;
+    }
+
+    switch(type) {
+        case FEEDBACK_TYPE_SOUND :
+            err = svi_play_sound(svi_handle, _PTN_SND[pattern]);
+            break;
+        case FEEDBACK_TYPE_VIBRATION :
+            err = svi_play_vib(svi_handle, _PTN_VIBE[pattern]);
+            break;
+        default :
+            LOGE("[%s] Invalid parameter(0x%08x)", __FUNCTION__, FEEDBACK_ERROR_INVALID_PARAMETER);
+        return FEEDBACK_ERROR_INVALID_PARAMETER;
+    }
+
+    if(err != SVI_SUCCESS){
+        LOGE("[%s] Operation failed(0x%08x)", __FUNCTION__, FEEDBACK_ERROR_OPERATION_FAILED);
+        return FEEDBACK_ERROR_OPERATION_FAILED;
+    }
+
+    return FEEDBACK_ERROR_NONE;
+}
+
 int feedback_get_resource_path(feedback_type_e type, feedback_pattern_e pattern, char** path)
 {
     int err;