tizen 2.3 release tizen_2.3 submit/tizen_2.3/20150202.061152 tizen_2.3_release
authorjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:32:50 +0000 (13:32 +0900)
committerjk7744.park <jk7744.park@samsung.com>
Sun, 1 Feb 2015 04:32:50 +0000 (13:32 +0900)
55 files changed:
AUTHORS [moved from wearable/AUTHORS with 100% similarity, mode: 0644]
CMakeLists.txt [moved from wearable/CMakeLists.txt with 100% similarity]
LICENSE [moved from wearable/LICENSE with 100% similarity, mode: 0644]
capi-media-wav-player.manifest [moved from wearable/capi-media-wav-player.manifest with 100% similarity]
capi-media-wav-player.pc.in [moved from wearable/capi-media-wav-player.pc.in with 100% similarity]
doc/wave_player_doc.h [moved from wearable/doc/wave_player_doc.h with 78% similarity, mode: 0644]
include/wav_player.h [moved from mobile/include/wav_player.h with 75% similarity]
include/wav_player_private.h [new file with mode: 0644]
mobile/AUTHORS [deleted file]
mobile/CMakeLists.txt [deleted file]
mobile/LICENSE.APLv2 [deleted file]
mobile/NOTICE [deleted file]
mobile/capi-media-wav-player.manifest [deleted file]
mobile/capi-media-wav-player.pc.in [deleted file]
mobile/test/CMakeLists.txt [deleted file]
mobile/test/multimedia_wav_player_test.c [deleted file]
mobile/test/test.wav [deleted file]
packaging/capi-media-wav-player-0.1.0.tar.gz [deleted file]
packaging/capi-media-wav-player.spec
packaging/capi-media-wav-player.spec.mobile [deleted file]
src/wav_player.c [moved from mobile/src/wav_player.c with 52% similarity, mode: 0644]
src/wav_player_private.c [new file with mode: 0644]
test/CMakeLists.txt [moved from wearable/test/CMakeLists.txt with 100% similarity]
test/multimedia_wav_player_test.c [moved from wearable/test/multimedia_wav_player_test.c with 100% similarity, mode: 0644]
test/test.wav [moved from wearable/test/test.wav with 100% similarity, mode: 0644]
wearable/TC/README.txt [deleted file]
wearable/TC/_export_env.sh [deleted file]
wearable/TC/_export_target_env.sh [deleted file]
wearable/TC/build.sh [deleted file]
wearable/TC/clean.sh [deleted file]
wearable/TC/config [deleted file]
wearable/TC/config.default [deleted file]
wearable/TC/execute.sh [deleted file]
wearable/TC/push.sh [deleted file]
wearable/TC/run.sh [deleted file]
wearable/TC/testcase/Makefile [deleted file]
wearable/TC/testcase/test.wav [deleted file]
wearable/TC/testcase/tslist [deleted file]
wearable/TC/testcase/utc_wav_player.c [deleted file]
wearable/TC/tet_scen [deleted file]
wearable/TC/tetbuild.cfg [deleted file]
wearable/TC/tetclean.cfg [deleted file]
wearable/TC/tetexec.cfg [deleted file]
wearable/debian/README [deleted file]
wearable/debian/capi-media-wav-player-dev.install [deleted file]
wearable/debian/capi-media-wav-player-dev.postinst [deleted file]
wearable/debian/capi-media-wav-player.install [deleted file]
wearable/debian/capi-media-wav-player.postinst [deleted file]
wearable/debian/changelog [deleted file]
wearable/debian/compat [deleted file]
wearable/debian/control [deleted file]
wearable/debian/rules [deleted file]
wearable/include/wav_player.h [deleted file]
wearable/src/wav_player.c [deleted file]
wearable/tags [deleted file]

old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/AUTHORS
rename to AUTHORS
similarity index 100%
rename from wearable/CMakeLists.txt
rename to CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/LICENSE
rename to LICENSE
old mode 100755 (executable)
new mode 100644 (file)
similarity index 78%
rename from wearable/doc/wave_player_doc.h
rename to doc/wave_player_doc.h
index 4de3c4e..3660786
 
 /**
  * @file wave_player_doc.h
- * @brief File contains the high level documentation for the WAV Player API.
+ * @brief This file contains high level documentation for the WAV Player API.
  *
  */
 
 /**
- * @defgroup CAPI_MEDIA_WAV_PLAYER_MODULE WAV Player
  * @ingroup CAPI_MEDIA_FRAMEWORK
+ * @defgroup CAPI_MEDIA_WAV_PLAYER_MODULE WAV Player
  */
 
 /**
- * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
- * @brief The @ref CAPI_MEDIA_WAV_PLAYER_MODULE API  provides functions for playing the Waveform Audio File Format. (*.wav)
  * @ingroup CAPI_MEDIA_FRAMEWORK
+ * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
+ * @brief The @ref CAPI_MEDIA_WAV_PLAYER_MODULE API provides functions for playing the waveform audio file format(*.wav).
   * @section CAPI_MEDIA_WAV_PLAYER_MODULE_HEADER Required Header
  *    \#include <wav_player.h>
  *
  * @section CAPI_MEDIA_WAV_PLAYER_OVERVIEW Overview
- * The @ref CAPI_MEDIA_WAV_PLAYER_MODULE API allows you to simply play and stop a wav file. To play a certain wav file, call wave_player_start() with a path to the .wav file. When playing a wav file is finished, wav_player_playback_completed_cb() will be invoked.
+ * The @ref CAPI_MEDIA_WAV_PLAYER_MODULE API allows you to simply play and stop a wav file. To play a certain wav file, call wave_player_start() with a path to the .wav file. 
+ * When playing a wav file is finished, wav_player_playback_completed_cb() will be invoked.
  */
 
 #endif /* __TIZEN_MEDIA_WAV_PLAYER_DOC_H__ */
similarity index 75%
rename from mobile/include/wav_player.h
rename to include/wav_player.h
index 39aa74e..6acd5f1 100644 (file)
@@ -14,9 +14,6 @@
 * limitations under the License. 
 */
 
-
-
-
 #ifndef __TIZEN_MEDIA_WAV_PLAYER_H__
 #define __TIZEN_MEDIA_WAV_PLAYER_H__
 
@@ -28,11 +25,9 @@ extern "C"
 {
 #endif
 
-#define WAV_PLAYER_ERROR_CLASS          TIZEN_ERROR_MULTIMEDIA_CLASS | 0x50
-
 /**
  * @file wav_player.h
- * @brief This file contains the WAV player API
+ * @brief This file contains the WAV player API.
  */
 
 /**
@@ -41,51 +36,43 @@ extern "C"
  */
 
 /**
- * @brief Enumerations of error code for WAV player.
+ * @brief Enumeration of error codes for WAV player.
+ * @since_tizen 2.3
  */
 typedef enum
 {
     WAV_PLAYER_ERROR_NONE        = TIZEN_ERROR_NONE,                      /**< Successful */
     WAV_PLAYER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,       /**< Invalid parameter */
     WAV_PLAYER_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION,       /**< Invalid operation */
-    WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED = WAV_PLAYER_ERROR_CLASS | 0x01                        /**< Not supported format */
+    WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED = TIZEN_ERROR_WAV_PLAYER | 0x01                        /**< Format not supported */
 } wav_player_error_e;
 
 /**
- * @}
- */
-
-
-/**
- * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
- * @{
- */
-
-/**
- * @brief Called when a WAV file has finished playing.
+ * @brief Called when a WAV file is no longer being played.
  * @details This callback is not invoked by calling wav_player_stop().
- *
+ * @since_tizen 2.3
  * @param[in] id       The completed wav player ID
  * @param[in] user_data        The user data passed from the callback registration function
  * @see wav_player_start()
  */
 typedef void (*wav_player_playback_completed_cb)(int id, void *user_data);
 
-
 /**
  * @brief Plays a WAV file.
- * @param[in] path     The WAV file path to play
+ * @since_tizen 2.3
+ * @param[in] path     The WAV file path to the file to be played
  * @param[in] type     The sound type
- * @param[in] callback The callback function to invoke when a WAV file is finished playing
+ * @param[in] callback The callback function to be invoked when a WAV file is no longer being played
  * @param[in] user_data        The user data to be passed to the callback function
- * @param[out] id      The WAV player ID ( can be set to NULL )
+ * @param[out] id      The WAV player ID (can be set to @c NULL)
  *
- * @return 0 on success, otherwise a negative error value.
+ * @return @c 0 on success, 
+ *         otherwise a negative error value
  * @retval #WAV_PLAYER_ERROR_NONE Successful
- * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter 
+ * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #WAV_PLAYER_ERROR_INVALID_OPERATION Invalid operation
  *
- * @post       It invokes wav_player_playback_completed_cb() when a WAV file has finished playing.
+ * @post       It invokes wav_player_playback_completed_cb() when a WAV file is no longer being played.
  * @see wav_player_stop()
  * @see wav_player_playback_completed_cb()
  */
@@ -93,10 +80,11 @@ int wav_player_start(const char *path, sound_type_e type, wav_player_playback_co
 
 /**
  * @brief Stops playing the WAV file.
+ * @since_tizen 2.3
+ * @param[in] id  The WAV player ID to stop
  *
- * @param[in] id       The WAV player ID to stop
- *
- * @return 0 on success, otherwise a negative error value.
+ * @return @c 0 on success, 
+ *         otherwise a negative error value
  * @retval #WAV_PLAYER_ERROR_NONE Successful
  * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter 
  * @retval #WAV_PLAYER_ERROR_INVALID_OPERATION Invalid operation  
diff --git a/include/wav_player_private.h b/include/wav_player_private.h
new file mode 100644 (file)
index 0000000..e6458b6
--- /dev/null
@@ -0,0 +1,59 @@
+/*
+* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+*
+* 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.
+*/
+
+#ifndef __TIZEN_MEDIA_WAV_PLAYER_PRIVATE_H__
+#define __TIZEN_MEDIA_WAV_PLAYER_PRIVATE_H__
+
+#include <tizen.h>
+#include <sound_manager.h>
+#include <sound_manager_internal.h>
+#include <wav_player.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define WAV_PLAYER_ERROR_CLASS          TIZEN_ERROR_MULTIMEDIA_CLASS | 0x50
+
+/**
+ * @file wav_player_private.h
+ * @brief This file contains the WAV player API
+ */
+
+/**
+ * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
+ * @{
+ */
+
+
+typedef struct _cb_data_{
+       wav_player_playback_completed_cb cb;
+       void * user_data;
+} _cb_data;
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+int __convert_wav_player_error_code(const char *func, int code);
+void __internal_complete_cb(void *user_data, int id);
+
+#endif /* __TIZEN_MEDIA_WAV_PLAYER_PRIVATE_H__ */
diff --git a/mobile/AUTHORS b/mobile/AUTHORS
deleted file mode 100755 (executable)
index 0c10a61..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Seungkeun Lee <sngn.lee@samsung.com>
-Kangho Hur <kanho.hur@samsung.com>
-Seungbae Shin <seungbae.shin at samsung dot com>
diff --git a/mobile/CMakeLists.txt b/mobile/CMakeLists.txt
deleted file mode 100755 (executable)
index 3612b63..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-SET(Services 
-        "application"
-        "base"
-        "content"
-        "location"
-        "media"
-        "messaging"
-        "network"
-        "social"
-        "telephony"
-        "system"
-   )
-
-
-# project
-SET(project_prefix "capi")
-SET(prefix "/usr")
-SET(version "0.0.1")
-SET(maintainer "Seungkeun Lee <sngn.lee@samsung.com>, Kangho Hur<kagho.hur@samsung.com>")
-SET(description "A wav player library in Tizen Native API")
-SET(service "media")
-SET(submodule "wav-player")
-
-# for package file
-SET(dependents "mm-sound dlog capi-base-common capi-media-sound-manager")
-SET(pc_dependents "capi-base-common capi-media-sound-manager")
-
-SET(fw_name "${project_prefix}-${service}-${submodule}")
-
-PROJECT(${fw_name})
-
-SET(CMAKE_INSTALL_PREFIX ${prefix})
-SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(VERSION ${version})
-
-SET(INC_DIR include)
-INCLUDE_DIRECTORIES(${INC_DIR})
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_name} REQUIRED ${dependents})
-FOREACH(flag ${${fw_name}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
-SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
-
-IF("${ARCH}" MATCHES "^arm.*")
-    ADD_DEFINITIONS("-DTARGET")
-ENDIF("${ARCH}" MATCHES "^arm.*")
-
-ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
-ADD_DEFINITIONS("-DTIZEN_DEBUG")
-
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
-
-aux_source_directory(src SOURCES)
-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_DIR})
-INSTALL(
-        DIRECTORY ${INC_DIR}/ DESTINATION include/${service}
-        FILES_MATCHING
-        PATTERN "*_private.h" EXCLUDE
-        PATTERN "${INC_DIR}/*.h"
-        )
-
-SET(PC_NAME ${fw_name})
-SET(PC_REQUIRED ${pc_dependents})
-SET(PC_LDFLAGS -l${fw_name})
-
-CONFIGURE_FILE(
-    ${fw_name}.pc.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
-    @ONLY
-)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
-#ADD_SUBDIRECTORY(test)
-
-IF(UNIX)
-
-ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
-ADD_CUSTOM_COMMAND(
-        DEPENDS clean 
-        COMMENT "distribution clean"
-        COMMAND find
-        ARGS    . 
-        -not -name config.cmake -and \(
-        -name tester.c -or
-        -name Testing -or
-        -name CMakeFiles -or
-        -name cmake.depends -or
-        -name cmake.check_depends -or
-        -name CMakeCache.txt -or
-        -name cmake.check_cache -or
-        -name *.cmake -or
-        -name Makefile -or
-        -name core -or
-        -name core.* -or
-        -name gmon.out -or
-        -name install_manifest.txt -or
-        -name *.pc -or
-        -name *~ \)
-        | grep -v TC | xargs rm -rf
-        TARGET  distclean
-        VERBATIM
-)
-
-ENDIF(UNIX)
diff --git a/mobile/LICENSE.APLv2 b/mobile/LICENSE.APLv2
deleted file mode 100755 (executable)
index 8aa906c..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 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/mobile/NOTICE b/mobile/NOTICE
deleted file mode 100644 (file)
index ccdad52..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Apache License, Version 2.
-Please, see the LICENSE file for Apache License terms and conditions.
diff --git a/mobile/capi-media-wav-player.manifest b/mobile/capi-media-wav-player.manifest
deleted file mode 100644 (file)
index a76fdba..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-</manifest>
diff --git a/mobile/capi-media-wav-player.pc.in b/mobile/capi-media-wav-player.pc.in
deleted file mode 100644 (file)
index 1997d91..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# Package Information for pkg-config
-
-prefix=@PREFIX@
-exec_prefix=/usr
-libdir=@LIB_INSTALL_DIR@
-includedir=/usr/include/media
-
-Name: @PC_NAME@
-Description: @PACKAGE_DESCRIPTION@
-Version: @VERSION@
-Requires: @PC_REQUIRED@ 
-Libs: -L${libdir} @PC_LDFLAGS@
-Cflags: -I${includedir}
-
diff --git a/mobile/test/CMakeLists.txt b/mobile/test/CMakeLists.txt
deleted file mode 100644 (file)
index 353da53..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-SET(fw_test "${fw_name}-test")
-
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_test} REQUIRED mm-sound glib-2.0 gthread-2.0 capi-media-sound-manager)
-FOREACH(flag ${${fw_test}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-    MESSAGE(${flag})
-ENDFOREACH()
-
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall")
-
-#ADD_EXECUTABLE("system-sensor" system-sensor.c)
-#TARGET_LINK_LIBRARIES("system-sensor" ${fw_name} ${${fw_test}_LDFLAGS})
-
-aux_source_directory(. sources)
-FOREACH(src ${sources})
-    GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)
-    MESSAGE("${src_name}")
-    ADD_EXECUTABLE(${src_name} ${src})
-    TARGET_LINK_LIBRARIES(${src_name} ${fw_name} ${${fw_test}_LDFLAGS})
-ENDFOREACH()
diff --git a/mobile/test/multimedia_wav_player_test.c b/mobile/test/multimedia_wav_player_test.c
deleted file mode 100755 (executable)
index d9d5c8d..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* 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. 
-*/
-
-
-
-#include <stdio.h>
-#include <wav_player.h>
-#include <glib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-static GMainLoop *g_mainloop = NULL;
-static GThread *event_thread;
-
-gpointer GmainThread(gpointer data){
-       g_mainloop = g_main_loop_new (NULL, 0);
-       g_main_loop_run (g_mainloop);
-
-       return NULL;
-}
-
-void _player_stop_cb(int id, void *user_data){
-       printf("complete id = %d,%d\n", id, (int)user_data);
-}
-
-
-
-void wav_play_test(){
-       int ret=0;
-       int id;
-       int i;
-       for(i =0 ; i < 100; i++){       
-               ret = wav_player_start("test.wav", SOUND_TYPE_MEDIA, _player_stop_cb,(void*)i, &id);
-               printf("wav_player_start(%d)(id=%d) ret = %d\n",i,id, ret);
-
-       }
-}
-
-void audio_io_test(){
-       
-}
-
-int main(int argc, char**argv)
-{
-       if( !g_thread_supported() )
-       {
-               g_thread_init(NULL);
-       }
-
-       GError *gerr = NULL;
-       event_thread = g_thread_create(GmainThread, NULL, 1, &gerr);
-
-       wav_play_test();
-       return 0;
-}
diff --git a/mobile/test/test.wav b/mobile/test/test.wav
deleted file mode 100755 (executable)
index 033d815..0000000
Binary files a/mobile/test/test.wav and /dev/null differ
diff --git a/packaging/capi-media-wav-player-0.1.0.tar.gz b/packaging/capi-media-wav-player-0.1.0.tar.gz
deleted file mode 100644 (file)
index 91b24e4..0000000
Binary files a/packaging/capi-media-wav-player-0.1.0.tar.gz and /dev/null differ
index 1d394d5..2405a34 100644 (file)
@@ -1,13 +1,8 @@
+#sbs-git:slp/api/wav-player capi-media-wav-player 0.1.0 8d904bb3bd0ca7fa01ebd8f4185e4b993d94c08d
 Name:       capi-media-wav-player
-Summary:    A wav player library in Tizen C API
-%if 0%{?tizen_profile_mobile}
-Version: 0.1.0
-Release:    16
-%else
-Version:    0.1.2
+Summary:    A wav player library in SLP C API
+Version:    0.1.12
 Release:    0
-VCS:        framework/api/wav-player#capi-media-wav-player_0.1.0-10_1-3-g8d8a814371b4a4fd114ccfd8b8ed61b8655e699f
-%endif
 Group:      TO_BE/FILLED_IN
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -18,55 +13,40 @@ BuildRequires:  pkgconfig(capi-base-common)
 BuildRequires:  pkgconfig(capi-media-sound-manager)
 Requires(post): /sbin/ldconfig  
 Requires(postun): /sbin/ldconfig
+Requires(post): libprivilege-control
 
 %description
 
 
 %package devel
-Summary:  A wav player library in Tizen C API (Development)
+Summary:  A wav player library in SLP C API (Development)
 Group:    TO_BE/FILLED_IN
 Requires: %{name} = %{version}-%{release}
 
 %description devel
 
 
-
 %prep
 %setup -q
 
 
 %build
-%if 0%{?tizen_profile_mobile}
-cd mobile
-%else
-cd wearable
-%endif
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%if 0%{?tizen_profile_mobile}
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-%else
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-%endif
 
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
-%if 0%{?tizen_profile_mobile}
-cd mobile
-%else
-cd wearable
-%endif
 mkdir -p %{buildroot}/usr/share/license
-%if 0%{?tizen_profile_mobile}
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-%else
 cp LICENSE %{buildroot}/usr/share/license/%{name}
-%endif
+mkdir -p %{buildroot}/usr/share/privilege-control
 
 %make_install
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/usr/bin/api_feature_loader --verbose --dir=/usr/share/privilege-control
 
 %postun -p /sbin/ldconfig
 
@@ -74,11 +54,7 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 %files
 %{_libdir}/libcapi-media-wav-player.so.*
 %{_datadir}/license/%{name}
-%if 0%{?tizen_profile_mobile}
-%manifest mobile/capi-media-wav-player.manifest
-%else
-%manifest wearable/capi-media-wav-player.manifest
-%endif
+%manifest capi-media-wav-player.manifest
 
 %files devel
 %{_includedir}/media/*.h
diff --git a/packaging/capi-media-wav-player.spec.mobile b/packaging/capi-media-wav-player.spec.mobile
deleted file mode 100644 (file)
index d86c23d..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#sbs-git:slp/api/wav-player capi-media-wav-player 0.1.0 8d904bb3bd0ca7fa01ebd8f4185e4b993d94c08d
-Name:       capi-media-wav-player
-Summary:    A wav player library in Tizen C API
-Version: 0.1.0
-Release:    16
-Group:      TO_BE/FILLED_IN
-License:    Apache License, Version 2.0
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires:  cmake
-BuildRequires:  pkgconfig(mm-sound)
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(capi-base-common)
-BuildRequires:  pkgconfig(capi-media-sound-manager)
-Requires(post): /sbin/ldconfig  
-Requires(postun): /sbin/ldconfig
-
-%description
-
-
-%package devel
-Summary:  A wav player library in Tizen C API (Development)
-Group:    TO_BE/FILLED_IN
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-
-
-
-%prep
-%setup -q
-
-
-%build
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
-
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
-%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-%files
-%{_libdir}/libcapi-media-wav-player.so.*
-%{_datadir}/license/%{name}
-%manifest capi-media-wav-player.manifest
-
-%files devel
-%{_includedir}/media/*.h
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/libcapi-media-wav-player.so
old mode 100755 (executable)
new mode 100644 (file)
similarity index 52%
rename from mobile/src/wav_player.c
rename to src/wav_player.c
index eebede9..70afc9a
 #include <string.h>
 #include <unistd.h>
 #include <dlog.h>
-#include <wav_player.h>
+#include "wav_player.h"
+#include "wav_player_private.h"
 #include <stdlib.h>
 
 
-typedef struct _cb_data_{
-       wav_player_playback_completed_cb cb;
-       void * uesr_data;
-       int id;
-} _cb_data;
-
-
-
-static int __convert_wav_player_error_code(const char *func, int code){
-       int ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-       char *errorstr = NULL;
-       switch(code)
-       {
-               case MM_ERROR_NONE:
-                       ret = WAV_PLAYER_ERROR_NONE;
-                       errorstr = "ERROR_NONE";
-                       break;
-               case MM_ERROR_INVALID_ARGUMENT: 
-               case MM_ERROR_SOUND_INVALID_POINTER:
-               case WAV_PLAYER_ERROR_INVALID_PARAMETER:                        
-                       ret = WAV_PLAYER_ERROR_INVALID_PARAMETER;
-                       errorstr = "INVALID_PARAMETER";                 
-                       break;
-               case MM_ERROR_SOUND_INTERNAL:
-                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-                       errorstr = "INVALID_OPERATION";                 
-                       break;
-               case MM_ERROR_SOUND_UNSUPPORTED_MEDIA_TYPE:
-                       ret = WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED;
-                       errorstr = "FORMAT_NOT_SUPPORTED";
-                       break;
-               default:
-                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-                       errorstr = "INVALID_OPERATION";
-                       
-       }       
-       LOGE( "[%s] %s(0x%08x)",func, errorstr, ret);
-       return ret;
-}
-
-
-static void __internal_complete_cb(void *user_data){
-       _cb_data * cb_data = (_cb_data*)user_data;
-       if(!cb_data)
-               return;
-       
-       if( cb_data->cb )
-               cb_data->cb(cb_data->id, cb_data->uesr_data);
-       free(cb_data);  
-}
-
-
-int wav_player_start(const char *path,  sound_type_e type , wav_player_playback_completed_cb cb, void *user_data,  int * id){
-       int ret ; 
-       int player;
+int wav_player_start(const char *path, sound_type_e type, wav_player_playback_completed_cb cb, void *user_data,  int * id)
+{
+       int ret = MM_ERROR_NONE;
+       int player = -1;
        char m_path[PATH_MAX];
-       void (*_completed_cb)(void *);
+       void (*_completed_cb)(void *, int);
        _completed_cb = NULL;
        _cb_data *cb_data = NULL;
-       
-       
+
+
        if( path == NULL)
                return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
 
-       if( type < SOUND_TYPE_SYSTEM || type >  SOUND_TYPE_CALL )
+       if( type < SOUND_TYPE_SYSTEM || type >= SOUND_TYPE_NUM )
                return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
 
        m_path[0] = '\0';
@@ -110,23 +60,24 @@ int wav_player_start(const char *path,  sound_type_e type , wav_player_playback_
                if(cb_data == NULL )
                        return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_OPERATION);
                cb_data->cb = cb;
-               cb_data->uesr_data = user_data;         
+               cb_data->user_data = user_data;
        }
-       
+
+
        ret = mm_sound_play_sound(m_path, type, _completed_cb , cb_data, &player);
-       if( ret == 0 && id != NULL)
-               *id = player;           
-       if( ret == 0 && cb_data )
-               cb_data->id = player;
-       
+
+       if( ret == 0 && id != NULL){
+               *id = player;
+       }
+
        if( ret != 0 && cb_data != NULL)
                free(cb_data);
 
-                       
        return __convert_wav_player_error_code(__func__, ret);
 }
 
-int wav_player_stop(int id){
+int wav_player_stop(int id)
+{
        return __convert_wav_player_error_code(__func__, mm_sound_stop_sound(id));
 }
 
diff --git a/src/wav_player_private.c b/src/wav_player_private.c
new file mode 100644 (file)
index 0000000..b856fd5
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
+*
+* 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.
+*/
+
+
+#define LOG_TAG "CAPI_MEDIA_WAV_PLAYER"
+
+#include <mm_sound.h>
+#include <mm_sound_private.h>
+#include <stdio.h>
+#include <limits.h>
+#include <string.h>
+#include <unistd.h>
+#include <dlog.h>
+#include <stdlib.h>
+#include "wav_player_private.h"
+
+int __convert_wav_player_error_code(const char *func, int code)
+{
+       int ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
+       char *errorstr = NULL;
+       switch(code)
+       {
+               case MM_ERROR_NONE:
+                       ret = WAV_PLAYER_ERROR_NONE;
+                       errorstr = "ERROR_NONE";
+                       break;
+               case MM_ERROR_INVALID_ARGUMENT:
+               case MM_ERROR_SOUND_INVALID_POINTER:
+               case WAV_PLAYER_ERROR_INVALID_PARAMETER:
+                       ret = WAV_PLAYER_ERROR_INVALID_PARAMETER;
+                       errorstr = "INVALID_PARAMETER";
+                       break;
+               case MM_ERROR_SOUND_INTERNAL:
+                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
+                       errorstr = "INVALID_OPERATION";
+                       break;
+               case MM_ERROR_SOUND_UNSUPPORTED_MEDIA_TYPE:
+                       ret = WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED;
+                       errorstr = "FORMAT_NOT_SUPPORTED";
+                       break;
+               default:
+                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
+                       errorstr = "INVALID_OPERATION";
+                       break;
+       }
+       LOGE( "[%s] %s(0x%08x)",func, errorstr, ret);
+       return ret;
+}
+
+
+void __internal_complete_cb(void *user_data, int id)
+{
+       _cb_data * cb_data = (_cb_data*)user_data;
+       if(!cb_data)
+               return;
+
+       if( cb_data->cb ){
+               LOGD( "user callback for handle %d call", id);
+               cb_data->cb(id, cb_data->user_data);
+       }
+       free(cb_data);
+}
+
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/test/multimedia_wav_player_test.c
rename to test/multimedia_wav_player_test.c
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from wearable/test/test.wav
rename to test/test.wav
diff --git a/wearable/TC/README.txt b/wearable/TC/README.txt
deleted file mode 100644 (file)
index be8526e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-mediafile "testcase/test.wav"
diff --git a/wearable/TC/_export_env.sh b/wearable/TC/_export_env.sh
deleted file mode 100755 (executable)
index 72a11ec..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-. ./config
-export TET_INSTALL_PATH=$TET_INSTALL_HOST_PATH # tetware root path
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target # tetware target path
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-export TET_ROOT=$TET_TARGET_PATH
diff --git a/wearable/TC/_export_target_env.sh b/wearable/TC/_export_target_env.sh
deleted file mode 100755 (executable)
index 5ddaa53..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-. ./config
-export TET_INSTALL_PATH=$TET_INSTALL_TARGET_PATH # path to path
-export TET_TARGET_PATH=$TET_INSTALL_PATH/tetware-target
-export PATH=$TET_TARGET_PATH/bin:$PATH
-export LD_LIBRARY_PATH=$TET_TARGET_PATH/lib/tet3:$LD_LIBRARY_PATH
-export TET_ROOT=$TET_TARGET_PATH
diff --git a/wearable/TC/build.sh b/wearable/TC/build.sh
deleted file mode 100755 (executable)
index 72aad6c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-. ./_export_env.sh                              # setting environment variables
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/build-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -c -p ./
-tcc -b -j $JOURNAL_RESULT -p ./
-grw -c 7 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/wearable/TC/clean.sh b/wearable/TC/clean.sh
deleted file mode 100755 (executable)
index 29743e0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. ./_export_env.sh                              # setting environment variables
-
-export TET_SUITE_ROOT=`pwd`
-RESULT_DIR=results
-
-tcc -c -p ./                                # executing tcc, with clean option (-c)
-rm -r $RESULT_DIR
-rm -r tet_tmp_dir
-rm testcase/tet_captured
diff --git a/wearable/TC/config b/wearable/TC/config
deleted file mode 100644 (file)
index 7bb4e10..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-PKG_NAME=wav-player
-TET_INSTALL_HOST_PATH=/var/tmp/dts_fw/TC/TETware
-TET_INSTALL_TARGET_PATH=/opt/home/$PKG_NAME/TETware
diff --git a/wearable/TC/config.default b/wearable/TC/config.default
deleted file mode 100644 (file)
index 12ac1e2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-CAPI_PROJECT_ROOT=/home/abyss/capi
-TET_INSTALL_HOST_PATH=/home/abyss/TETware
-TET_INSTALL_TARGET_PATH=/mnt/nfs/TETware
diff --git a/wearable/TC/execute.sh b/wearable/TC/execute.sh
deleted file mode 100755 (executable)
index a4f6095..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-. ./_export_target_env.sh                    # setting environment variables
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -e -j $JOURNAL_RESULT -p ./
-grw -c 3 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/wearable/TC/push.sh b/wearable/TC/push.sh
deleted file mode 100755 (executable)
index 5eb9510..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. ./config
-
-TC_PATH=/opt/home/$PKG_NAME
-
-echo $TC_PATH
-
-sdb shell "mkdir -p $TC_PATH"
-
-sdb push . $TC_PATH
-
-
diff --git a/wearable/TC/run.sh b/wearable/TC/run.sh
deleted file mode 100755 (executable)
index cec5778..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-source ./_export_target_env.sh
-
-export TET_SUITE_ROOT=`pwd`
-FILE_NAME_EXTENSION=`date +%s`
-
-RESULT_DIR=results
-HTML_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.html
-JOURNAL_RESULT=$RESULT_DIR/exec-tar-result-$FILE_NAME_EXTENSION.journal
-
-mkdir -p $RESULT_DIR
-
-tcc -e -j $JOURNAL_RESULT -p ./
-grw -c 7 -f chtml -o $HTML_RESULT $JOURNAL_RESULT
diff --git a/wearable/TC/testcase/Makefile b/wearable/TC/testcase/Makefile
deleted file mode 100755 (executable)
index dc0d3b1..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-CC ?= gcc
-
-C_FILES = $(shell ls *.c)
-
-PKGS = capi-media-wav-player dlog glib-2.0
-
-LDFLAGS = `pkg-config --libs $(PKGS)`
-LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
-LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
-
-CFLAGS = -I. `pkg-config --cflags $(PKGS)`
-CFLAGS += -I$(TET_ROOT)/inc/tet3
-CFLAGS += -Wall
-
-#TARGETS = $(C_FILES:%.c=tc-%)
-TCS := $(shell ls -1 *.c | cut -d. -f1)
-
-all: $(TCS)
-
-%: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
-
-clean:
-       rm -f $(TCS)
diff --git a/wearable/TC/testcase/test.wav b/wearable/TC/testcase/test.wav
deleted file mode 100755 (executable)
index 02fbe63..0000000
Binary files a/wearable/TC/testcase/test.wav and /dev/null differ
diff --git a/wearable/TC/testcase/tslist b/wearable/TC/testcase/tslist
deleted file mode 100644 (file)
index a6629f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/testcase/utc_wav_player
diff --git a/wearable/TC/testcase/utc_wav_player.c b/wearable/TC/testcase/utc_wav_player.c
deleted file mode 100755 (executable)
index ce23111..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
-* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* 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. 
-*/
-
-
-
-
-#include <tet_api.h>
-#include <wav_player.h>
-#include <pthread.h>
-
-#define TESTFILE "./test.wav"
-
-
-#define API_NAME_WAVPL_START "wav_player_start_playing"
-#define API_NAME_WAVPL_STOP "wav_player_stop_playing"
-#define API_NAME_WAVPL_CALLBACK "wav_player_stop_callback"
-
-
-#define MY_ASSERT( fun , test , msg ) \
-{\
-       if( !test ) \
-               dts_fail(fun , msg ); \
-}              
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-
-
-struct
-{
-       int proc_result;
-       int proc_id;
-} glob;
-
-
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-// basic tests for start and stop of play
-static void utc_wav_player_start_p(void);
-static void utc_wav_player_start_n(void);
-static void utc_wav_player_stop_p(void);
-static void utc_wav_player_stop_n(void);
-
-static void utc_wav_player_callback_p(void);
-static void utc_wav_player_callback2_p(void);
-
-
-// more sophisticated tests for input parameters
-static void utc_wav_player_wrong_param_n(void);
-static void utc_wav_player_wrong_param2_n(void);
-static void utc_wav_player_wrong_param3_n(void);
-
-
-struct tet_testlist tet_testlist[] = {
-       { utc_wav_player_start_p , 1 },
-       { utc_wav_player_start_n , 2 },
-       { utc_wav_player_stop_p, 3 },
-       { utc_wav_player_stop_n, 4 },
-       { utc_wav_player_callback_p, 5 },
-       { utc_wav_player_callback2_p, 6 },      
-       { utc_wav_player_wrong_param_n, 7 },
-       { utc_wav_player_wrong_param2_n, 8 },
-       { utc_wav_player_wrong_param3_n, 9 },
-       { NULL, 0 },
-};
-
-
-static void startup(void)
-{
-       /* start of TC */
-}
-
-static void cleanup(void)
-{
-       /* end of TC */
-}
-
-
-
-//**********************************************************************/
-
-
-/**
- * @brief all parameters fine, play music
- */
-static void utc_wav_player_start_p(void)
-{
-       int ret;
-       ret = wav_player_start(TESTFILE, SOUND_TYPE_MEDIA, NULL, NULL, NULL);
-       dts_check_eq( API_NAME_WAVPL_START, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief lack of sound file path
- */
-static void utc_wav_player_start_n(void)
-{
-       int ret;
-       ret = wav_player_start(NULL, SOUND_TYPE_MEDIA, NULL, NULL, NULL);
-       dts_check_ne( API_NAME_WAVPL_START, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief stop playing, all parameters fine
- */
-static void utc_wav_player_stop_p(void)
-{
-       int ret;
-       int id;
-       ret = wav_player_start(TESTFILE, SOUND_TYPE_MEDIA, NULL, NULL, &id);
-       ret = wav_player_stop(id);
-       dts_check_eq( API_NAME_WAVPL_STOP, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief stop playing, wrong id of playing process
- */
-static void utc_wav_player_stop_n(void)
-{
-       int ret;
-       ret = wav_player_stop(-1);
-       dts_check_ne( API_NAME_WAVPL_STOP, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-//**********************************************************************/
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief wrong parameter: wrong file name
- */
-static void utc_wav_player_wrong_param_n(void)
-{
-       int ret;
-       char file_name[100] = { '\0' };
-       snprintf( file_name, 100 ,  "%s", TESTFILE );
-       snprintf( file_name, 100 ,  "%s", "something" );
-       
-       ret = wav_player_start( file_name, SOUND_TYPE_MEDIA, NULL, NULL, NULL );
-       dts_check_ne( API_NAME_WAVPL_START, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief wrong parameter: wrong media file type
- */
-static void utc_wav_player_wrong_param2_n(void)
-{
-       int ret;
-
-       ret = wav_player_start( TESTFILE, SOUND_TYPE_CALL + 1, NULL, NULL, NULL );
-       dts_check_ne( API_NAME_WAVPL_START, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-
-//**********************************************************************/
-
-
-
-/**
- * @brief wrong parameter: wrong media file type
- */
-static void utc_wav_player_wrong_param3_n(void)
-{
-       int ret;
-
-       ret = wav_player_start( TESTFILE, -1, NULL, NULL, NULL );
-       dts_check_ne( API_NAME_WAVPL_START, ret, WAV_PLAYER_ERROR_NONE );
-}
-
-
-//************************************************************************/
-
-void _playback_completed_cb(int id, void *user_data){
-       int *result = (int*)user_data;
-       *result = 1;
-}
-
-static void utc_wav_player_callback_p(void)
-{
-       int ret ;
-       int result = 0;
-       
-       ret = wav_player_start( TESTFILE, SOUND_TYPE_MEDIA, _playback_completed_cb, &result, NULL );    
-       sleep(6);
-       dts_check_eq( API_NAME_WAVPL_CALLBACK, result , 1 );
-       
-}
-
-//************************************************************************/
-
-void _playback_completed_cb2(int id, void *user_data){
-       int *result = (int*)user_data;
-       *result = id;
-}
-
-
-static void utc_wav_player_callback2_p(void){
-
-       int ret ;
-       int callback_id = 0;
-       int id;
-       
-       ret = wav_player_start( TESTFILE, SOUND_TYPE_MEDIA, _playback_completed_cb2, &callback_id, &id );       
-
-       sleep(6);
-       dts_check_eq( API_NAME_WAVPL_CALLBACK, callback_id , id );
-
-       
-}
diff --git a/wearable/TC/tet_scen b/wearable/TC/tet_scen
deleted file mode 100755 (executable)
index 03f029a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-all
-       ^TEST
-##### Scenarios for TEST #####
-
-# Test scenario
-TEST
-       :include:/testcase/tslist
diff --git a/wearable/TC/tetbuild.cfg b/wearable/TC/tetbuild.cfg
deleted file mode 100755 (executable)
index f7eda55..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TET_OUTPUT_CAPTURE=True # capture option for build operation checking
-TET_BUILD_TOOL=make # build with using make command
-TET_BUILD_FILE=-f Makefile # execution file (Makefile) for build
-TET_API_COMPLIANT=True # use TET API in Test Case ?
-TET_PASS_TC_NAME=True # report passed TC name in Journal file?
diff --git a/wearable/TC/tetclean.cfg b/wearable/TC/tetclean.cfg
deleted file mode 100755 (executable)
index 02d7030..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TET_OUTPUT_CAPTURE=True # capture option
-TET_CLEAN_TOOL= make clean # clean tool
-TET_CLEAN_FILE= Makefile # file for clean
-TET_API_COMPLIANT=True # TET API useage 
-TET_PASS_TC_NAME=True # showing name , passed TC
diff --git a/wearable/TC/tetexec.cfg b/wearable/TC/tetexec.cfg
deleted file mode 100755 (executable)
index ef3e452..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-TET_OUTPUT_CAPTURE=True # capturing execution or not
-TET_EXEC_TOOL=  # ex) exec : execution tool set up/ Optional
-TET_EXEC_FILE=   # ex) exectool : execution file/ Optional
-TET_API_COMPLIANT=True # Test case or Tool usesTET API?
-TET_PASS_TC_NAME=True # showing Passed TC name ?
diff --git a/wearable/debian/README b/wearable/debian/README
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/wearable/debian/capi-media-wav-player-dev.install b/wearable/debian/capi-media-wav-player-dev.install
deleted file mode 100644 (file)
index 761a28b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/include/*
-/usr/include/*/*
-/usr/lib/pkgconfig/*.pc
-
diff --git a/wearable/debian/capi-media-wav-player-dev.postinst b/wearable/debian/capi-media-wav-player-dev.postinst
deleted file mode 100644 (file)
index 1a24852..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
diff --git a/wearable/debian/capi-media-wav-player.install b/wearable/debian/capi-media-wav-player.install
deleted file mode 100644 (file)
index 4a755a4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/lib*.so*
diff --git a/wearable/debian/capi-media-wav-player.postinst b/wearable/debian/capi-media-wav-player.postinst
deleted file mode 100644 (file)
index 1a24852..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/sh
diff --git a/wearable/debian/changelog b/wearable/debian/changelog
deleted file mode 100644 (file)
index 7c72fdc..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-capi-media-wav-player (0.1.0-12) unstable; urgency=low
-
-  * Update LOG_TAG
-  * Git: framework/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-12
-
- -- YoungHun Kim <yh8004.kim@samsung.com>  Wed, 02 Jan 2013 15:22:35 +0900
-
-capi-media-wav-player (0.1.0-10) unstable; urgency=low
-
-  * Fix dependency
-  * Git: slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-10
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Wed, 14 Mar 2012 13:45:34 +0900
-
-capi-media-wav-player (0.1.0-9) unstable; urgency=low
-
-  * add static keyword , add sound-manager-dev depends
-  * Git: slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-9
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Mon, 27 Feb 2012 19:37:29 +0900
-
-capi-media-wav-player (0.1.0-8) unstable; urgency=low
-
-  * add so version
-  * Git: slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-8
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Tue, 14 Feb 2012 17:00:57 +0900
-
-capi-media-wav-player (0.1.0-7) unstable; urgency=low
-
-  * update parameter check code
-  * Git: slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-7
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Wed, 21 Dec 2011 20:04:57 +0900
-
-capi-media-wav-player (0.1.0-6) unstable; urgency=low
-
-  * Update error none value
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-6
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Mon, 05 Dec 2011 11:11:04 +0900
-
-capi-media-wav-player (0.1.0-5) unstable; urgency=low
-
-  * Update log formatting
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-5
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Sun, 27 Nov 2011 14:24:24 +0900
-
-capi-media-wav-player (0.1.0-4) unstable; urgency=low
-
-  * Static analysis bug fix
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-4
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Fri, 25 Nov 2011 09:57:34 +0900
-
-capi-media-wav-player (0.1.0-3) unstable; urgency=low
-
-  * update namespace
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-3
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Wed, 23 Nov 2011 13:08:19 +0900
-
-capi-media-wav-player (0.1.0-2) unstable; urgency=low
-
-  * update complete callback signature
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-2
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Tue, 22 Nov 2011 08:50:29 +0900
-
-capi-media-wav-player (0.1.0-1) unstable; urgency=low
-
-  * SDK API Baseline
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.1.0-1 
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Tue, 27 Sep 2011 17:48:47 +0900
-
-capi-media-wav-player (0.0.1-4) unstable; urgency=low
-
-  * update wav_player_playback_completed_cb
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.0.1-4
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Thu, 22 Sep 2011 09:46:11 +0900
-
-capi-media-wav-player (0.0.1-3) unstable; urgency=low
-
-  * Update dependancy
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.0.1-3
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Mon, 29 Aug 2011 17:32:48 +0900
-
-capi-media-wav-player (0.0.1-2) unstable; urgency=low
-
-  * Update dependancy
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.0.1-2 
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Mon, 29 Aug 2011 14:58:29 +0900
-
-capi-media-wav-player (0.0.1-1) unstable; urgency=low
-
-  * Initial Upload
-  * Git: slp-source.sec.samsung.net:slp/api/wav-player
-  * Tag: capi-media-wav-player_0.0.1-1
-
- -- Seungkeun Lee <sngn.lee@samsung.com>  Thu, 04 Aug 2011 17:32:41 +0900
diff --git a/wearable/debian/compat b/wearable/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/wearable/debian/control b/wearable/debian/control
deleted file mode 100755 (executable)
index e290640..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Source: capi-media-wav-player
-Section: libs
-Priority: extra
-Maintainer: Seungkeun Lee <sngn.lee@samsung.com>, Kangho Hur<kagho.hur@samsung.com>
-Build-Depends: debhelper (>= 5), libmm-sound-dev , capi-base-common-dev , dlog-dev, capi-media-sound-manager-dev
-
-Package: capi-media-wav-player
-Architecture: any
-Depends: ${shilbs:Depends}, ${misc:Depends} 
-Description: A wav player library in Tizen Native API
-
-Package: capi-media-wav-player-dev
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-media-wav-player (= ${Source-Version}), capi-base-common-dev, capi-media-sound-manager-dev
-Description: A wav player library in Tizen Native API (DEV)
-
-Package: capi-media-wav-player-dbg
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, capi-media-wav-player (= ${Source-Version})
-Description: A wav player library in Tizen Native API (DBG)
-
diff --git a/wearable/debian/rules b/wearable/debian/rules
deleted file mode 100755 (executable)
index bd059be..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-
-CFLAGS = -Wall -g
-
-FULLVER ?= $(shell dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
-MAJORVER ?= $(shell echo $(FULLVER) | cut -d '.' -f 1)
-
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-CMAKE_ROOT_DIR ?= $(CURDIR)
-CMAKE_BUILD_DIR ?= $(CURDIR)/cmake_build_tmp
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       mkdir -p $(CMAKE_BUILD_DIR) && cd $(CMAKE_BUILD_DIR) && cmake .. -DFULLVER=${FULLVER} -DMAJORVER=${MAJORVER}
-       touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp 
-       dh_testdir
-       cd $(CMAKE_BUILD_DIR) && $(MAKE)
-       touch $@
-
-clean:
-       cd $(CMAKE_ROOT_DIR)
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       rm -f 
-       rm -rf $(CMAKE_BUILD_DIR)
-       dh_clean
-       
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       cd $(CMAKE_BUILD_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-binary-indep: build install
-
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-       dh_installman
-       dh_link
-       dh_strip --dbg-package=capi-media-wav-player-dbg
-       dh_fixperms
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
diff --git a/wearable/include/wav_player.h b/wearable/include/wav_player.h
deleted file mode 100644 (file)
index 7aaaa60..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* 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. 
-*/
-
-
-
-
-#ifndef __TIZEN_MEDIA_WAV_PLAYER_H__
-#define __TIZEN_MEDIA_WAV_PLAYER_H__
-
-#include <tizen.h>
-#include <sound_manager.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define WAV_PLAYER_ERROR_CLASS          TIZEN_ERROR_MULTIMEDIA_CLASS | 0x50
-
-/**
- * @file wav_player.h
- * @brief This file contains the WAV player API
- */
-
-/**
- * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
- * @{
- */
-
-/**
- * @brief Enumerations of error code for WAV player.
- */
-typedef enum
-{
-    WAV_PLAYER_ERROR_NONE        = TIZEN_ERROR_NONE,                      /**< Successful */
-    WAV_PLAYER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,       /**< Invalid parameter */
-    WAV_PLAYER_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION,       /**< Invalid operation */
-    WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED = WAV_PLAYER_ERROR_CLASS | 0x01                        /**< Not supported format */
-} wav_player_error_e;
-
-/**
- * @}
- */
-
-
-/**
- * @addtogroup CAPI_MEDIA_WAV_PLAYER_MODULE
- * @{
- */
-
-/**
- * @brief Called when a WAV file has finished playing.
- * @details This callback is not invoked by calling wav_player_stop().
- *
- * @param[in] id       The completed wav player ID
- * @param[in] user_data        The user data passed from the callback registration function
- * @see wav_player_start()
- */
-typedef void (*wav_player_playback_completed_cb)(int id, void *user_data);
-
-
-/**
- * @brief Plays a WAV file.
- * @param[in] path     The WAV file path to play
- * @param[in] type     The sound type
- * @param[in] callback The callback function to invoke when a WAV file is finished playing
- * @param[in] user_data        The user data to be passed to the callback function
- * @param[out] id      The WAV player ID ( can be set to NULL )
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #WAV_PLAYER_ERROR_NONE Successful
- * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter 
- * @retval #WAV_PLAYER_ERROR_INVALID_OPERATION Invalid operation
- *
- * @post       It invokes wav_player_playback_completed_cb() when a WAV file has finished playing.
- * @see wav_player_stop()
- * @see wav_player_playback_completed_cb()
- */
-int wav_player_start(const char *path, sound_type_e type, wav_player_playback_completed_cb callback, void *user_data, int *id);
-
-/**
- * @brief Plays a WAV file (with no session).
- * @param[in] path     The WAV file path to play
- * @param[in] type     The sound type
- * @param[in] force_to_route_spk       Route output path to speaker
- * @param[in] callback The callback function to invoke when a WAV file is finished playing
- * @param[in] user_data        The user data to be passed to the callback function
- * @param[out] id      The WAV player ID ( can be set to NULL )
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #WAV_PLAYER_ERROR_NONE Successful
- * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #WAV_PLAYER_ERROR_INVALID_OPERATION Invalid operation
- *
- * @post       It invokes wav_player_playback_completed_cb() when a WAV file has finished playing.
- * @see wav_player_stop()
- * @see wav_player_playback_completed_cb()
- */
-int wav_player_start_solo(const char *path, sound_type_e type, bool force_to_route_spk, wav_player_playback_completed_cb cb, void *user_data,  int * id);
-
-/**
- * @brief Stops playing the WAV file.
- *
- * @param[in] id       The WAV player ID to stop
- *
- * @return 0 on success, otherwise a negative error value.
- * @retval #WAV_PLAYER_ERROR_NONE Successful
- * @retval #WAV_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter 
- * @retval #WAV_PLAYER_ERROR_INVALID_OPERATION Invalid operation  
- *
- * @see        wav_player_start()
- */
-int wav_player_stop(int id);
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TIZEN_MEDIA_WAV_PLAYER_H__ */
diff --git a/wearable/src/wav_player.c b/wearable/src/wav_player.c
deleted file mode 100755 (executable)
index ad16ba2..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-* Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* 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. 
-*/
-
-
-#define LOG_TAG "CAPI_MEDIA_WAV_PLAYER"
-
-#include <mm_sound.h>
-#include <mm_sound_private.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-#include <unistd.h>
-#include <dlog.h>
-#include <wav_player.h>
-#include <stdlib.h>
-
-
-typedef struct _cb_data_{
-       wav_player_playback_completed_cb cb;
-       void * user_data;
-} _cb_data;
-
-
-
-static int __convert_wav_player_error_code(const char *func, int code)
-{
-       int ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-       char *errorstr = NULL;
-       switch(code)
-       {
-               case MM_ERROR_NONE:
-                       ret = WAV_PLAYER_ERROR_NONE;
-                       errorstr = "ERROR_NONE";
-                       break;
-               case MM_ERROR_INVALID_ARGUMENT: 
-               case MM_ERROR_SOUND_INVALID_POINTER:
-               case WAV_PLAYER_ERROR_INVALID_PARAMETER:                        
-                       ret = WAV_PLAYER_ERROR_INVALID_PARAMETER;
-                       errorstr = "INVALID_PARAMETER";                 
-                       break;
-               case MM_ERROR_SOUND_INTERNAL:
-                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-                       errorstr = "INVALID_OPERATION";                 
-                       break;
-               case MM_ERROR_SOUND_UNSUPPORTED_MEDIA_TYPE:
-                       ret = WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED;
-                       errorstr = "FORMAT_NOT_SUPPORTED";
-                       break;
-               default:
-                       ret = WAV_PLAYER_ERROR_INVALID_OPERATION;
-                       errorstr = "INVALID_OPERATION";
-                       
-       }       
-       LOGE( "[%s] %s(0x%08x)",func, errorstr, ret);
-       return ret;
-}
-
-
-static void __internal_complete_cb(void *user_data, int id)
-{
-       _cb_data * cb_data = (_cb_data*)user_data;
-       if(!cb_data)
-               return;
-       
-       if( cb_data->cb ){
-               LOGD( "user callback for handle %d call", id);
-               cb_data->cb(id, cb_data->user_data);
-       }
-       free(cb_data);
-}
-
-
-int wav_player_start(const char *path, sound_type_e type, wav_player_playback_completed_cb cb, void *user_data,  int * id)
-{
-       int ret ;
-       int player;
-       char m_path[PATH_MAX];
-       void (*_completed_cb)(void *, int);
-       _completed_cb = NULL;
-       _cb_data *cb_data = NULL;
-       
-       
-       if( path == NULL)
-               return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
-
-       if( type < SOUND_TYPE_SYSTEM || type > SOUND_TYPE_FIXED_CAMCORDING )
-               return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
-       if (type >= SOUND_TYPE_FIXED ) {
-               LOGW( "type is %d, we force to set SOUND_TYPE_FIXED", type);
-               type = VOLUME_TYPE_FIXED;
-       }
-
-       m_path[0] = '\0';
-       if( path[0] != '/' ){
-
-               if( getcwd(m_path, PATH_MAX) != NULL){
-                       strncat(m_path, "/",PATH_MAX-strlen(m_path) );
-               }
-       }
-       strncat(m_path, path, PATH_MAX-strlen(m_path));
-
-       if( cb ){
-               _completed_cb = __internal_complete_cb;
-               cb_data = (_cb_data *)malloc(sizeof(_cb_data));
-               if(cb_data == NULL )
-                       return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_OPERATION);
-               cb_data->cb = cb;
-               cb_data->user_data = user_data;
-       }
-
-       
-       ret = mm_sound_play_sound(m_path, type, _completed_cb , cb_data, &player);
-
-       if( ret == 0 && id != NULL){
-               *id = player;
-       }
-       
-       if( ret != 0 && cb_data != NULL)
-               free(cb_data);
-
-       return __convert_wav_player_error_code(__func__, ret);
-}
-
-int wav_player_start_solo(const char *path, sound_type_e type, bool force_to_route_spk, wav_player_playback_completed_cb cb, void *user_data, int * id)
-{
-       int ret ;
-       int player;
-       char m_path[PATH_MAX];
-       void (*_completed_cb)(void *, int);
-       _completed_cb = NULL;
-       _cb_data *cb_data = NULL;
-
-
-       if( path == NULL) {
-               return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
-       }
-
-       if( type < SOUND_TYPE_SYSTEM || type > SOUND_TYPE_FIXED_CAMCORDING ) {
-               return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_PARAMETER);
-       }
-
-       m_path[0] = '\0';
-       if( path[0] != '/' ){
-               if( getcwd(m_path, PATH_MAX) != NULL){
-                       strncat(m_path, "/",PATH_MAX-strlen(m_path) );
-               }
-       }
-       strncat(m_path, path, PATH_MAX-strlen(m_path));
-
-       if( cb ){
-               _completed_cb = __internal_complete_cb;
-               cb_data = (_cb_data *)malloc(sizeof(_cb_data));
-               if(cb_data == NULL )
-                       return __convert_wav_player_error_code(__func__, WAV_PLAYER_ERROR_INVALID_OPERATION);
-               cb_data->cb = cb;
-               cb_data->user_data = user_data;
-       }
-
-       if( type < SOUND_TYPE_FIXED ) {
-               ret = mm_sound_play_solo_sound(m_path, type, _completed_cb , cb_data, &player);
-       } else {
-               int volume_config = VOLUME_TYPE_FIXED;
-               switch (type) {
-               case SOUND_TYPE_FIXED:
-                       volume_config |= VOLUME_GAIN_DEFAULT;
-                       break;
-               case SOUND_TYPE_FIXED_AF:
-                       volume_config |= VOLUME_GAIN_AF;
-                       break;
-               case SOUND_TYPE_FIXED_SHUTTER1:
-                       volume_config |= VOLUME_GAIN_SHUTTER1;
-                       break;
-               case SOUND_TYPE_FIXED_SHUTTER2:
-                       volume_config |= VOLUME_GAIN_SHUTTER2;
-                       break;
-               case SOUND_TYPE_FIXED_CAMCORDING:
-                       volume_config |= VOLUME_GAIN_CAMCORDING;
-                       break;
-               default:
-                       break;
-               }
-               if (force_to_route_spk) {
-                       ret = mm_sound_play_loud_solo_sound(m_path, volume_config, _completed_cb , cb_data, &player);
-               } else {
-                       ret = mm_sound_play_solo_sound(m_path, volume_config, _completed_cb , cb_data, &player);
-               }
-       }
-       if( ret == 0 && id != NULL) {
-               *id = player;
-       }
-
-       if( ret != 0 && cb_data != NULL) {
-               free(cb_data);
-       }
-
-       return __convert_wav_player_error_code(__func__, ret);
-}
-
-int wav_player_stop(int id)
-{
-       return __convert_wav_player_error_code(__func__, mm_sound_stop_sound(id));
-}
-
diff --git a/wearable/tags b/wearable/tags
deleted file mode 100644 (file)
index 5ebee78..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-!_TAG_FILE_FORMAT      2       /extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED      1       /0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR   Darren Hiebert  /dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME     Exuberant Ctags //
-!_TAG_PROGRAM_URL      http://ctags.sourceforge.net    /official site/
-!_TAG_PROGRAM_VERSION  5.8     //
--dbg-package   debian/rules    /^      dh_strip --dbg-package=capi-media-wav-player-dbg$/;"    m
--sourcedir     debian/rules    /^      dh_install --sourcedir=debian\/tmp$/;"  m
-CC     TC/testcase/Makefile    /^CC ?= gcc$/;" m
-CFLAGS TC/testcase/Makefile    /^CFLAGS = -I. `pkg-config --cflags $(PKGS)`$/;"        m
-CFLAGS debian/rules    /^CFLAGS = -Wall -g$/;" m
-CMAKE_BUILD_DIR        debian/rules    /^CMAKE_BUILD_DIR ?= $(CURDIR)\/cmake_build_tmp$/;"     m
-CMAKE_ROOT_DIR debian/rules    /^CMAKE_ROOT_DIR ?= $(CURDIR)$/;"       m
-C_FILES        TC/testcase/Makefile    /^C_FILES = $(shell ls *.c)$/;" m
-DLOG_D src/wav_player.c        22;"    d       file:
-DLOG_I src/wav_player.c        21;"    d       file:
-DLOG_V src/wav_player.c        20;"    d       file:
-GmainThread    test/multimedia_wav_player_test.c       /^gpointer GmainThread(gpointer data){$/;"      f
-LDFLAGS        TC/testcase/Makefile    /^LDFLAGS = `pkg-config --libs $(PKGS)`$/;"     m
-LOG_TAG        src/wav_player.c        19;"    d       file:
-MY_ASSERT      TC/testcase/utc_wav_player.c    24;"    d       file:
-NEGATIVE_TC_IDX        TC/testcase/utc_wav_player.c    /^      NEGATIVE_TC_IDX,$/;"    e       enum:__anon1    file:
-PKGS   TC/testcase/Makefile    /^PKGS = capi-media-wav-player dlog glib-2.0$/;"        m
-POSITIVE_TC_IDX        TC/testcase/utc_wav_player.c    /^      POSITIVE_TC_IDX = 0x01,$/;"     e       enum:__anon1    file:
-TCS    TC/testcase/Makefile    /^TCS := $(shell ls -1 *.c | cut -d. -f1)$/;"   m
-TESTFILE       TC/testcase/utc_wav_player.c    22;"    d       file:
-WAV_PLAYER_ERROR_CLASS include/wav_player.h    32;"    d
-WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED  include/wav_player.h    /^    WAV_PLAYER_ERROR_FORMAT_NOT_SUPPORTED = WAV_PLAYER_ERROR_CLASS | 0x01                       \/**< Not supported format *\/$/;"    e       enum:__anon2
-WAV_PLAYER_ERROR_INVALID_OPERATION     include/wav_player.h    /^    WAV_PLAYER_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION,       \/**< Invalid operation *\/$/;" e       enum:__anon2
-WAV_PLAYER_ERROR_INVALID_PARAMETER     include/wav_player.h    /^    WAV_PLAYER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,       \/**< Invalid parameter *\/$/;" e       enum:__anon2
-WAV_PLAYER_ERROR_NONE  include/wav_player.h    /^    WAV_PLAYER_ERROR_NONE        = TIZEN_ERROR_OK,                      \/**< Successful *\/$/;"      e       enum:__anon2
-__TIZEN_MEDIA_WAV_PLAYER_H__   include/wav_player.h    22;"    d
-_cb_data       src/wav_player.c        /^} _cb_data;$/;"       t       typeref:struct:_cb_data_        file:
-_cb_data_      src/wav_player.c        /^typedef struct _cb_data_{$/;" s       file:
-_convert_wav_player_error_code src/wav_player.c        /^int _convert_wav_player_error_code(int code){$/;"     f
-_internal_complete_cb  src/wav_player.c        /^void _internal_complete_cb(void *user_data){$/;"      f
-_player_stop_cb        test/multimedia_wav_player_test.c       /^void _player_stop_cb(int id, void *user_data){$/;"    f
-audio_io_test  test/multimedia_wav_player_test.c       /^void audio_io_test(){$/;"     f
-cb     src/wav_player.c        /^      wav_player_playback_completed_cb cb;$/;"        m       struct:_cb_data_        file:
-cleanup        TC/testcase/utc_wav_player.c    /^static void cleanup(void)$/;" f       file:
-event_thread   test/multimedia_wav_player_test.c       /^static GThread *event_thread;$/;"     v       file:
-g_mainloop     test/multimedia_wav_player_test.c       /^static GMainLoop *g_mainloop = NULL;$/;"      v       file:
-id     src/wav_player.c        /^      int id;$/;"     m       struct:_cb_data_        file:
-main   test/multimedia_wav_player_test.c       /^int main(int argc, char**argv)$/;"    f
-startup        TC/testcase/utc_wav_player.c    /^static void startup(void)$/;" f       file:
-tet_cleanup    TC/testcase/utc_wav_player.c    /^void (*tet_cleanup)(void) = cleanup;$/;"      v
-tet_startup    TC/testcase/utc_wav_player.c    /^void (*tet_startup)(void) = startup;$/;"      v
-tet_testlist   TC/testcase/utc_wav_player.c    /^struct tet_testlist tet_testlist[] = {$/;"    v       typeref:struct:tet_testlist
-uesr_data      src/wav_player.c        /^      void * uesr_data;$/;"   m       struct:_cb_data_        file:
-utc_wav_player_start_n TC/testcase/utc_wav_player.c    /^static void utc_wav_player_start_n(void){$/;" f       file:
-utc_wav_player_start_p TC/testcase/utc_wav_player.c    /^static void utc_wav_player_start_p(void){$/;" f       file:
-utc_wav_player_stop_n  TC/testcase/utc_wav_player.c    /^static void utc_wav_player_stop_n(void){$/;"  f       file:
-utc_wav_player_stop_p  TC/testcase/utc_wav_player.c    /^static void utc_wav_player_stop_p(void){$/;"  f       file:
-wav_play_test  test/multimedia_wav_player_test.c       /^void wav_play_test(){$/;"     f
-wav_player_error_e     include/wav_player.h    /^} wav_player_error_e;$/;"     t       typeref:enum:__anon2
-wav_player_playback_completed_cb       include/wav_player.h    /^typedef void (*wav_player_playback_completed_cb)(int id, void *user_data);$/;"        t
-wav_player_start       src/wav_player.c        /^int wav_player_start(const char *path,  sound_type_e type , wav_player_playback_completed_cb cb, void *user_data,  int * id){$/;"     f
-wav_player_stop        src/wav_player.c        /^int wav_player_stop(int id){$/;"      f