summaryrefslogtreecommitdiffstats
path: root/app/phone.h
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-01-16 19:44:28 -0500
committerScott Murray <scott.murray@konsulko.com>2019-01-23 14:29:43 -0500
commit90b83db9213308a4451d9c86b380aba6d13313b5 (patch)
tree75f3017981a723e31375de9822497f4b50570461 /app/phone.h
parent279b7db4d16775a5a976d8d593d4a87dd254bf5c (diff)
Replace QtMultimedia usage with 4A + gstreamer
Replace QtMultimedia usage for ringtone playing with a gstreamer pipeline that uses the provided 4A role ALSA device for output. For now, a "phone" role is assumed to be available, but it does not exist in the current set of 4A policy and HALs, and needs to be added. Testing was done by making the required role changes locally and using some debug QML tweaks to allow triggering the ringtone manually. Bug-AGL: SPEC-1596 Change-Id: I55c2229de1bc5470ee818e5be382b64664fa2d29 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'app/phone.h')
-rw-r--r--app/phone.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/phone.h b/app/phone.h
index 489f1da..6cdce34 100644
--- a/app/phone.h
+++ b/app/phone.h
@@ -17,10 +17,10 @@
#ifndef PHONE_H
#define PHONE_H
-#include <QSoundEffect>
#include <QTimer>
#include <telephony.h>
+#include "fileplayer.h"
class Phone : public QObject
{
@@ -28,7 +28,7 @@ class Phone : public QObject
Q_PROPERTY(QString elapsedTime READ elapsedTime WRITE setElapsedTime NOTIFY elapsedTimeChanged)
public:
- explicit Phone(Telephony *telephony, QObject *parent = Q_NULLPTR);
+ explicit Phone(Telephony *telephony, FilePlayer *player, QObject *parent = Q_NULLPTR);
void onCallStateChanged(QString);
QString elapsedTime() { return m_elapsed_time; }
@@ -46,7 +46,7 @@ class Phone : public QObject
private:
Telephony *m_telephony;
- QSoundEffect m_ringtone;
+ FilePlayer *m_ringtone;
QTimer m_call_timer;
QDateTime m_date_time;
QString m_elapsed_time;