lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

setting: fix hardware accel crash

Browse source 
Change-Id: If001b758642fc8a1289506760650997dd9b20462
This commit is contained in:
Yang Wang 2020-08-18 13:24:37 -04:00 • committed by Andreas Traczyk
parent 385cf87ec5
commit c2ea0b1f94
5 changed files with 12 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/accountadapter.cpp
View file

@ -238,16 +238,16 @@ AccountAdapter::stopAudioMeter(bool async)
}
void
AccountAdapter::startPreviewing(bool force)
AccountAdapter::startPreviewing(bool force, bool async)
{
LRCInstance::renderer()->startPreviewing(force);
LRCInstance::renderer()->startPreviewing(force, async);
}
void
AccountAdapter::stopPreviewing()
AccountAdapter::stopPreviewing(bool async)
{
if (!LRCInstance::hasVideoCall() && LRCInstance::renderer()->isPreviewing()) {
LRCInstance::renderer()->stopPreviewing();
LRCInstance::renderer()->stopPreviewing(async);
}
}
@ -263,12 +263,6 @@ AccountAdapter::isPreviewing()
return LRCInstance::renderer()->isPreviewing();
}
RenderManager *
AccountAdapter::getRenderManager()
{
return LRCInstance::renderer();
}
void
AccountAdapter::setCurrAccDisplayName(QString text)
{
@ -319,24 +313,6 @@ AccountAdapter::setArchivePasswordAsync(const QString &accountID, const QString
});
}
lrc::api::NewAccountModel *
AccountAdapter::accoundModel()
{
return &(LRCInstance::accountModel());
}
lrc::api::AVModel *
AccountAdapter::avModel()
{
return &(LRCInstance::avModel());
}
lrc::api::DataTransferModel *
AccountAdapter::dataTransferModel()
{
return &(LRCInstance::dataTransferModel());
}
void
AccountAdapter::settingsNeverShowAgain(bool checked)
{

12
src/accountadapter.h
View file

@ -74,22 +74,14 @@ public:
Q_INVOKABLE bool savePassword(QString accountId, QString oldPassword, QString newPassword);
Q_INVOKABLE void startAudioMeter(bool async);
Q_INVOKABLE void stopAudioMeter(bool async);
Q_INVOKABLE void startPreviewing(bool force);
Q_INVOKABLE void stopPreviewing();
Q_INVOKABLE void startPreviewing(bool force = false, bool async = true);
Q_INVOKABLE void stopPreviewing(bool async = true);
Q_INVOKABLE bool hasVideoCall();
Q_INVOKABLE bool isPreviewing();
Q_INVOKABLE void setCurrAccDisplayName(QString text);
Q_INVOKABLE void setSelectedAccountId(QString accountId = {});
Q_INVOKABLE void setSelectedConvId(QString accountId = {});
/*
* lrc model instances getter
*/
Q_INVOKABLE lrc::api::NewAccountModel *accoundModel();
Q_INVOKABLE lrc::api::AVModel *avModel();
Q_INVOKABLE lrc::api::DataTransferModel *dataTransferModel();
Q_INVOKABLE RenderManager *getRenderManager();
signals:
/*

10
src/settingsview/components/AvSettingPage.qml
View file

@ -103,13 +103,13 @@ Rectangle {
} catch(err){console.warn("Exception: " + err.message)}
}
function startPreviewing(force = false){
ClientWrapper.accountAdaptor.startPreviewing(force)
function startPreviewing(force = false, async = true){
ClientWrapper.accountAdaptor.startPreviewing(force, async)
previewAvailable = true
}
function stopPreviewing(){
ClientWrapper.accountAdaptor.stopPreviewing()
function stopPreviewing(async = true){
ClientWrapper.accountAdaptor.stopPreviewing(async)
}
function startAudioMeter(async = true){
@ -130,7 +130,7 @@ Rectangle {
}
function slotSetHardwareAccel(state){
ClientWrapper.accountAdaptor.avModel().setHardwareAcceleration(state)
ClientWrapper.avmodel.setHardwareAcceleration(state)
startPreviewing(true)
}

2
src/settingsview/components/CurrentAccountSettingsScrollPage.qml
View file

@ -261,7 +261,7 @@ Rectangle {
return
} else {
if (exportPath.length > 0) {
var isSuccessful = ClientWrapper.accountAdaptor.accoundModel().exportToFile(ClientWrapper.utilsAdaptor.getCurrAccId(), exportPath,"")
var isSuccessful = ClientWrapper.accountModel.exportToFile(ClientWrapper.utilsAdaptor.getCurrAccId(), exportPath,"")
var title = isSuccessful ? qsTr("Success") : qsTr("Error")
var iconMode = isSuccessful ? StandardIcon.Information : StandardIcon.Critical
var info = isSuccessful ? qsTr("Export Successful") : qsTr("Export Failed")

1
src/settingsview/components/GeneralSettingsPage.qml
View file

@ -145,7 +145,6 @@ Rectangle {
property string downloadPath: ClientWrapper.settingsAdaptor.getDir_Download()
// recording
//property AVModel avmodel: ClientWrapper.accountAdaptor.avModel()
property string recordPath: ClientWrapper.settingsAdaptor.getDir_Document()
property int preferredColumnWidth : generalSettingsScrollView.width / 2 - 50