mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(app): many changes

Browse source
This commit is contained in:
Ronan Abhamon 2017-04-19 11:05:38 +02:00
parent 7c92738cd7
commit 75c11911ac
5 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/Utils.cpp
View file

@ -20,7 +20,7 @@
* Author: Ronan Abhamon
*/
#include "utils.hpp"
#include "Utils.hpp"
// =============================================================================

38
linphone-desktop/src/components/call/CallModel.cpp
View file

@ -426,25 +426,6 @@ inline QVariantMap createStat (const QString &key, const QString &value) {
return m;
}
inline QString iceStateToString (linphone::IceState state) const {
switch (state) {
case linphone::IceStateNotActivated:
return tr("iceStateNotActivated");
case linphone::IceStateFailed:
return tr("iceStateFailed");
case linphone::IceStateInProgress:
return tr("iceStateInProgress");
case linphone::IceStateReflexiveConnection:
return tr("iceStateReflexiveConnection");
case linphone::IceStateHostConnection:
return tr("iceStateHostConnection");
case linphone::IceStateRelayConnection:
return tr("iceStateRelayConnection");
default:
return tr("iceStateInvalid");
}
}
void CallModel::updateStats (const linphone::CallStats &callStats, QVariantList &stats) {
QString family;
shared_ptr<const linphone::CallParams> params = mLinphoneCall->getCurrentParams();
@ -512,3 +493,22 @@ void CallModel::updateStats (const linphone::CallStats &callStats, QVariantList
break;
}
}
QString CallModel::iceStateToString (linphone::IceState state) const {
switch (state) {
case linphone::IceStateNotActivated:
return tr("iceStateNotActivated");
case linphone::IceStateFailed:
return tr("iceStateFailed");
case linphone::IceStateInProgress:
return tr("iceStateInProgress");
case linphone::IceStateReflexiveConnection:
return tr("iceStateReflexiveConnection");
case linphone::IceStateHostConnection:
return tr("iceStateHostConnection");
case linphone::IceStateRelayConnection:
return tr("iceStateRelayConnection");
default:
return tr("iceStateInvalid");
}
}

2
linphone-desktop/src/components/call/CallModel.hpp
View file

@ -128,6 +128,8 @@ private:
QVariantList getVideoStats () const;
void updateStats (const linphone::CallStats &callStats, QVariantList &stats);
QString iceStateToString (linphone::IceState state) const;
bool mPausedByRemote = false;
bool mPausedByUser = false;
bool mRecording = false;

4
linphone-desktop/ui/modules/Linphone/Calls/Calls.js
View file

@ -16,10 +16,10 @@ var MAP_STATUS_TO_PARAMS = (function () {
handler: (function () { call.pausedByUser = true }),
name: qsTr('pauseCall')
}, {
handler: (function () { call.transfer() }),
handler: call.transfer,
name: qsTr('transferCall')
}, {
handler: (function () { call.terminate() }),
handler: call.terminate,
name: qsTr('terminateCall')
}],
component: callActions,

12
linphone-desktop/ui/views/App/Calls/Incall.qml
View file

@ -85,12 +85,16 @@ Rectangle {
CallStatistics {
id: callStatistics
call: incall.call
height: container.height
width: container.width
launcher: callQuality
relativeTo: callQuality
relativeY: info.height + elapsedTime.height * 2
call: incall.call
width: container.width
height: container.height
launcher: callQuality
}
}