Skip to content
Snippets Groups Projects
Commit c2ea0b1f authored by Yang Wang's avatar Yang Wang Committed by Andreas Traczyk
Browse files

setting: fix hardware accel crash

Change-Id: If001b758642fc8a1289506760650997dd9b20462
parent 385cf87e
No related branches found
No related tags found
No related merge requests found
...@@ -238,16 +238,16 @@ AccountAdapter::stopAudioMeter(bool async) ...@@ -238,16 +238,16 @@ AccountAdapter::stopAudioMeter(bool async)
} }
void void
AccountAdapter::startPreviewing(bool force) AccountAdapter::startPreviewing(bool force, bool async)
{ {
LRCInstance::renderer()->startPreviewing(force); LRCInstance::renderer()->startPreviewing(force, async);
} }
void void
AccountAdapter::stopPreviewing() AccountAdapter::stopPreviewing(bool async)
{ {
if (!LRCInstance::hasVideoCall() && LRCInstance::renderer()->isPreviewing()) { if (!LRCInstance::hasVideoCall() && LRCInstance::renderer()->isPreviewing()) {
LRCInstance::renderer()->stopPreviewing(); LRCInstance::renderer()->stopPreviewing(async);
} }
} }
...@@ -263,12 +263,6 @@ AccountAdapter::isPreviewing() ...@@ -263,12 +263,6 @@ AccountAdapter::isPreviewing()
return LRCInstance::renderer()->isPreviewing(); return LRCInstance::renderer()->isPreviewing();
} }
RenderManager *
AccountAdapter::getRenderManager()
{
return LRCInstance::renderer();
}
void void
AccountAdapter::setCurrAccDisplayName(QString text) AccountAdapter::setCurrAccDisplayName(QString text)
{ {
...@@ -319,24 +313,6 @@ AccountAdapter::setArchivePasswordAsync(const QString &accountID, const QString ...@@ -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 void
AccountAdapter::settingsNeverShowAgain(bool checked) AccountAdapter::settingsNeverShowAgain(bool checked)
{ {
......
...@@ -74,22 +74,14 @@ public: ...@@ -74,22 +74,14 @@ public:
Q_INVOKABLE bool savePassword(QString accountId, QString oldPassword, QString newPassword); Q_INVOKABLE bool savePassword(QString accountId, QString oldPassword, QString newPassword);
Q_INVOKABLE void startAudioMeter(bool async); Q_INVOKABLE void startAudioMeter(bool async);
Q_INVOKABLE void stopAudioMeter(bool async); Q_INVOKABLE void stopAudioMeter(bool async);
Q_INVOKABLE void startPreviewing(bool force); Q_INVOKABLE void startPreviewing(bool force = false, bool async = true);
Q_INVOKABLE void stopPreviewing(); Q_INVOKABLE void stopPreviewing(bool async = true);
Q_INVOKABLE bool hasVideoCall(); Q_INVOKABLE bool hasVideoCall();
Q_INVOKABLE bool isPreviewing(); Q_INVOKABLE bool isPreviewing();
Q_INVOKABLE void setCurrAccDisplayName(QString text); Q_INVOKABLE void setCurrAccDisplayName(QString text);
Q_INVOKABLE void setSelectedAccountId(QString accountId = {}); Q_INVOKABLE void setSelectedAccountId(QString accountId = {});
Q_INVOKABLE void setSelectedConvId(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: signals:
/* /*
......
...@@ -103,13 +103,13 @@ Rectangle { ...@@ -103,13 +103,13 @@ Rectangle {
} catch(err){console.warn("Exception: " + err.message)} } catch(err){console.warn("Exception: " + err.message)}
} }
function startPreviewing(force = false){ function startPreviewing(force = false, async = true){
ClientWrapper.accountAdaptor.startPreviewing(force) ClientWrapper.accountAdaptor.startPreviewing(force, async)
previewAvailable = true previewAvailable = true
} }
function stopPreviewing(){ function stopPreviewing(async = true){
ClientWrapper.accountAdaptor.stopPreviewing() ClientWrapper.accountAdaptor.stopPreviewing(async)
} }
function startAudioMeter(async = true){ function startAudioMeter(async = true){
...@@ -130,7 +130,7 @@ Rectangle { ...@@ -130,7 +130,7 @@ Rectangle {
} }
function slotSetHardwareAccel(state){ function slotSetHardwareAccel(state){
ClientWrapper.accountAdaptor.avModel().setHardwareAcceleration(state) ClientWrapper.avmodel.setHardwareAcceleration(state)
startPreviewing(true) startPreviewing(true)
} }
......
...@@ -261,7 +261,7 @@ Rectangle { ...@@ -261,7 +261,7 @@ Rectangle {
return return
} else { } else {
if (exportPath.length > 0) { 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 title = isSuccessful ? qsTr("Success") : qsTr("Error")
var iconMode = isSuccessful ? StandardIcon.Information : StandardIcon.Critical var iconMode = isSuccessful ? StandardIcon.Information : StandardIcon.Critical
var info = isSuccessful ? qsTr("Export Successful") : qsTr("Export Failed") var info = isSuccessful ? qsTr("Export Successful") : qsTr("Export Failed")
......
...@@ -145,7 +145,6 @@ Rectangle { ...@@ -145,7 +145,6 @@ Rectangle {
property string downloadPath: ClientWrapper.settingsAdaptor.getDir_Download() property string downloadPath: ClientWrapper.settingsAdaptor.getDir_Download()
// recording // recording
//property AVModel avmodel: ClientWrapper.accountAdaptor.avModel()
property string recordPath: ClientWrapper.settingsAdaptor.getDir_Document() property string recordPath: ClientWrapper.settingsAdaptor.getDir_Document()
property int preferredColumnWidth : generalSettingsScrollView.width / 2 - 50 property int preferredColumnWidth : generalSettingsScrollView.width / 2 - 50
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment