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

Move SearchType to StreamingService

Browse Source
This commit is contained in:
Jonas Kvinge
2025-03-08 22:41:43 +01:00
parent f85d60f5cd
commit baa82966d8
11 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qobuz/qobuzservice.cpp
View File

@@ -104,7 +104,7 @@ QobuzService::QobuzService(const SharedPtr<TaskManager> task_manager,
credential_id_(-1),
pending_search_id_(0),
next_pending_search_id_(1),
pending_search_type_(StreamingSearchView::SearchType::Artists),
pending_search_type_(SearchType::Artists),
search_id_(0),
login_sent_(false),
login_attempts_(0),
@@ -645,7 +645,7 @@ void QobuzService::SongsUpdateProgressReceived(const int id, const int progress)
Q_EMIT SongsUpdateProgress(progress);
}
int QobuzService::Search(const QString &text, StreamingSearchView::SearchType type) {
int QobuzService::Search(const QString &text, const SearchType type) {
pending_search_id_ = next_pending_search_id_;
pending_search_text_ = text;
@@ -686,13 +686,13 @@ void QobuzService::SendSearch() {
QobuzBaseRequest::Type query_type = QobuzBaseRequest::Type::None;
switch (pending_search_type_) {
case StreamingSearchView::SearchType::Artists:
case SearchType::Artists:
query_type = QobuzBaseRequest::Type::SearchArtists;
break;
case StreamingSearchView::SearchType::Albums:
case SearchType::Albums:
query_type = QobuzBaseRequest::Type::SearchAlbums;
break;
case StreamingSearchView::SearchType::Songs:
case SearchType::Songs:
query_type = QobuzBaseRequest::Type::SearchSongs;
break;
}

4
src/qobuz/qobuzservice.h
View File

@@ -78,7 +78,7 @@ class QobuzService : public StreamingService {
void ReloadSettings() override;
void Logout();
int Search(const QString &text, StreamingSearchView::SearchType type) override;
int Search(const QString &text, const SearchType type) override;
void CancelSearch() override;
int max_login_attempts() const { return kLoginAttempts; }
@@ -194,7 +194,7 @@ class QobuzService : public StreamingService {
int pending_search_id_;
int next_pending_search_id_;
QString pending_search_text_;
StreamingSearchView::SearchType pending_search_type_;
SearchType pending_search_type_;
int search_id_;
QString search_text_;