From 10ceacea7c7fff18b4397e6e89e5b7ed82508e6d Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 30 Aug 2014 12:19:35 +0200 Subject: [PATCH] lyrics fetcher: update lyricsmania fetcher --- src/lyrics_fetcher.cpp | 10 ---------- src/lyrics_fetcher.h | 4 +--- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index 1a15fa4a..ec011b92 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -247,16 +247,6 @@ bool MetrolyricsFetcher::isURLOk(const std::string &url) /**********************************************************************/ -void LyricsmaniaFetcher::postProcess(std::string &data) -{ - // lyricsmania.com uses iso-8859-1 as the encoding - // so we need to convert obtained lyrics to utf-8 - data = Charset::toUtf8From(data, "iso-8859-1"); - LyricsFetcher::postProcess(data); -} - -/**********************************************************************/ - LyricsFetcher::Result InternetLyricsFetcher::fetch(const std::string &artist, const std::string &title) { GoogleLyricsFetcher::fetch(artist, title); diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h index ef28261b..aeae0594 100644 --- a/src/lyrics_fetcher.h +++ b/src/lyrics_fetcher.h @@ -90,9 +90,7 @@ struct LyricsmaniaFetcher : public GoogleLyricsFetcher virtual const char *name() { return "lyricsmania.com"; } protected: - virtual const char *regex() { return "
(.*?)
"; } - - virtual void postProcess(std::string &data); + virtual const char *regex() { return "
(.*?)
"; } }; struct Sing365Fetcher : public GoogleLyricsFetcher