Compare commits
5 Commits
v2.1.0
...
20502200d9
| Author | SHA1 | Date | |
|---|---|---|---|
|
20502200d9
|
|||
|
e6de4f11e7
|
|||
|
c4bce75866
|
|||
|
08b87bccbd
|
|||
|
fa460b97cf
|
@@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required (VERSION 3.0...3.27)
|
cmake_minimum_required (VERSION 3.0...3.27)
|
||||||
project (nncmpp VERSION 2.1.0 LANGUAGES C)
|
project (nncmpp VERSION 2.1.1 LANGUAGES C)
|
||||||
|
|
||||||
# Moar warnings
|
# Moar warnings
|
||||||
if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
|
if ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
|
||||||
@@ -121,14 +121,16 @@ add_custom_command (OUTPUT ${actions}
|
|||||||
# Build the main executable and link it
|
# Build the main executable and link it
|
||||||
add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c ${actions})
|
add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c ${actions})
|
||||||
target_link_libraries (${PROJECT_NAME} ${Unistring_LIBRARIES}
|
target_link_libraries (${PROJECT_NAME} ${Unistring_LIBRARIES}
|
||||||
${Ncursesw_LIBRARIES} termo-static ${curl_LIBRARIES} ${extra_libraries})
|
${Ncursesw_LIBRARIES} ${Termo_LIBRARIES} ${curl_LIBRARIES}
|
||||||
|
${extra_libraries})
|
||||||
add_threads (${PROJECT_NAME})
|
add_threads (${PROJECT_NAME})
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||||
install (DIRECTORY contrib DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
|
install (DIRECTORY contrib DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
|
||||||
install (DIRECTORY info DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
|
install (DIRECTORY info DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
|
||||||
|
USE_SOURCE_PERMISSIONS)
|
||||||
if (WITH_X11)
|
if (WITH_X11)
|
||||||
include (IconUtils)
|
include (IconUtils)
|
||||||
|
|
||||||
|
|||||||
2
LICENSE
2
LICENSE
@@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2016 - 2023, Přemysl Eric Janouch <p@janouch.name>
|
Copyright (c) 2016 - 2024, Přemysl Eric Janouch <p@janouch.name>
|
||||||
|
|
||||||
Permission to use, copy, modify, and/or distribute this software for any
|
Permission to use, copy, modify, and/or distribute this software for any
|
||||||
purpose with or without fee is hereby granted.
|
purpose with or without fee is hereby granted.
|
||||||
|
|||||||
14
NEWS
14
NEWS
@@ -1,3 +1,17 @@
|
|||||||
|
Unreleased
|
||||||
|
|
||||||
|
* Made global search indicate the search terms
|
||||||
|
|
||||||
|
|
||||||
|
2.1.1 (2024-02-27)
|
||||||
|
|
||||||
|
* Fixed installation of Info tab plugins
|
||||||
|
|
||||||
|
* Fixed display of playback mode toggles in the terminal user interface
|
||||||
|
|
||||||
|
* Fixed a dead link in the manual page
|
||||||
|
|
||||||
|
|
||||||
2.1.0 (2024-02-11)
|
2.1.0 (2024-02-11)
|
||||||
|
|
||||||
* Added ability to look up song lyrics,
|
* Added ability to look up song lyrics,
|
||||||
|
|||||||
2
liberty
2
liberty
Submodule liberty updated: 2a1f17a8f7...969a4cfc3e
@@ -69,7 +69,7 @@ colors = {
|
|||||||
scrollbar = ""
|
scrollbar = ""
|
||||||
}
|
}
|
||||||
streams = {
|
streams = {
|
||||||
"dnbradio.com" = "http://www.dnbradio.com/hi.m3u"
|
"dnbradio.com" = "https://dnbradio.com/hi.pls"
|
||||||
"BassDrive.com" = "http://bassdrive.com/v2/streams/BassDrive.pls"
|
"BassDrive.com" = "http://bassdrive.com/v2/streams/BassDrive.pls"
|
||||||
}
|
}
|
||||||
....
|
....
|
||||||
|
|||||||
19
nncmpp.c
19
nncmpp.c
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* nncmpp -- the MPD client you never knew you needed
|
* nncmpp -- the MPD client you never knew you needed
|
||||||
*
|
*
|
||||||
* Copyright (c) 2016 - 2023, Přemysl Eric Janouch <p@janouch.name>
|
* Copyright (c) 2016 - 2024, Přemysl Eric Janouch <p@janouch.name>
|
||||||
*
|
*
|
||||||
* Permission to use, copy, modify, and/or distribute this software for any
|
* Permission to use, copy, modify, and/or distribute this software for any
|
||||||
* purpose with or without fee is hereby granted.
|
* purpose with or without fee is hereby granted.
|
||||||
@@ -3599,17 +3599,21 @@ static void
|
|||||||
library_tab_on_search_data (const struct mpd_response *response,
|
library_tab_on_search_data (const struct mpd_response *response,
|
||||||
const struct strv *data, void *user_data)
|
const struct strv *data, void *user_data)
|
||||||
{
|
{
|
||||||
(void) user_data;
|
char *filter = user_data;
|
||||||
if (!g_library_tab.searching)
|
if (!g_library_tab.searching)
|
||||||
return;
|
goto out;
|
||||||
|
|
||||||
if (!response->success)
|
if (!response->success)
|
||||||
{
|
|
||||||
print_error ("cannot search: %s", response->message_text);
|
print_error ("cannot search: %s", response->message_text);
|
||||||
return;
|
else
|
||||||
|
{
|
||||||
|
cstr_set (&g_library_tab.super.header,
|
||||||
|
xstrdup_printf ("%s: %s", "Global search", filter));
|
||||||
|
library_tab_load_data (data);
|
||||||
}
|
}
|
||||||
|
|
||||||
library_tab_load_data (data);
|
out:
|
||||||
|
free (filter);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -3620,9 +3624,8 @@ search_on_changed (void)
|
|||||||
size_t len;
|
size_t len;
|
||||||
char *u8 = (char *) u32_to_u8 (g.editor.line, g.editor.len + 1, NULL, &len);
|
char *u8 = (char *) u32_to_u8 (g.editor.line, g.editor.len + 1, NULL, &len);
|
||||||
mpd_client_send_command (c, "search", "any", u8, NULL);
|
mpd_client_send_command (c, "search", "any", u8, NULL);
|
||||||
free (u8);
|
|
||||||
|
|
||||||
mpd_client_add_task (c, library_tab_on_search_data, NULL);
|
mpd_client_add_task (c, library_tab_on_search_data, u8);
|
||||||
mpd_client_idle (c, 0);
|
mpd_client_idle (c, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user