Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lyrics fetcher: fix shadow warnings

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-07-09 00:51:26 +02:00
parent d8a838a3f7
commit 54d11a464c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lyrics_fetcher.h
View File

@@ -35,7 +35,7 @@ struct LyricsFetcher
virtual Result fetch(const std::string &artist, const std::string &title);
protected:
virtual const char *url() = 0;
virtual const char *urlTemplate() = 0;
virtual const char *regex() = 0;
virtual bool notLyrics(const std::string &) { return false; }
@@ -52,7 +52,7 @@ struct LyricwikiFetcher : public LyricsFetcher
virtual Result fetch(const std::string &artist, const std::string &title);
protected:
virtual const char *url() { return "http://lyrics.wikia.com/api.php?action=lyrics&fmt=xml&func=getSong&artist=%artist%&song=%title%"; }
virtual const char *urlTemplate() { return "http://lyrics.wikia.com/api.php?action=lyrics&fmt=xml&func=getSong&artist=%artist%&song=%title%"; }
virtual const char *regex() { return "<url>(.*?)</url>"; }
virtual bool notLyrics(const std::string &data);
@@ -65,7 +65,7 @@ struct GoogleLyricsFetcher : public LyricsFetcher
virtual Result fetch(const std::string &artist, const std::string &title);
protected:
virtual const char *url() { return URL; }
virtual const char *urlTemplate() { return URL; }
virtual const char *siteKeyword() { return name(); }
virtual bool isURLOk(const std::string &url);