[Feature][ZXW-69] Remove the call hold and unhold API and add the qser_voice_call_switch_waiting_or_holding_and_active API
Change-Id: I14a50278e4141d1037328cc0e496f3a8374025f4
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
old mode 100644
new mode 100755
index 528acc0..13622db
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/include/lynq-qser-voice.h
@@ -86,9 +86,7 @@
int qser_voice_call_answer(voice_client_handle_type h_voice,
int call_id );
-int qser_voice_call_hold( voice_client_handle_type h_voice);
-
-int qser_voice_call_unhold(voice_client_handle_type h_voice);
+int qser_voice_call_switch_waiting_or_holding_and_active(voice_client_handle_type h_voice);
//Set voice call waiting
int qser_voice_call_setwaiting
@@ -98,7 +96,7 @@
);
//Get voice call waiting status
-int qser_voice_call_getwaitingsatus
+int qser_voice_call_getwaitingstatus
(
int h_voice,
qser_voice_call_waiting_service_t *pe_service
diff --git a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
index faa1a1b..1799ea1 100755
--- a/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
+++ b/cap/zx297520v3/src/lynq/lib/liblynq-qser-voice/lynq-qser-voice.cpp
@@ -99,7 +99,7 @@
int qser_voice_call_client_deinit(voice_client_handle_type h_voice)
{
- if (NULL == h_voice)
+ if (0 == h_voice)
{
LYERRLOG("init first");
return RESULT_ERROR;
@@ -150,7 +150,7 @@
s_lynq_voice_tid = -1;
}
s_voice_thread_status = 0;
- s_voice_cb == NULL;
+ s_voice_cb = NULL;
return RESULT_OK;
}
@@ -187,7 +187,7 @@
return lynq_call_answer();
}
-int qser_voice_call_getwaitingsatus(int h_voice,qser_voice_call_waiting_service_t *pe_service)
+int qser_voice_call_getwaitingstatus(int h_voice,qser_voice_call_waiting_service_t *pe_service)
{
LYINFLOG("To be completed");
return RESULT_OK;
@@ -199,17 +199,8 @@
return RESULT_OK;
}
-int qser_voice_call_hold(voice_client_handle_type h_voice)
-{
- if (h_voice == 0)
- {
- LYERRLOG("init first");
- return RESULT_ERROR;
- }
- return lynq_switch_waiting_or_holding_and_active();
-}
-int qser_voice_call_unhold(voice_client_handle_type h_voice)
+int qser_voice_call_switch_waiting_or_holding_and_active(voice_client_handle_type h_voice)
{
if (h_voice == 0)
{