* Added new lyrics provider with lyrics from AudD and API Seeds * New improved context widget with albums and lyrics * Fixed playing and context widget getting stuck in play mode when there was an error * Changed icons for artists in collection, tidal and cover manager * Removed "search" icon from "Search automatically" checkbox (right click) that looked ugly * Removed some unused widgets from the src/widgets directory * Fixed initial size of window and side panel * Fixed saving window size correctly
96 lines
2.3 KiB
C++
96 lines
2.3 KiB
C++
/*
|
|
* Strawberry Music Player
|
|
* Copyright 2018, Jonas Kvinge <jonas@jkvinge.net>
|
|
*
|
|
* Strawberry is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Strawberry is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Strawberry. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#ifndef LYRICSFETCHER_H
|
|
#define LYRICSFETCHER_H
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <QtGlobal>
|
|
#include <QObject>
|
|
#include <QQueue>
|
|
#include <QTimer>
|
|
#include <QHash>
|
|
#include <QList>
|
|
#include <QString>
|
|
#include <QUrl>
|
|
|
|
class LyricsProviders;
|
|
class LyricsFetcherSearch;
|
|
|
|
struct LyricsSearchRequest {
|
|
quint64 id;
|
|
QString artist;
|
|
QString album;
|
|
QString title;
|
|
};
|
|
|
|
struct LyricsSearchResult {
|
|
QString provider;
|
|
QString artist;
|
|
QString album;
|
|
QString title;
|
|
QString lyrics;
|
|
float score;
|
|
};
|
|
Q_DECLARE_METATYPE(LyricsSearchResult);
|
|
|
|
typedef QList<LyricsSearchResult> LyricsSearchResults;
|
|
Q_DECLARE_METATYPE(QList<LyricsSearchResult>);
|
|
|
|
class LyricsFetcher : public QObject {
|
|
Q_OBJECT
|
|
|
|
public:
|
|
LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr);
|
|
virtual ~LyricsFetcher() {}
|
|
|
|
static const int kMaxConcurrentRequests;
|
|
static const QRegExp kRemoveNonAlpha;
|
|
static const QRegExp kRemoveFromTitle;
|
|
|
|
quint64 Search(const QString &artist, const QString &album, const QString &title);
|
|
void Clear();
|
|
|
|
signals:
|
|
void LyricsFetched(quint64, const QString &lyrics);
|
|
void SearchFinished(quint64, const LyricsSearchResults &results);
|
|
|
|
private slots:
|
|
void SingleSearchFinished(quint64, LyricsSearchResults results);
|
|
void SingleLyricsFetched(quint64, const QString &lyrics);
|
|
void StartRequests();
|
|
|
|
private:
|
|
void AddRequest(const LyricsSearchRequest &req);
|
|
|
|
LyricsProviders *lyrics_providers_;
|
|
quint64 next_id_;
|
|
|
|
QQueue<LyricsSearchRequest> queued_requests_;
|
|
QHash<quint64, LyricsFetcherSearch*> active_requests_;
|
|
|
|
QTimer *request_starter_;
|
|
|
|
};
|
|
|
|
#endif // LYRICSFETCHER_H
|