Modify tone-player/wav-player api name as per ACR-857

Use tone_player_start_new() instead of tone_player_start_with_stream_info()
Use wav_player_start_new() instead of wav_player_start_with_stream_info()

Change-Id: I8aae9cf3d878a2083bab37c52b0d86853863575f

diff --git a/module/src/callmgr-ringer.c b/module/src/callmgr-ringer.c
index 34bf3bc935814762aba7609fa5cecba8623d57a7..b28c85fe97b8e4f982f5f4512df948bde43622f3 100644 (file)
--- a/module/src/callmgr-ringer.c
+++ b/module/src/callmgr-ringer.c
@@ -672,8 +672,8 @@ int _callmgr_ringer_play_local_ringback_tone(callmgr_ringer_handle_h ringer_hand
                return -1;
        }
 
-       if (TONE_PLAYER_ERROR_NONE != tone_player_start_with_stream_info(TONE_TYPE_ANSI_RINGTONE, ringer_handle->ringtone_stream_handle , -1, &ringer_handle->ringback_tone_play_handle)) {
-               err("Error tone_player_start_with_stream_info");
+       if (TONE_PLAYER_ERROR_NONE != tone_player_start_new(TONE_TYPE_ANSI_RINGTONE, ringer_handle->ringtone_stream_handle , -1, &ringer_handle->ringback_tone_play_handle)) {
+               err("tone_player_start_new() is failed");
                ringer_handle->ringback_tone_play_handle = -1;
                return -1;
        }
@@ -744,13 +744,13 @@ int _callmgr_ringer_start_alternate_tone(callmgr_ringer_handle_h ringer_handle)
                return -1;
        }
 
-       ret = tone_player_start_with_stream_info(TONE_TYPE_SUP_CALL_WAITING, ringer_handle->ringtone_stream_handle, 4000, &ringer_handle->alternate_tone_handle);
+       ret = tone_player_start_new(TONE_TYPE_SUP_CALL_WAITING, ringer_handle->ringtone_stream_handle, 4000, &ringer_handle->alternate_tone_handle);
        if (ret != TONE_PLAYER_ERROR_NONE) {
-               err("tone_player_start_with_stream_info() failed");
+               err("tone_player_start_new() is failed");
                return -1;
        }
 
-       info("tone_player_start_with_stream_info done");
+       info("_callmgr_ringer_start_alternate_tone() is done");
 
        ringer_handle->current_status = CM_RINGER_STATUS_RINGING_E;
        ringer_handle->waiting_tone_timer = g_timeout_add(CALLMGR_2ND_CALL_BEEP_INTERVAL, __callmgr_waiting_tone_play_end_cb, (gpointer)ringer_handle);
@@ -837,9 +837,9 @@ int _callmgr_ringer_play_effect(callmgr_ringer_handle_h ringer_handle, cm_ringer
                return -1;
        }
 
-       ret = wav_player_start_with_stream_info((const char *)effect_path, ringer_handle->ringtone_stream_handle, __callmgr_ringer_play_effect_finish_cb, (void *)ringer_handle, &(ringer_handle->play_effect_handle));
+       ret = wav_player_start_new((const char *)effect_path, ringer_handle->ringtone_stream_handle, __callmgr_ringer_play_effect_finish_cb, (void *)ringer_handle, &(ringer_handle->play_effect_handle));
        if (ret != WAV_PLAYER_ERROR_NONE) {
-               err("wav_player_start_with_stream_info failed:[%d]", ret);
+               err("wav_player_start_new() is failed:[%d][%s]", ret, get_error_message(ret));
                g_free(effect_path);
                return -1;
        }
@@ -932,14 +932,14 @@ int _callmgr_ringer_play_signal(callmgr_ringer_handle_h ringer_handle, cm_ringer
 
        switch (signal_type) {
        case CM_RINGER_SIGNAL_USER_BUSY_TONE_E:
-               ret = tone_player_start_with_stream_info(TONE_TYPE_SUP_BUSY, ringer_handle->ringtone_stream_handle, 5000, &ringer_handle->signal_play_handle);
+               ret = tone_player_start_new(TONE_TYPE_SUP_BUSY, ringer_handle->ringtone_stream_handle, 5000, &ringer_handle->signal_play_handle);
                break;
        case CM_RINGER_SIGNAL_WRONG_NUMBER_TONE_E:
        case CM_RINGER_SIGNAL_CALL_FAIL_TONE_E:
-               ret = tone_player_start_with_stream_info(TONE_TYPE_SUP_ERROR, ringer_handle->ringtone_stream_handle, 2000, &ringer_handle->signal_play_handle);
+               ret = tone_player_start_new(TONE_TYPE_SUP_ERROR, ringer_handle->ringtone_stream_handle, 2000, &ringer_handle->signal_play_handle);
                break;
        case CM_RINGER_SIGNAL_NW_CONGESTION_TONE_E:
-               ret = tone_player_start_with_stream_info(TONE_TYPE_SUP_CONGESTION, ringer_handle->ringtone_stream_handle, 2000, &ringer_handle->signal_play_handle);
+               ret = tone_player_start_new(TONE_TYPE_SUP_CONGESTION, ringer_handle->ringtone_stream_handle, 2000, &ringer_handle->signal_play_handle);
                break;
        default:
                err("Invalid Signal Type");

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 052243cd8d1c89bf46b70bf22154a7d9a2738458..6e488978ab70529a36e666aaeb2b88ae6e292771 100644 (file)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 95
+%define patchlevel 96
 %define ext_feature 0
 
 Name:           call-manager