dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LyricsFetcher: Change request ID to quint64

Browse Source
This commit is contained in:
Jonas Kvinge
2021-10-30 03:15:03 +02:00
parent 8b8e427a2b
commit 67a6d6c1e3
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lyrics/lyricsfetcher.cpp
View File

@@ -45,7 +45,7 @@ LyricsFetcher::LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent)
}
int LyricsFetcher::Search(const QString &artist, const QString &album, const QString &title) {
quint64 LyricsFetcher::Search(const QString &artist, const QString &album, const QString &title) {
LyricsSearchRequest request;
request.artist = artist;
@@ -53,7 +53,7 @@ int LyricsFetcher::Search(const QString &artist, const QString &album, const QSt
request.album.remove(Song::kAlbumRemoveMisc);
request.title = title;
request.title.remove(Song::kTitleRemoveMisc);
request.id = next_id_++;
request.id = ++next_id_;
AddRequest(request);
return request.id;
@@ -105,7 +105,7 @@ void LyricsFetcher::StartRequests() {
}
void LyricsFetcher::SingleSearchFinished(const int request_id, const LyricsSearchResults &results) {
void LyricsFetcher::SingleSearchFinished(const quint64 request_id, const LyricsSearchResults &results) {
if (!active_requests_.contains(request_id)) return;
@@ -115,7 +115,7 @@ void LyricsFetcher::SingleSearchFinished(const int request_id, const LyricsSearc
}
void LyricsFetcher::SingleLyricsFetched(const int request_id, const QString &provider, const QString &lyrics) {
void LyricsFetcher::SingleLyricsFetched(const quint64 request_id, const QString &provider, const QString &lyrics) {
if (!active_requests_.contains(request_id)) return;

16
src/lyrics/lyricsfetcher.h
View File

@@ -38,7 +38,7 @@ class LyricsFetcherSearch;
struct LyricsSearchRequest {
explicit LyricsSearchRequest() : id(-1) {}
int id;
quint64 id;
QString artist;
QString album;
QString title;
@@ -65,29 +65,29 @@ class LyricsFetcher : public QObject {
explicit LyricsFetcher(LyricsProviders *lyrics_providers, QObject *parent = nullptr);
~LyricsFetcher() override {}
int Search(const QString &artist, const QString &album, const QString &title);
quint64 Search(const QString &artist, const QString &album, const QString &title);
void Clear();
private:
void AddRequest(const LyricsSearchRequest &req);
signals:
void LyricsFetched(int request_id, QString provider, QString lyrics);
void SearchFinished(int request_id, LyricsSearchResults results);
void LyricsFetched(quint64 request_id, QString provider, QString lyrics);
void SearchFinished(quint64 request_id, LyricsSearchResults results);
private slots:
void SingleSearchFinished(const int request_id, const LyricsSearchResults &results);
void SingleLyricsFetched(const int request_id, const QString &provider, const QString &lyrics);
void SingleSearchFinished(const quint64 request_id, const LyricsSearchResults &results);
void SingleLyricsFetched(const quint64 request_id, const QString &provider, const QString &lyrics);
void StartRequests();
private:
static const int kMaxConcurrentRequests;
LyricsProviders *lyrics_providers_;
int next_id_;
quint64 next_id_;
QQueue<LyricsSearchRequest> queued_requests_;
QHash<int, LyricsFetcherSearch*> active_requests_;
QHash<quint64, LyricsFetcherSearch*> active_requests_;
QTimer *request_starter_;

4
src/lyrics/lyricsfetchersearch.h
View File

@@ -42,8 +42,8 @@ class LyricsFetcherSearch : public QObject {
void Cancel();
signals:
void SearchFinished(int, LyricsSearchResults results);
void LyricsFetched(int, QString provider, QString lyrics);
void SearchFinished(quint64, LyricsSearchResults results);
void LyricsFetched(quint64, QString provider, QString lyrics);
private slots:
void ProviderSearchFinished(const int id, const LyricsSearchResults &results);