summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorMatt Porter <mporter@konsulko.com>2017-11-09 15:55:44 -0500
committerMatt Porter <mporter@konsulko.com>2017-11-09 16:00:56 -0500
commit202a1402f1e59c73e631ef9495c22fee30bafac2 (patch)
treeba505a8ebf7c0a18f6371df5d09f17b99084cb68 /app
parentf9cbfb636f6dce351f26e6b86dcb0080a32cd18d (diff)
Move ringtone logic from QML to Phone class
Adds a Phone class that implements ringtone logic. This allows for the ringtone to be started/stopped even if the phone app is not visible (QML render thread not executing) and the QML implementation can be removed. Bug-AGL: SPEC-1081 Change-Id: I7d0dd5f167ce1f53477d6c9d8053111996033e4c Signed-off-by: Matt Porter <mporter@konsulko.com>
Diffstat (limited to 'app')
-rw-r--r--app/Dialer.qml16
-rw-r--r--app/app.pri1
-rw-r--r--app/app.pro5
-rw-r--r--app/main.cpp3
-rw-r--r--app/phone.cpp39
-rw-r--r--app/phone.h37
6 files changed, 83 insertions, 18 deletions
diff --git a/app/Dialer.qml b/app/Dialer.qml
index f4a3272..afeea18 100644
--- a/app/Dialer.qml
+++ b/app/Dialer.qml
@@ -55,7 +55,6 @@ Item {
onCallStateChanged: {
if (telephony.callState == "incoming") {
rejectButton.active = true
- ringtone.active = true
callStateLabel.text = "Incoming call from " + telephony.callClip
} else if (telephony.callState == "dialing") {
callStateLabel.text = "Dialing " + telephony.callColp
@@ -67,25 +66,11 @@ Item {
rejectButton.active = false
callButton.checked = false
callTimer.stop()
- ringtone.active = false
callStateLabel.text = ""
}
}
}
- Loader {
- id: ringtone
- active: false
- sourceComponent: Component {
- SoundEffect {
- loops: SoundEffect.Infinite
- source: './Phone.wav'
- category: 'phone'
- Component.onCompleted: play()
- }
- }
- }
-
signal showContacts
function call(contact) {
name.text = contact.name
@@ -188,7 +173,6 @@ Item {
history.insert(0, contact)
if (telephony.callState == "incoming") {
telephony.answer()
- ringtone.active = false;
} else {
telephony.dial(number.text)
}
diff --git a/app/app.pri b/app/app.pri
index 014646f..c3b1fd1 100644
--- a/app/app.pri
+++ b/app/app.pri
@@ -1,4 +1,5 @@
TEMPLATE = app
+QMAKE_LFLAGS += "-Wl,--hash-style=gnu -Wl,--as-needed"
load(configure)
qtCompileTest(libhomescreen)
diff --git a/app/app.pro b/app/app.pro
index 979c9f6..bc1ab2f 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -1,7 +1,8 @@
TARGET = phone
-QT = quickcontrols2 websockets
+QT = quickcontrols2 websockets multimedia
-SOURCES = main.cpp
+SOURCES = main.cpp phone.cpp
+HEADERS = phone.h
SUBDIRS = telephony-binding
diff --git a/app/main.cpp b/app/main.cpp
index c0f9d5f..e2eaf7c 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -28,6 +28,7 @@
#endif
#include <telephony.h>
+#include "phone.h"
int main(int argc, char *argv[])
{
@@ -68,6 +69,8 @@ int main(int argc, char *argv[])
context->setContextProperty(QStringLiteral("bindingAddress"), bindingAddress);
Telephony *telephony = new Telephony(bindingAddress);
context->setContextProperty("telephony", telephony);
+ Phone *phone = new Phone(telephony);
+ QObject::connect(telephony, &Telephony::callStateChanged, phone, &Phone::onCallStateChanged);
}
engine.load(QUrl(QStringLiteral("qrc:/Phone.qml")));
diff --git a/app/phone.cpp b/app/phone.cpp
new file mode 100644
index 0000000..4eca02a
--- /dev/null
+++ b/app/phone.cpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <QDebug>
+#include <QObject>
+#include <QSoundEffect>
+#include <telephony.h>
+#include "phone.h"
+
+Phone::Phone(Telephony *telephony, QObject *parent) :
+ QObject(parent)
+{
+ m_ringtone.setSource(QUrl("qrc:./Phone.wav"));
+ m_ringtone.setVolume(0.5f);
+ m_ringtone.setLoopCount(QSoundEffect::Infinite);
+
+ QObject::connect(telephony, &Telephony::callStateChanged, this, &Phone::onCallStateChanged);
+}
+
+void Phone::onCallStateChanged(QString callState)
+{
+ if ((callState == "disconnected") || (callState == "active"))
+ m_ringtone.stop();
+ else if (callState == "incoming")
+ m_ringtone.play();
+}
diff --git a/app/phone.h b/app/phone.h
new file mode 100644
index 0000000..2975daf
--- /dev/null
+++ b/app/phone.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2017 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef PHONE_H
+#define PHONE_H
+
+#include <QSoundEffect>
+
+#include <telephony.h>
+
+class Phone : public QObject
+{
+ Q_OBJECT
+
+ public:
+ explicit Phone(Telephony *telephony, QObject *parent = Q_NULLPTR);
+ void onCallStateChanged(QString);
+
+ private:
+ Telephony *m_telephony;
+ QSoundEffect m_ringtone;
+};
+
+#endif // PHONE_H