|
[-]
[+]
|
Changed |
_service:tar_git:gestured.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/gesture-daemon.git</param>
<param name="branch">master</param>
- <param name="revision">6ecc90be592fb3021025d4ea271eeaf140e49f99</param>
+ <param name="revision">cf0376718bed50532fdfc8a3938b58f9fc10541d</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.10.tar.bz2/src/gesture-actions.cpp
^
|
| @@ -9,6 +9,7 @@
#include "gesture-actions.h"
#include <QFile>
#include <QTextStream>
+#include <mlite5/MGConfItem>
Gestures::Gestures(QObject *parent) :
QObject(parent)
@@ -20,6 +21,16 @@
_serviceWatcher = new QDBusServiceWatcher(this);
_serviceWatcher->setConnection(bus);
connect(_serviceWatcher, &QDBusServiceWatcher::serviceOwnerChanged, this, &Gestures::ownerChanged);
+
+ cameraDevice = new MGConfItem("/apps/jolla-camera/cameraDevice");
+ cameraCaptureMode = new MGConfItem("/apps/jolla-camera/captureMode");
+
+ cameraNeedRestoreSettings = false;
+ cameraDeviceValue = cameraDevice->value().toString();
+ cameraCaptureModeValue = cameraCaptureMode->value().toString();
+
+ QObject::connect(cameraDevice, SIGNAL(valueChanged()), this, SLOT(cameraValueChanged()));
+ QObject::connect(cameraCaptureMode, SIGNAL(valueChanged()), this, SLOT(cameraValueChanged()));
}
Gestures::~Gestures()
@@ -106,14 +117,26 @@
void Gestures::showCameraViewfinder()
{
+ cameraDeviceValue = cameraDevice->value().toString();
+ cameraCaptureModeValue = cameraCaptureMode->value().toString();
+
+ if (cameraDeviceValue == "primary" || cameraCaptureModeValue == "video")
+ cameraNeedRestoreSettings = true;
+
QDBusConnection bus = QDBusConnection::sessionBus();
- QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera.ui", "showViewfinder");
+ QDBusMessage call = QDBusMessage::createMethodCall("com.jolla.camera", "/", "com.jolla.camera", "showFrontViewfinder");
- QDBusError error = bus.call(call);
+ bus.call(call, QDBus::NoBlock, 1);
+}
- if (error.isValid())
+void Gestures::cameraValueChanged()
+{
+ if (cameraNeedRestoreSettings)
{
- qWarning() << "camera launch failed:" << error.message();
+ QThread::msleep(100);
+ cameraNeedRestoreSettings = false;
+ cameraDevice->set(cameraDeviceValue);
+ cameraCaptureMode->set(cameraCaptureModeValue);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:gestured-0.0.10.tar.bz2/src/gesture-actions.h
^
|
| @@ -12,6 +12,7 @@
#include <QtDBus/QtDBus>
#include <QTimer>
#include <QThread>
+#include <mlite5/MGConfItem>
class Gestures : public QObject
{
@@ -26,6 +27,7 @@
private slots:
void ownerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
+ void cameraValueChanged();
private:
void toggleFlashlight();
@@ -34,8 +36,16 @@
void showVoicecallUi();
bool getMpris2Service();
+ bool cameraNeedRestoreSettings;
+
QString _mpris2Service;
QDBusServiceWatcher *_serviceWatcher;
+
+ MGConfItem *cameraDevice;
+ MGConfItem *cameraCaptureMode;
+
+ QString cameraDeviceValue;
+ QString cameraCaptureModeValue;
};
#endif // GESTURE_ACTIONS_H
|
