mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-21 13:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(ui/views/App/Calls/Incall): supports set/unset video in call

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-02 12:07:17 +01:00
parent 38b629fac1
commit 2402bb2f25
8 changed files with 127 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-desktop/assets/languages/en.ts
View file

@ -363,6 +363,14 @@ Server url not configured.</translation>
<source>saveScreenshotTitle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>acceptVideoDescription</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>acceptVideoTitle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>MainWindow</name>

8
linphone-desktop/assets/languages/fr.ts
View file

@ -351,6 +351,14 @@ Url du serveur non configurée.</translation>
<source>saveScreenshotTitle</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>acceptVideoDescription</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>acceptVideoTitle</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>IncomingCall</name>

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

@ -36,6 +36,20 @@ CallModel::CallModel (shared_ptr<linphone::Call> linphone_call) {
m_paused_by_user = false;
break;
case linphone::CallStateUpdatedByRemote: {
shared_ptr<linphone::Core> core = CoreManager::getInstance()->getCore();
if (
!m_linphone_call->getCurrentParams()->videoEnabled() &&
m_linphone_call->getRemoteParams()->videoEnabled()
) {
CoreManager::getInstance()->getCore()->deferCallUpdate(m_linphone_call);
emit videoRequested();
}
}
break;
default:
break;
}
@ -63,6 +77,16 @@ void CallModel::transfer () {
// TODO
}
void CallModel::acceptVideoRequest () {
shared_ptr<linphone::CallParams> params = m_linphone_call->getCurrentParams()->copy();
params->enableVideo(true);
CoreManager::getInstance()->getCore()->acceptCallUpdate(m_linphone_call, params);
}
void CallModel::rejectVideoRequest () {
CoreManager::getInstance()->getCore()->acceptCallUpdate(m_linphone_call, m_linphone_call->getCurrentParams());
}
// -----------------------------------------------------------------------------
QString CallModel::getSipAddress () const {
@ -135,6 +159,15 @@ bool CallModel::getPausedByUser () const {
}
void CallModel::setPausedByUser (bool status) {
switch (m_linphone_call->getState()) {
case linphone::CallStateConnected:
case linphone::CallStateStreamsRunning:
case linphone::CallStatePaused:
case linphone::CallStatePausedByRemote:
break;
default: return;
}
if (status) {
if (!m_paused_by_user)
CoreManager::getInstance()->getCore()->pauseCall(m_linphone_call);
@ -146,20 +179,24 @@ void CallModel::setPausedByUser (bool status) {
CoreManager::getInstance()->getCore()->resumeCall(m_linphone_call);
}
bool CallModel::getVideoInputEnabled () const {
shared_ptr<linphone::CallParams> params = m_linphone_call->getRemoteParams();
return params && params->videoEnabled() && getStatus() == CallStatusConnected;
}
void CallModel::setVideoInputEnabled (bool status) {
// TODO
}
bool CallModel::getVideoOutputEnabled () const {
bool CallModel::getVideoEnabled () const {
shared_ptr<linphone::CallParams> params = m_linphone_call->getCurrentParams();
return params && params->videoEnabled() && getStatus() == CallStatusConnected;
}
void CallModel::setVideoOutputEnabled (bool status) {
// TODO
void CallModel::setVideoEnabled (bool status) {
switch (m_linphone_call->getState()) {
case linphone::CallStateConnected:
case linphone::CallStateStreamsRunning:
break;
default: return;
}
if (status == getVideoEnabled())
return;
shared_ptr<linphone::CallParams> params = CoreManager::getInstance()->getCore()->createCallParams(m_linphone_call);
params->enableVideo(status);
CoreManager::getInstance()->getCore()->updateCall(m_linphone_call, params);
}

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

@ -16,8 +16,7 @@ class CallModel : public QObject {
Q_PROPERTY(float quality READ getQuality CONSTANT); // Same idea.
Q_PROPERTY(bool microMuted READ getMicroMuted WRITE setMicroMuted NOTIFY microMutedChanged);
Q_PROPERTY(bool pausedByUser READ getPausedByUser WRITE setPausedByUser NOTIFY statusChanged);
Q_PROPERTY(bool videoInputEnabled READ getVideoInputEnabled WRITE setVideoInputEnabled NOTIFY statusChanged);
Q_PROPERTY(bool videoOutputEnabled READ getVideoOutputEnabled WRITE setVideoOutputEnabled NOTIFY statusChanged);
Q_PROPERTY(bool videoEnabled READ getVideoEnabled WRITE setVideoEnabled NOTIFY statusChanged);
public:
enum CallStatus {
@ -43,9 +42,13 @@ public:
Q_INVOKABLE void terminate ();
Q_INVOKABLE void transfer ();
Q_INVOKABLE void acceptVideoRequest ();
Q_INVOKABLE void rejectVideoRequest ();
signals:
void statusChanged (CallStatus status);
void microMutedChanged (bool status);
void videoRequested ();
private:
QString getSipAddress () const;
@ -64,11 +67,8 @@ private:
bool getPausedByUser () const;
void setPausedByUser (bool status);
bool getVideoInputEnabled () const;
void setVideoInputEnabled (bool status);
bool getVideoOutputEnabled () const;
void setVideoOutputEnabled (bool status);
bool getVideoEnabled () const;
void setVideoEnabled (bool status);
bool m_micro_muted = false;
bool m_paused_by_remote = false;

2
linphone-desktop/ui/views/App/Calls/AbstractStartingCall.qml
View file

@ -10,6 +10,8 @@ import App.Styles 1.0
// =============================================================================
Rectangle {
property var call
default property alias _actionArea: actionArea.data
property var _contactObserver: SipAddressesModel.getContactObserver(sipAddress)

25
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file

@ -15,11 +15,10 @@ Window {
// ---------------------------------------------------------------------------
property var call: calls.selectedCall
readonly property bool chatIsOpened: !rightPaned.isClosed()
// `{}` is a workaround to avoid `TypeError: Cannot read property...` in `Incall` component.
property var call: calls.selectedCall || {}
property string sipAddress: call.sipAddress || ''
property string sipAddress: call ? call.sipAddress : ''
// ---------------------------------------------------------------------------
@ -122,19 +121,28 @@ Window {
Component {
id: incomingCall
IncomingCall {}
IncomingCall {
call: window.call
}
}
Component {
id: outgoingCall
OutgoingCall {}
OutgoingCall {
call: window.call
}
}
Component {
id: incall
Incall {}
Incall {
// `{}` is a workaround to avoid `TypeError: Cannot read property...` in `Incall` component.
call: window.call || ({
videoEnabled: false
})
}
}
Component {
@ -151,7 +159,12 @@ Window {
childA: Loader {
anchors.fill: parent
sourceComponent: {
if (!window.call) {
return null
}
var status = window.call.status
if (status == null) {
return null

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

@ -17,13 +17,36 @@ Rectangle {
// ---------------------------------------------------------------------------
property var call
property var _contactObserver: SipAddressesModel.getContactObserver(sipAddress)
property var _call: call
// ---------------------------------------------------------------------------
color: CallStyle.backgroundColor
// ---------------------------------------------------------------------------
// Handle video requests.
// ---------------------------------------------------------------------------
SmartConnect {
Component.onCompleted: this.connect(call, 'videoRequested', function () {
Utils.openConfirmDialog(window, {
descriptionText: qsTr('acceptVideoDescription'),
exitHandler: function (status) {
if (status) {
call.acceptVideoRequest()
} else {
call.rejectVideoRequest()
}
},
title: qsTr('acceptVideoTitle')
})
})
}
// ---------------------------------------------------------------------------
ColumnLayout {
anchors {
fill: parent
@ -85,7 +108,7 @@ Rectangle {
id: cameraActions
anchors.right: parent.right
active: Boolean(call.videoInputEnabled) && call.status !== CallModel.CallStatusEnded
active: call.videoEnabled && call.status !== CallModel.CallStatusEnded
sourceComponent: ActionBar {
iconSize: CallStyle.header.iconSize
@ -200,7 +223,7 @@ Rectangle {
Camera {
height: container.height
width: container.width
call: incall._call
call: incall.call
}
}
@ -208,7 +231,7 @@ Rectangle {
id: cameraLoader
anchors.centerIn: parent
sourceComponent: call.videoInputEnabled ? camera : avatar
sourceComponent: call.videoEnabled ? camera : avatar
}
}
@ -241,15 +264,11 @@ Rectangle {
}
ActionSwitch {
icon: 'speaker'
iconSize: CallStyle.actionArea.iconSize
onClicked: enabled = !enabled
}
ActionSwitch {
enabled: call.videoEnabled
icon: 'camera'
iconSize: CallStyle.actionArea.iconSize
onClicked: enabled = !enabled
onClicked: call.videoEnabled = !enabled
}
ActionButton {
@ -266,9 +285,9 @@ Rectangle {
width: CallStyle.actionArea.userVideo.width
isPreview: true
visible: incall.width >= CallStyle.actionArea.lowWidth && call.videoEnabled
call: incall._call
visible: Boolean(incall.width >= CallStyle.actionArea.lowWidth && call.videoOutputEnabled)
Component.onCompleted: call = incall.call
}
ActionBar {

11
linphone-desktop/ui/views/App/Calls/OutgoingCall.qml
View file

@ -10,7 +10,7 @@ import App.Styles 1.0
AbstractStartingCall {
GridLayout {
columns: parent.width < CallStyle.actionArea.lowWidth && call.videoOutputEnabled ? 1 : 2
columns: parent.width < CallStyle.actionArea.lowWidth && call.videoEnabled ? 1 : 2
rowSpacing: ActionBarStyle.spacing
anchors {
@ -26,13 +26,6 @@ AbstractStartingCall {
onClicked: call.microMuted = enabled
}
ActionSwitch {
icon: 'speaker'
iconSize: CallStyle.actionArea.iconSize
onClicked: enabled = !enabled
}
}
Item {
@ -40,7 +33,7 @@ AbstractStartingCall {
height: CallStyle.actionArea.userVideo.height
width: CallStyle.actionArea.userVideo.width
visible: call.videoOutputEnabled
visible: call.videoEnabled
}
ActionBar {