Merge branch '0.7.x'

master
Andrzej Rybczak 10 years ago
commit 8d12ac790f
  1. 7
      NEWS
  2. 2
      configure.ac
  3. 2
      src/lyrics_fetcher.cpp
  4. 5
      src/window.cpp

@ -1,5 +1,12 @@
ncmpcpp-0.8 (????-??-??)
ncmpcpp 0.7.4 (2016-04-17)
* Fetching lyrics from lyricwiki.org was fixed.
* Configure script now continues without errors if ICU library was not found.
ncmpcpp 0.7.3 (2016-01-20)
* Home and End keys are now recognized in a few specific terminal emulators.
ncmpcpp-0.7.2 (2016-01-16)
* Attempt to add non-song item to playlist from search engine doesn't trigger assertion failure anymore.
* Fetching lyrics from metrolyrics.com was fixed.

@ -186,7 +186,7 @@ PKG_CHECK_MODULES([ICU], [icu-uc], [
CPPFLAGS="$old_CPPFLAGS"
LIBS="$old_LIBS",
)
], [])
], [[]])
dnl =============================
dnl = checking for boost.thread =

@ -126,7 +126,7 @@ LyricsFetcher::Result LyricwikiFetcher::fetch(const std::string &artist, const s
return result;
}
auto lyrics = getContent("<div class='lyricbox'><script>.*?</script>(.*?)<!--", data);
auto lyrics = getContent("<div class='lyricbox'>(.*?)<!--", data);
if (lyrics.empty())
{

@ -819,6 +819,11 @@ Key::Type Window::getInputChar(int key)
return Key::Right;
case 'D':
return Key::Left;
// terminator
case 'F':
return Key::End;
case 'H':
return Key::Home;
// rxvt
case 'a':
return Key::Ctrl | Key::Up;

Loading…
Cancel
Save