setting: fix hardware accel crash
Change-Id: If001b758642fc8a1289506760650997dd9b20462
diff --git a/src/settingsview/components/AvSettingPage.qml b/src/settingsview/components/AvSettingPage.qml
index 64a9f1c..9979844 100644
--- a/src/settingsview/components/AvSettingPage.qml
+++ b/src/settingsview/components/AvSettingPage.qml
@@ -103,13 +103,13 @@
} 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 @@
}
function slotSetHardwareAccel(state){
- ClientWrapper.accountAdaptor.avModel().setHardwareAcceleration(state)
+ ClientWrapper.avmodel.setHardwareAcceleration(state)
startPreviewing(true)
}
diff --git a/src/settingsview/components/CurrentAccountSettingsScrollPage.qml b/src/settingsview/components/CurrentAccountSettingsScrollPage.qml
index d2847d0..f4fc285 100644
--- a/src/settingsview/components/CurrentAccountSettingsScrollPage.qml
+++ b/src/settingsview/components/CurrentAccountSettingsScrollPage.qml
@@ -261,7 +261,7 @@
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")
diff --git a/src/settingsview/components/GeneralSettingsPage.qml b/src/settingsview/components/GeneralSettingsPage.qml
index 412612f..8a7847a 100644
--- a/src/settingsview/components/GeneralSettingsPage.qml
+++ b/src/settingsview/components/GeneralSettingsPage.qml
@@ -145,7 +145,6 @@
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