Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Consistently name GrooveShark.

This commit is contained in:
John Maguire 2011-09-30 16:02:57 +02:00
parent 41ce54a088
commit bbd0cef2af
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/globalsearch/groovesharksearchprovider.cpp
View File

@ -24,11 +24,11 @@
#include "internet/groovesharkservice.h"
#include "playlist/songmimedata.h"
GroovesharkSearchProvider::GroovesharkSearchProvider(QObject* parent)
GrooveSharkSearchProvider::GrooveSharkSearchProvider(QObject* parent)
: service_(NULL) {
}
void GroovesharkSearchProvider::Init(GrooveSharkService* service) {
void GrooveSharkSearchProvider::Init(GrooveSharkService* service) {
service_ = service;
SearchProvider::Init("GrooveShark", "grooveshark",
QIcon(":providers/grooveshark.png"), true, false);
@ -46,12 +46,12 @@ void GroovesharkSearchProvider::Init(GrooveSharkService* service) {
SLOT(AlbumArtLoaded(quint64, QImage)));
}
void GroovesharkSearchProvider::SearchAsync(int id, const QString& query) {
void GrooveSharkSearchProvider::SearchAsync(int id, const QString& query) {
const int service_id = service_->SimpleSearch(query);
pending_searches_[service_id] = id;
}
void GroovesharkSearchProvider::SearchDone(int id, SongList songs) {
void GrooveSharkSearchProvider::SearchDone(int id, SongList songs) {
// Map back to the original id.
const int global_search_id = pending_searches_.take(id);
@ -69,12 +69,12 @@ void GroovesharkSearchProvider::SearchDone(int id, SongList songs) {
emit SearchFinished(global_search_id);
}
void GroovesharkSearchProvider::LoadArtAsync(int id, const Result& result) {
void GrooveSharkSearchProvider::LoadArtAsync(int id, const Result& result) {
quint64 loader_id = cover_loader_->Worker()->LoadImageAsync(result.metadata_);
cover_loader_tasks_[loader_id] = id;
}
void GroovesharkSearchProvider::AlbumArtLoaded(quint64 id, const QImage& image) {
void GrooveSharkSearchProvider::AlbumArtLoaded(quint64 id, const QImage& image) {
if (!cover_loader_tasks_.contains(id)) {
return;
}
@ -82,7 +82,7 @@ void GroovesharkSearchProvider::AlbumArtLoaded(quint64 id, const QImage& image)
emit ArtLoaded(original_id, image);
}
void GroovesharkSearchProvider::LoadTracksAsync(int id, const Result& result) {
void GrooveSharkSearchProvider::LoadTracksAsync(int id, const Result& result) {
SongList ret;
switch (result.type_) {
@ -91,7 +91,7 @@ void GroovesharkSearchProvider::LoadTracksAsync(int id, const Result& result) {
break;
default:
// TODO: Implement albums in Grooveshark global search.
// TODO: Implement albums in GrooveShark global search.
Q_ASSERT(0);
}

4
src/globalsearch/groovesharksearchprovider.h
View File

@ -24,11 +24,11 @@
class AlbumCoverLoader;
class GrooveSharkService;
class GroovesharkSearchProvider : public SearchProvider {
class GrooveSharkSearchProvider : public SearchProvider {
Q_OBJECT
public:
explicit GroovesharkSearchProvider(QObject* parent = 0);
explicit GrooveSharkSearchProvider(QObject* parent = 0);
void Init(GrooveSharkService* service);
// SearchProvider

2
src/internet/groovesharkservice.cpp
View File

@ -91,7 +91,7 @@ GrooveSharkService::GrooveSharkService(InternetModel *parent)
session_id_ = s.value("sessionid").toString();
username_ = s.value("username").toString();
GroovesharkSearchProvider* search_provider = new GroovesharkSearchProvider(this);
GrooveSharkSearchProvider* search_provider = new GrooveSharkSearchProvider(this);
search_provider->Init(this);
model()->global_search()->AddProvider(search_provider);
}