Add Bluetooth media control supportmarlin_12.93.0marlin/12.93.012.93.0

Rework to expose Bluetooth AVRCP media control in the Bluetooth
class, and use that support to implement a Bluetooth backend in the
Mediaplayer class.  This replaces the scheme that existed with the
agl-service-mediaplayer binding where it abstracted away the
Bluetooth support itself.  However, care has been take to make sure
that the exposed API to users of libqtappfw-mediaplayer has not
changed.

Bug-AGL: SPEC-4231

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I76b4f75621ce0121364eea3259b074bf3067ee88

1 files changed, 66 insertions, 40 deletions

diff --git a/bluetooth/bluetooth.h b/bluetooth/bluetooth.h
index c7ef55c..09fb4d9 100644
--- a/bluetooth/bluetooth.h
+++ b/bluetooth/bluetooth.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Konsulko Group
+ * Copyright (C) 2018-2022 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,64 +26,90 @@ class BluetoothEventHandler;
 
 class Bluetooth : public QObject
 {
-    Q_OBJECT
-    Q_PROPERTY(bool power READ power WRITE setPower NOTIFY powerChanged)
-    Q_PROPERTY(bool discoverable READ discoverable WRITE setDiscoverable NOTIFY discoverableChanged)
+	Q_OBJECT
+	Q_PROPERTY(bool power READ power WRITE setPower NOTIFY powerChanged)
+	Q_PROPERTY(bool discoverable READ discoverable WRITE setDiscoverable NOTIFY discoverableChanged)
+	Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
+	Q_PROPERTY(bool mediaConnected READ mediaConnected NOTIFY mediaConnectedChanged)
 
-    public:
-	explicit Bluetooth(bool register_agent, QQmlContext *context, QObject * parent = Q_NULLPTR);
-        virtual ~Bluetooth();
+public:
+	explicit Bluetooth(bool register_agent,
+			   QQmlContext *context,
+			   bool handle_media = false,
+			   QObject *parent = Q_NULLPTR);
+	virtual ~Bluetooth();
 
-        void setPower(bool);
-        void setDiscoverable(bool);
+	void setPower(bool);
+	void setDiscoverable(bool);
 
-        Q_INVOKABLE void start(void);
+	Q_INVOKABLE void start(void);
 
-        Q_INVOKABLE void start_discovery(void);
-        Q_INVOKABLE void stop_discovery(void);
+	Q_INVOKABLE void start_discovery(void);
+	Q_INVOKABLE void stop_discovery(void);
 
-        Q_INVOKABLE void remove_device(QString device);
-        Q_INVOKABLE void pair(QString device);
-        Q_INVOKABLE void cancel_pair(void);
+	Q_INVOKABLE void remove_device(QString device);
+	Q_INVOKABLE void pair(QString device);
+	Q_INVOKABLE void cancel_pair(void);
 
-        Q_INVOKABLE void connect(QString device, QString uuid);
-        Q_INVOKABLE void connect(QString device);
+	Q_INVOKABLE void connect(QString device, QString uuid);
+	Q_INVOKABLE void connect(QString device);
 
-        Q_INVOKABLE void disconnect(QString device, QString uuid);
-        Q_INVOKABLE void disconnect(QString device);
+	Q_INVOKABLE void disconnect(QString device, QString uuid);
+	Q_INVOKABLE void disconnect(QString device);
 
-        Q_INVOKABLE void send_confirmation(int pincode);
+	Q_INVOKABLE void send_confirmation(int pincode);
 
-        bool power() const { return m_power; };
-        bool discoverable() const { return m_discoverable; };
+	enum MediaAction {
+		Connect, Disconnect,
+		Play, Pause, Stop, Next, Previous, FastForward, Rewind, Loop
+	};
+	Q_ENUM(MediaAction)
 
-    signals:
-        void powerChanged(bool state);
-        void discoverableChanged();
+	Q_INVOKABLE void media_control(MediaAction action);
+	Q_INVOKABLE void refresh_media_state();
 
-	//void connectionEvent(QJsonObject data);
+	bool power() const { return m_power; };
+	bool discoverable() const { return m_discoverable; };
+	bool connected() const { return m_connected; };
+	bool mediaConnected() const { return m_media_connected; };
+
+signals:
+	void powerChanged(bool state);
+	void discoverableChanged(bool state);
+	void connectedChanged(bool state);
+	void mediaConnectedChanged(bool state);
+
+	void mediaPropertiesChanged(QVariantMap metadata);
 	void requestConfirmationEvent(QString pincode);
 
-    private:
-        QQmlContext *m_context;
-        BluetoothModel *m_bluetooth;
-        BluetoothEventHandler *m_event_handler;
+private:
+	QQmlContext *m_context;
+	BluetoothModel *m_bluetooth;
+	BluetoothEventHandler *m_event_handler;
 	bool m_agent;
+	bool m_handle_media;
 
-	void init_adapter_state(QString);
+	void init_adapter_state(const QString &adapter);
 	void refresh_device_list(void);
-        void set_discovery_filter(void);
-        void discovery_command(bool);
-	void update_adapter_power(bool);
-	void request_confirmation(int);
+	void set_discovery_filter(void);
+	void discovery_command(const bool);
+	void update_adapter_power(const bool powered);
+	void update_connected_state(const QString &device, const bool connected);
+	void update_media_connected_state(const bool connected);
+	void update_media_properties(const QVariantMap &metadata);
+	void request_confirmation(const int pincode);
+
+	QString process_uuid(QString uuid) { if (uuid.length() == 36) return uuid; return uuids.value(uuid); };
 
-        QString process_uuid(QString uuid) { if (uuid.length() == 36) return uuid; return uuids.value(uuid); };
+	// values
+	bool m_power;
+	bool m_discoverable;
+	bool m_connected;
+	bool m_media_connected;
 
-        // values
-        bool m_power;
-        bool m_discoverable;
+	QString m_connected_device;
 
-        QMap<QString, QString> uuids;
+	QMap<QString, QString> uuids;
 
 	friend class BluetoothEventHandler;
 };