mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-04-22 22:22:03 +02:00
eb53a622b7
It seems concurrent calls to invokeMethod using qml component object pointers can lead to access violations. These method invocations can be replaced with a signal/slot mechanism. This patch replaces only the invocations in conversationsadapter and accountsadapter that are known to be problematic for now. Some code cleanup is done for QmlAdapterBase derived classes. Gitlab: #61 Change-Id: I72f47c9229a9bf42299ae52822c3a1a8c04eb423
127 lines
4.1 KiB
C++
127 lines
4.1 KiB
C++
/*
|
|
* Copyright (C) 2020 by Savoir-faire Linux
|
|
* Author : Edric Ladent Milaret<edric.ladent - milaret @savoirfairelinux.com>
|
|
* Author : Andreas Traczyk<andreas.traczyk @savoirfairelinux.com>
|
|
* Author: Mingrui Zhang <mingrui.zhang@savoirfairelinux.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "avadapter.h"
|
|
|
|
#include "lrcinstance.h"
|
|
|
|
#include <QScreen>
|
|
|
|
AvAdapter::AvAdapter(QObject *parent)
|
|
: QmlAdapterBase(parent)
|
|
{}
|
|
|
|
QVariantMap
|
|
AvAdapter::populateVideoDeviceContextMenuItem()
|
|
{
|
|
auto* convModel = LRCInstance::getCurrentConversationModel();
|
|
const auto conversation = convModel->getConversationForUID(LRCInstance::getCurrentConvUid());
|
|
auto call = LRCInstance::getCallInfoForConversation(conversation);
|
|
if (!call) {
|
|
return QVariantMap();
|
|
}
|
|
|
|
auto activeDevice = LRCInstance::avModel().getCurrentRenderedDevice(call->id);
|
|
|
|
/*
|
|
* Create a list of video input devices.
|
|
*/
|
|
QVariantMap deciveContextMenuNeededInfo;
|
|
auto devices = LRCInstance::avModel().getDevices();
|
|
for (int i = 0; i < devices.size(); i++) {
|
|
try {
|
|
auto settings = LRCInstance::avModel().getDeviceSettings(devices[i]);
|
|
deciveContextMenuNeededInfo[settings.name] = QVariant(devices[i] == activeDevice.name);
|
|
} catch (...) {
|
|
qDebug().noquote() << "Error in getting device settings";
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Add size parameter into the map since in qml there is no way to get the size.
|
|
*/
|
|
deciveContextMenuNeededInfo["size"] = QVariant(deciveContextMenuNeededInfo.size());
|
|
|
|
return deciveContextMenuNeededInfo;
|
|
}
|
|
|
|
void
|
|
AvAdapter::onVideoContextMenuDeviceItemClicked(const QString &deviceName)
|
|
{
|
|
auto deviceId = LRCInstance::avModel().getDeviceIdFromName(deviceName);
|
|
if (deviceId.isEmpty()) {
|
|
qWarning() << "Couldn't find device: " << deviceName;
|
|
return;
|
|
}
|
|
LRCInstance::avModel().switchInputTo(deviceId);
|
|
LRCInstance::avModel().setCurrentVideoCaptureDevice(deviceId);
|
|
}
|
|
|
|
void
|
|
AvAdapter::shareEntireScreen(int screenNumber)
|
|
{
|
|
QScreen *screen = qApp->screens().at(screenNumber);
|
|
if (!screen)
|
|
return;
|
|
QRect rect = screen ? screen->geometry() : qApp->primaryScreen()->geometry();
|
|
LRCInstance::avModel().setDisplay(screenNumber, rect.x(), rect.y(), rect.width(), rect.height());
|
|
}
|
|
|
|
const QString
|
|
AvAdapter::captureScreen(int screenNumber)
|
|
{
|
|
QScreen *screen = qApp->screens().at(screenNumber);
|
|
if (!screen)
|
|
return QString("");
|
|
/*
|
|
* The screen window id is always 0.
|
|
*/
|
|
auto pixmap = screen->grabWindow(0);
|
|
|
|
QBuffer buffer;
|
|
buffer.open(QIODevice::WriteOnly);
|
|
pixmap.save(&buffer, "PNG");
|
|
return QString::fromLatin1(buffer.data().toBase64().data());
|
|
}
|
|
|
|
void
|
|
AvAdapter::shareFile(const QString &filePath)
|
|
{
|
|
LRCInstance::avModel().setInputFile(filePath);
|
|
}
|
|
|
|
void
|
|
AvAdapter::shareScreenArea(int screenNumber, int x, int y, int width, int height)
|
|
{
|
|
QScreen *screen = qApp->screens().at(screenNumber);
|
|
if (!screen)
|
|
return;
|
|
QRect rect = screen ? screen->geometry() : qApp->primaryScreen()->geometry();
|
|
|
|
/*
|
|
* Provide minimum width, height.
|
|
* Need to add screen x, y initial value to the setDisplay api call.
|
|
*/
|
|
LRCInstance::avModel().setDisplay(screenNumber,
|
|
rect.x() + x,
|
|
rect.y() + y,
|
|
width < 128 ? 128 : width,
|
|
height < 128 ? 128 : height);
|
|
}
|