diff --git a/src/call.cpp b/src/call.cpp index 0f3b1087ff348e58962ef2fd732953473d4b3c2c..e2f359e053943681958c6c64c8d189bda577d96b 100644 --- a/src/call.cpp +++ b/src/call.cpp @@ -243,7 +243,7 @@ Call::getDetails() const return { {DRing::Call::Details::CALL_TYPE, ring::to_string(type_)}, {DRing::Call::Details::PEER_NUMBER, peerNumber_}, - {DRing::Call::Details::DISPLAY_NAME, displayName_}, + {DRing::Call::Details::DISPLAY_NAME, peerDisplayName_}, {DRing::Call::Details::CALL_STATE, getStateStr()}, {DRing::Call::Details::CONF_ID, confID_}, {DRing::Call::Details::TIMESTAMP_START, ring::to_string(timestamp_start_)}, diff --git a/src/call.h b/src/call.h index 4c4590e8b7cbf88a7b874c59192d7e3ff3a1c843..0a3da8a714822063bf287b9ae40f2fa2ef76af45 100644 --- a/src/call.h +++ b/src/call.h @@ -136,8 +136,8 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> { * not protected by mutex (when created) * @return std::string The peer display name */ - void setDisplayName(const std::string& name) { - displayName_ = name; + void setPeerDisplayName(const std::string& name) { + peerDisplayName_ = name; } /** @@ -145,8 +145,8 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> { * not protected by mutex (when created) * @return std::string The peer name */ - const std::string& getDisplayName() const { - return displayName_; + const std::string& getPeerDisplayName() const { + return peerDisplayName_; } /** @@ -380,8 +380,8 @@ class Call : public Recordable, public std::enable_shared_from_this<Call> { /** Number of the peer */ std::string peerNumber_ {}; - /** Display Name */ - std::string displayName_ {}; + /** Peer Display Name */ + std::string peerDisplayName_ {}; time_t timestamp_start_ {0}; time_t timestamp_stop_ {0}; diff --git a/src/iax/iaxvoiplink.cpp b/src/iax/iaxvoiplink.cpp index 025a0f1f0bc98f0a6ffa7df2eca3f6c11b5ffe92..089ced15d223109de25d6e2067a1e55eda079439 100644 --- a/src/iax/iaxvoiplink.cpp +++ b/src/iax/iaxvoiplink.cpp @@ -419,7 +419,7 @@ void IAXVoIPLink::iaxHandlePrecallEvent(iax_event* event) call->setPeerNumber(event->ies.calling_number); if (event->ies.calling_name) - call->setDisplayName(std::string(event->ies.calling_name)); + call->setPeerDisplayName(std::string(event->ies.calling_name)); // if peerNumber exist append it to the name string if (event->ies.calling_number) diff --git a/src/manager.cpp b/src/manager.cpp index 43fba280664136a35415a2ee86f1f51f7b9b6f73..8a98e0fded1cb18267acd1f562cfd4874f5d5fbe 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -1622,7 +1622,7 @@ Manager::incomingCall(Call &call, const std::string& accountId) std::string from("<" + number + ">"); - emitSignal<DRing::CallSignal::IncomingCall>(accountId, callID, call.getDisplayName() + " " + from); + emitSignal<DRing::CallSignal::IncomingCall>(accountId, callID, call.getPeerDisplayName() + " " + from); } //THREAD=VoIP diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp index e49f4c50c0aa231d730e968fabe735695b677e93..3774bf0dc2782906be3d53c17c6b43683858455e 100644 --- a/src/sip/sipvoiplink.cpp +++ b/src/sip/sipvoiplink.cpp @@ -237,7 +237,7 @@ transaction_request_cb(pjsip_rx_data *rdata) } const auto& account_id = account->getAccountID(); - std::string displayName(sip_utils::parseDisplayName(rdata->msg_info.msg_buf)); + auto peerDisplayName = sip_utils::parseDisplayName(rdata->msg_info.msg_buf); pjsip_msg_body *body = rdata->msg_info.msg->body; if (method->id == PJSIP_OTHER_METHOD) { @@ -335,7 +335,7 @@ transaction_request_cb(pjsip_rx_data *rdata) call->setConnectionState(Call::PROGRESSING); call->setPeerNumber(peerNumber); - call->setDisplayName(displayName); + call->setPeerDisplayName(peerDisplayName); call->initRecFilename(peerNumber); call->setCallMediaLocal(addrToUse); call->getSDP().setPublishedIP(addrSdp);