From b3473e290ce1caeab9d18da689607013ffac9652 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Mon, 18 Jan 2016 13:54:51 +0100 Subject: [PATCH 1/7] change version to 0.7.3_dev --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index eaa23fda..ae85b429 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ncmpcpp 0.7.3 (????-??-??) + 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. diff --git a/configure.ac b/configure.ac index 450b7364..d8bd9c33 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT(configure.ac) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE(ncmpcpp, 0.7.2) +AM_INIT_AUTOMAKE(ncmpcpp, 0.7.3_dev) m4_include([m4/ax_lib_readline.m4]) From 3a94ad886e4905caf7a149575357e3b821b32402 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Mon, 18 Jan 2016 14:04:46 +0100 Subject: [PATCH 2/7] window: recognize home/end in more terminal emulators --- NEWS | 1 + src/window.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index ae85b429..0984257c 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ncmpcpp 0.7.3 (????-??-??) +* 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. diff --git a/src/window.cpp b/src/window.cpp index 970293ab..85bfd03b 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -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; From 3a865006658b96d8c05f9a8ef1dc6db2e6d9ab15 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 20 Jan 2016 14:36:22 +0100 Subject: [PATCH 3/7] change version to 0.7.3 --- NEWS | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 0984257c..84699dcb 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ncmpcpp 0.7.3 (????-??-??) +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) diff --git a/configure.ac b/configure.ac index d8bd9c33..83282b5c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT(configure.ac) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE(ncmpcpp, 0.7.3_dev) +AM_INIT_AUTOMAKE(ncmpcpp, 0.7.3) m4_include([m4/ax_lib_readline.m4]) From e8ad8707877ba1e4325e7ddb72d05a35a283d8fe Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 17 Apr 2016 07:20:05 +0200 Subject: [PATCH 4/7] change version to 0.7.4_dev --- NEWS | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 84699dcb..9f7b3581 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +ncmpcpp 0.7.4 (????-??-??) + ncmpcpp 0.7.3 (2016-01-20) * Home and End keys are now recognized in a few specific terminal emulators. diff --git a/configure.ac b/configure.ac index 83282b5c..31845e4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT(configure.ac) AC_CONFIG_HEADERS(config.h) -AM_INIT_AUTOMAKE(ncmpcpp, 0.7.3) +AM_INIT_AUTOMAKE(ncmpcpp, 0.7.4_dev) m4_include([m4/ax_lib_readline.m4]) From 62f70e7bec2ea5adfd09088cbcc4d921d6503464 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 17 Apr 2016 07:20:19 +0200 Subject: [PATCH 5/7] lyrics fetcher: fix lyricwiki fetcher --- NEWS | 1 + src/lyrics_fetcher.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 9f7b3581..9cdebd4b 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ ncmpcpp 0.7.4 (????-??-??) +* Fetching lyrics from lyricwiki.org was fixed. ncmpcpp 0.7.3 (2016-01-20) * Home and End keys are now recognized in a few specific terminal emulators. diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index 2a8ece54..7e1859fe 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -126,7 +126,7 @@ LyricsFetcher::Result LyricwikiFetcher::fetch(const std::string &artist, const s return result; } - auto lyrics = getContent("
(.*?)