Merge branch 'tizen_3.0' into tizen

Change-Id: I6e1769fda3d0f0ff076d0c5c2874a4e8002eeb65

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13ebcaa..b8ab841 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,16 +87,18 @@ CONFIGURE_FILE(
 )
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
+IF(TIZEN_FEATURE_TESTSUITE)
 ADD_SUBDIRECTORY(test)
+ENDIF(TIZEN_FEATURE_TESTSUITE)
 
 IF(UNIX)
 
 ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution)
 ADD_CUSTOM_COMMAND(
-        DEPENDS clean 
+        DEPENDS clean
         COMMENT "distribution clean"
         COMMAND find
-        ARGS    . 
+        ARGS    .
         -not -name config.cmake -and \(
         -name tester.c -or
         -name Testing -or

diff --git a/include/wav_player.h b/include/wav_player.h
index 8989ea1..197d337 100644 (file)
--- a/include/wav_player.h
+++ b/include/wav_player.h
@@ -74,7 +74,7 @@ typedef void (*wav_player_playback_completed_cb)(int id, void *user_data);
 
 
 /**
- * @deprecated Deprecated since 3.0. Use wav_player_start_new() instead.
+ * @deprecated Deprecated since 3.0. Use wav_player_start_with_stream_info() instead.
  * @brief Plays a WAV file.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
  *
@@ -128,9 +128,6 @@ int wav_player_start(const char *path, sound_type_e type, wav_player_playback_co
  */
 int wav_player_start_new(const char *path, sound_stream_info_h stream_info, wav_player_playback_completed_cb callback, void *user_data, int *id);
 
-/* Note : Will be removed after migration to wav_player_start_new */
-int wav_player_start_with_stream_info(const char *path, sound_stream_info_h stream_info, wav_player_playback_completed_cb callback, void *user_data, int *id);
-
 /**
  * @brief Stops playing the WAV file.
  * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif

diff --git a/packaging/capi-media-wav-player.spec b/packaging/capi-media-wav-player.spec
index ac2083e..2e600eb 100755 (executable)
--- a/packaging/capi-media-wav-player.spec
+++ b/packaging/capi-media-wav-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-wav-player
 Summary:    A wav player library in Tizen C API
-Version:    0.1.23
+Version:    0.1.25
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -29,7 +29,12 @@ cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
+%if "%{TIZEN_PRODUCT_TV}" != "1"
+    -DTIZEN_FEATURE_TESTSUITE=On
+%else
+    -DTIZEN_FEATURE_TESTSUITE=Off
+%endif
 %__make %{?jobs:-j%jobs}
 
 %install
@@ -43,7 +48,9 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %manifest %{name}.manifest
 %license LICENSE.APLv2
 %{_libdir}/libcapi-media-wav-player.so.*
+%if "%{TIZEN_PRODUCT_TV}" != "1"
 %{_bindir}/wav_player_test
+%endif
 
 %files devel
 %manifest %{name}.manifest

diff --git a/src/wav_player.c b/src/wav_player.c
index 059c9fa..a8f3049 100755 (executable)
--- a/src/wav_player.c
+++ b/src/wav_player.c
@@ -81,12 +81,6 @@ int wav_player_start_new(const char *path, sound_stream_info_h stream_info, wav_
        return _start_with_stream_info(path, stream_info, 1, callback, user_data, id);
 }
 
-/* Note : Will be removed after migration to wav_player_start_new */
-int wav_player_start_with_stream_info(const char *path, sound_stream_info_h stream_info, wav_player_playback_completed_cb callback, void *user_data, int *id)
-{
-       return _start_with_stream_info(path, stream_info, 1, callback, user_data, id);
-}
-
 int wav_player_stop(int id)
 {
        return _convert_wav_player_error_code(__func__, mm_sound_stop_sound(id));