From 3f384d30d099f6eea5eb946c3cb0380f0453e2bc Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 14 Feb 2022 18:00:05 -0500 Subject: Rework mediaplayer support to use mpd Rework the mediaplayer support to replace the stubbed out app framework agl-service-mediaplayer binding use with driving mpd (Media Player Daemon) via the libmpdclient library. Local file playback behavior should be equivalent to before in an image with mpd present and suitably configured. Bluetooth AVRCP support is still stubbed out, and will be re-implemented with followup changes. Bug-AGL: SPEC-4182 Signed-off-by: Scott Murray Change-Id: Ifdf092b472c271460d0f5e9a8c7d2353904411b2 --- mediaplayer/MpdEventHandler.h | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 mediaplayer/MpdEventHandler.h (limited to 'mediaplayer/MpdEventHandler.h') diff --git a/mediaplayer/MpdEventHandler.h b/mediaplayer/MpdEventHandler.h new file mode 100644 index 0000000..fcd6155 --- /dev/null +++ b/mediaplayer/MpdEventHandler.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 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. + * 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 MPD_EVENT_HANDLER_H +#define MPD_EVENT_HANDLER_H + +#include +//#include +//#include +//#include +#include + +// Use a 60s timeout on our MPD connection +#define MPD_CONNECTION_TIMEOUT 60000 + +class MpdEventHandler : public QObject +{ + Q_OBJECT + +public: + explicit MpdEventHandler(QObject *parent = nullptr); + virtual ~MpdEventHandler(); + +public slots: + void handleEvents(void); + +signals: + void playbackStateUpdate(int queue_pos, int song_pos_ms, bool state); + void playlistUpdate(QVariantMap playlist); + void metadataUpdate(QVariantMap metadata); + +private: + void handleDatabaseEvent(void); + void handleQueueEvent(void); + void handlePlayerEvent(void); + + bool getSongArt(const QString &path, QByteArray &buffer, QString &type); + + struct mpd_connection *m_mpd_conn; +}; + +#endif // MPD_EVENT_HANDLER_H -- cgit 1.2.3-korg