Compare commits
66 Commits
v0.9
...
5aa07fd8af
| Author | SHA1 | Date | |
|---|---|---|---|
|
5aa07fd8af
|
|||
|
2060da4a8e
|
|||
|
f5b5cec340
|
|||
|
1a671dfad5
|
|||
|
587a02fa15
|
|||
|
227b8e0fa2
|
|||
|
e66e9f249a
|
|||
|
32203f8117
|
|||
|
6b871898d8
|
|||
|
4598c45d2f
|
|||
|
66c77c3f8d
|
|||
|
7165a8eb02
|
|||
|
87b57bb24c
|
|||
|
ba86961ba5
|
|||
|
0cdb4989e5
|
|||
|
6de940fe96
|
|||
|
6bd8c1db2f
|
|||
|
56efe9c6a9
|
|||
|
8a17e674f8
|
|||
|
bd0ee66c19
|
|||
|
6f6efe077b
|
|||
|
ee5c41b2bf
|
|||
|
9a67e076a9
|
|||
|
53fbb3dec1
|
|||
|
267598643a
|
|||
|
fba1210e9f
|
|||
|
30777e8fd3
|
|||
|
353174ee3c
|
|||
|
2d641d087f
|
|||
|
20c8385f2e
|
|||
|
fa4443a3ce
|
|||
|
14ba637d4b
|
|||
|
66bc3f1c2c
|
|||
|
0646cea126
|
|||
|
a439a56ee9
|
|||
|
120a11ca1b
|
|||
|
7e531e95c5
|
|||
|
0335443b22
|
|||
|
70ff29e3d5
|
|||
|
ba122b7672
|
|||
|
456fab5b11
|
|||
|
f4999a63a5
|
|||
|
33b4976d7a
|
|||
|
df82357cfd
|
|||
|
bd5152a9e7
|
|||
|
322a60aa39
|
|||
|
e86f4b6908
|
|||
|
26b6b1f902
|
|||
|
8121046be6
|
|||
|
0dc29a3e2d
|
|||
|
791c000791
|
|||
|
c0119027b1
|
|||
|
3934d9b1f9
|
|||
|
2d3909fdd1
|
|||
|
b6ce8a0913
|
|||
|
9928eca274
|
|||
|
6c2ae2f6bb
|
|||
|
b3579d1128
|
|||
|
525e952753
|
|||
|
8707b38c48
|
|||
|
7af041ac01
|
|||
|
1f0cab7cdd
|
|||
|
e21699ab47
|
|||
|
d124f43cf6
|
|||
|
0e2a050c4f
|
|||
|
6c1546e919
|
32
.clang-format
Normal file
32
.clang-format
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# clang-format is fairly limited, and these rules are approximate:
|
||||||
|
# - array initializers can get terribly mangled with clang-format 12.0,
|
||||||
|
# - sometimes it still aligns with space characters,
|
||||||
|
# - struct name NL { NL ... NL } NL name; is unachievable.
|
||||||
|
BasedOnStyle: GNU
|
||||||
|
ColumnLimit: 80
|
||||||
|
IndentWidth: 4
|
||||||
|
TabWidth: 4
|
||||||
|
UseTab: ForContinuationAndIndentation
|
||||||
|
BreakBeforeBraces: Allman
|
||||||
|
SpaceAfterCStyleCast: true
|
||||||
|
AlignAfterOpenBracket: DontAlign
|
||||||
|
AlignOperands: DontAlign
|
||||||
|
AlignConsecutiveMacros: Consecutive
|
||||||
|
AllowAllArgumentsOnNextLine: false
|
||||||
|
AllowAllParametersOfDeclarationOnNextLine: false
|
||||||
|
IndentGotoLabels: false
|
||||||
|
|
||||||
|
# IncludeCategories has some potential, but it may also break the build.
|
||||||
|
# Note that the documentation says the value should be "Never".
|
||||||
|
SortIncludes: false
|
||||||
|
|
||||||
|
# This is a compromise, it generally works out aesthetically better.
|
||||||
|
BinPackArguments: false
|
||||||
|
|
||||||
|
# Unfortunately, this can't be told to align to column 40 or so.
|
||||||
|
SpacesBeforeTrailingComments: 2
|
||||||
|
|
||||||
|
# liberty-specific macro body wrappers.
|
||||||
|
MacroBlockBegin: "BLOCK_START"
|
||||||
|
MacroBlockEnd: "BLOCK_END"
|
||||||
|
ForEachMacros: ["LIST_FOR_EACH"]
|
||||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -7,3 +7,5 @@
|
|||||||
/nncmpp.files
|
/nncmpp.files
|
||||||
/nncmpp.creator*
|
/nncmpp.creator*
|
||||||
/nncmpp.includes
|
/nncmpp.includes
|
||||||
|
/nncmpp.cflags
|
||||||
|
/nncmpp.cxxflags
|
||||||
|
|||||||
138
CMakeLists.txt
138
CMakeLists.txt
@@ -1,20 +1,11 @@
|
|||||||
project (nncmpp C)
|
cmake_minimum_required (VERSION 3.0)
|
||||||
cmake_minimum_required (VERSION 2.8.5)
|
project (nncmpp VERSION 1.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)
|
||||||
set (wdisabled "-Wno-unused-function -Wno-implicit-fallthrough")
|
set (wdisabled "-Wno-unused-function")
|
||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra ${wdisabled}")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -Wextra ${wdisabled}")
|
||||||
endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
|
endif ()
|
||||||
|
|
||||||
# Version
|
|
||||||
set (project_VERSION_MAJOR "0")
|
|
||||||
set (project_VERSION_MINOR "9")
|
|
||||||
set (project_VERSION_PATCH "0")
|
|
||||||
|
|
||||||
set (project_VERSION "${project_VERSION_MAJOR}")
|
|
||||||
set (project_VERSION "${project_VERSION}.${project_VERSION_MINOR}")
|
|
||||||
set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}")
|
|
||||||
|
|
||||||
# For custom modules
|
# For custom modules
|
||||||
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
|
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/liberty/cmake)
|
||||||
@@ -30,63 +21,119 @@ include (AddThreads)
|
|||||||
find_package (Termo QUIET NO_MODULE)
|
find_package (Termo QUIET NO_MODULE)
|
||||||
option (USE_SYSTEM_TERMO
|
option (USE_SYSTEM_TERMO
|
||||||
"Don't compile our own termo library, use the system one" ${Termo_FOUND})
|
"Don't compile our own termo library, use the system one" ${Termo_FOUND})
|
||||||
|
|
||||||
if (USE_SYSTEM_TERMO)
|
if (USE_SYSTEM_TERMO)
|
||||||
if (NOT Termo_FOUND)
|
if (NOT Termo_FOUND)
|
||||||
message (FATAL_ERROR "System termo library not found")
|
message (FATAL_ERROR "System termo library not found")
|
||||||
endif (NOT Termo_FOUND)
|
endif ()
|
||||||
else (USE_SYSTEM_TERMO)
|
else ()
|
||||||
|
# We don't want the library to install, but EXCLUDE_FROM_ALL ignores tests
|
||||||
add_subdirectory (termo EXCLUDE_FROM_ALL)
|
add_subdirectory (termo EXCLUDE_FROM_ALL)
|
||||||
# We don't have many good choices when we don't want to install it and want
|
file (WRITE ${PROJECT_BINARY_DIR}/CTestCustom.cmake
|
||||||
# to support older versions of CMake; this is a relatively clean approach
|
"execute_process (COMMAND ${CMAKE_COMMAND} --build termo)")
|
||||||
# (other possibilities: setting a variable in the parent scope, using a
|
|
||||||
# cache variable, writing a special config file with build paths in it and
|
# We don't have many good choices; this is a relatively clean approach
|
||||||
# including it here, or setting a custom property on the targets).
|
# (other possibilities: setting a variable in the parent scope, using
|
||||||
|
# a cache variable, writing a special config file with build paths in it
|
||||||
|
# and including it here, or setting a custom property on the targets)
|
||||||
get_directory_property (Termo_INCLUDE_DIRS
|
get_directory_property (Termo_INCLUDE_DIRS
|
||||||
DIRECTORY termo INCLUDE_DIRECTORIES)
|
DIRECTORY termo INCLUDE_DIRECTORIES)
|
||||||
set (Termo_LIBRARIES termo-static)
|
set (Termo_LIBRARIES termo-static)
|
||||||
endif (USE_SYSTEM_TERMO)
|
endif ()
|
||||||
|
|
||||||
include_directories (${UNISTRING_INCLUDE_DIRS}
|
pkg_check_modules (fftw fftw3 fftw3f)
|
||||||
${NCURSESW_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS} ${curl_INCLUDE_DIRS})
|
option (WITH_FFTW "Use FFTW to enable spectrum visualisation" ${fftw_FOUND})
|
||||||
link_directories (${curl_LIBRARY_DIRS})
|
if (WITH_FFTW)
|
||||||
|
if (NOT fftw_FOUND)
|
||||||
|
message (FATAL_ERROR "FFTW not found")
|
||||||
|
endif ()
|
||||||
|
list (APPEND extra_libraries ${fftw_LIBRARIES})
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
pkg_check_modules (libpulse libpulse)
|
||||||
|
option (WITH_PULSE "Enable control of PulseAudio sink volume" ${libpulse_FOUND})
|
||||||
|
if (WITH_PULSE)
|
||||||
|
if (NOT libpulse_FOUND)
|
||||||
|
message (FATAL_ERROR "libpulse not found")
|
||||||
|
endif ()
|
||||||
|
list (APPEND extra_libraries ${libpulse_LIBRARIES})
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
include_directories (${Unistring_INCLUDE_DIRS}
|
||||||
|
${Ncursesw_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS} ${curl_INCLUDE_DIRS}
|
||||||
|
${fftw_INCLUDE_DIRS} ${libpulse_INCLUDE_DIRS})
|
||||||
|
link_directories (${curl_LIBRARY_DIRS}
|
||||||
|
${fftw_LIBRARY_DIRS} ${libpulse_LIBRARY_DIRS})
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
|
if ("${CMAKE_SYSTEM_NAME}" MATCHES "BSD")
|
||||||
|
# Need this for SIGWINCH in FreeBSD and OpenBSD respectively;
|
||||||
|
# our POSIX version macros make it undefined
|
||||||
|
add_definitions (-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1)
|
||||||
|
elseif (APPLE)
|
||||||
|
add_definitions (-D_DARWIN_C_SOURCE)
|
||||||
|
endif ()
|
||||||
|
|
||||||
include (CheckFunctionExists)
|
include (CheckFunctionExists)
|
||||||
set (CMAKE_REQUIRED_LIBRARIES ${NCURSESW_LIBRARIES})
|
set (CMAKE_REQUIRED_LIBRARIES ${Ncursesw_LIBRARIES})
|
||||||
CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM)
|
CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM)
|
||||||
|
|
||||||
|
# -lm may or may not be a part of libc
|
||||||
|
foreach (extra m)
|
||||||
|
find_library (extra_lib_${extra} ${extra})
|
||||||
|
if (extra_lib_${extra})
|
||||||
|
list (APPEND extra_libraries ${extra_lib_${extra}})
|
||||||
|
endif ()
|
||||||
|
endforeach ()
|
||||||
|
|
||||||
# Generate a configuration file
|
# Generate a configuration file
|
||||||
configure_file (${PROJECT_SOURCE_DIR}/config.h.in
|
configure_file (${PROJECT_SOURCE_DIR}/config.h.in
|
||||||
${PROJECT_BINARY_DIR}/config.h)
|
${PROJECT_BINARY_DIR}/config.h)
|
||||||
include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
|
include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
|
||||||
|
|
||||||
|
# Assuming a Unix-compatible system with a standalone preprocessor
|
||||||
|
set (actions_list ${PROJECT_SOURCE_DIR}/nncmpp.actions)
|
||||||
|
set (actions ${PROJECT_BINARY_DIR}/nncmpp-actions.h)
|
||||||
|
add_custom_command (OUTPUT ${actions}
|
||||||
|
COMMAND cpp -I${PROJECT_BINARY_DIR} -P ${actions_list}
|
||||||
|
| grep . | tr [[\n]] ^ | sed -ne [[h; s/,[^^]*/,/g]] -e [[s/$/COUNT/]]
|
||||||
|
-e [[s/[^^]*/\tACTION_&/g]] -e [[s/.*/enum action {\n&\n};\n/p]]
|
||||||
|
-e [[g; s/,[^^]*//g; y/_/-/]] -e [[s/[^^]\{1,\}/\t"&",/g]]
|
||||||
|
-e [[s/.*/static const char *g_action_names[] = {\n&};\n/p]]
|
||||||
|
-e [[g; s/[^^]*, *//g;]] -e [[s/[^^]\{1,\}/\t"&",/g]]
|
||||||
|
-e [[s/.*/static const char *g_action_descriptions[] = {\n&};/p]]
|
||||||
|
| tr ^ [[\n]] > ${actions}
|
||||||
|
COMMAND test -s ${actions}
|
||||||
|
DEPENDS ${actions_list} ${PROJECT_BINARY_DIR}/config.h VERBATIM)
|
||||||
|
|
||||||
# Build the main executable and link it
|
# Build the main executable and link it
|
||||||
add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c)
|
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})
|
${Ncursesw_LIBRARIES} termo-static ${curl_LIBRARIES} ${extra_libraries})
|
||||||
add_threads (${PROJECT_NAME})
|
add_threads (${PROJECT_NAME})
|
||||||
|
|
||||||
# Installation
|
# Installation
|
||||||
include (GNUInstallDirs)
|
include (GNUInstallDirs)
|
||||||
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})
|
||||||
|
|
||||||
# Generate documentation from program help
|
# Generate documentation from text markup
|
||||||
find_program (HELP2MAN_EXECUTABLE help2man)
|
find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
|
||||||
if (NOT HELP2MAN_EXECUTABLE)
|
if (NOT ASCIIDOCTOR_EXECUTABLE)
|
||||||
message (FATAL_ERROR "help2man not found")
|
message (FATAL_ERROR "asciidoctor not found")
|
||||||
endif (NOT HELP2MAN_EXECUTABLE)
|
endif ()
|
||||||
|
|
||||||
foreach (page ${PROJECT_NAME})
|
foreach (page ${PROJECT_NAME})
|
||||||
set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
|
set (page_output "${PROJECT_BINARY_DIR}/${page}.1")
|
||||||
list (APPEND project_MAN_PAGES "${page_output}")
|
list (APPEND project_MAN_PAGES "${page_output}")
|
||||||
add_custom_command (OUTPUT ${page_output}
|
add_custom_command (OUTPUT ${page_output}
|
||||||
COMMAND ${HELP2MAN_EXECUTABLE} -N
|
COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage
|
||||||
"${PROJECT_BINARY_DIR}/${page}" -o ${page_output}
|
-a release-version=${PROJECT_VERSION}
|
||||||
DEPENDS ${page}
|
"${PROJECT_SOURCE_DIR}/${page}.adoc"
|
||||||
|
-o "${page_output}"
|
||||||
|
DEPENDS ${page}.adoc
|
||||||
COMMENT "Generating man page for ${page}" VERBATIM)
|
COMMENT "Generating man page for ${page}" VERBATIM)
|
||||||
endforeach (page)
|
endforeach ()
|
||||||
|
|
||||||
add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
|
add_custom_target (docs ALL DEPENDS ${project_MAN_PAGES})
|
||||||
|
|
||||||
@@ -94,23 +141,20 @@ foreach (page ${project_MAN_PAGES})
|
|||||||
string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
|
string (REGEX MATCH "\\.([0-9])$" manpage_suffix "${page}")
|
||||||
install (FILES "${page}"
|
install (FILES "${page}"
|
||||||
DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
|
DESTINATION "${CMAKE_INSTALL_MANDIR}/man${CMAKE_MATCH_1}")
|
||||||
endforeach (page)
|
endforeach ()
|
||||||
|
|
||||||
# CPack
|
# CPack
|
||||||
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD client")
|
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "MPD client")
|
||||||
set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
|
set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch")
|
||||||
set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
|
set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>")
|
||||||
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
|
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
|
||||||
set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
|
|
||||||
set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})
|
|
||||||
set (CPACK_PACKAGE_VERSION_PATCH ${project_VERSION_PATCH})
|
|
||||||
set (CPACK_GENERATOR "TGZ;ZIP")
|
set (CPACK_GENERATOR "TGZ;ZIP")
|
||||||
set (CPACK_PACKAGE_FILE_NAME
|
set (CPACK_PACKAGE_FILE_NAME
|
||||||
"${PROJECT_NAME}-${project_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
|
"${PROJECT_NAME}-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
|
||||||
set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${project_VERSION}")
|
set (CPACK_PACKAGE_INSTALL_DIRECTORY "${PROJECT_NAME}-${PROJECT_VERSION}")
|
||||||
set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
|
set (CPACK_SOURCE_GENERATOR "TGZ;ZIP")
|
||||||
set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user")
|
set (CPACK_SOURCE_IGNORE_FILES "/\\\\.git;/build;/CMakeLists.txt.user")
|
||||||
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${project_VERSION}")
|
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PROJECT_VERSION}")
|
||||||
|
|
||||||
set (CPACK_SET_DESTDIR TRUE)
|
set (CPACK_SET_DESTDIR TRUE)
|
||||||
include (CPack)
|
include (CPack)
|
||||||
|
|||||||
2
LICENSE
2
LICENSE
@@ -1,4 +1,4 @@
|
|||||||
Copyright (c) 2016 - 2018, Přemysl Janouch <p@janouch.name>
|
Copyright (c) 2016 - 2021, 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.
|
||||||
|
|||||||
39
NEWS
39
NEWS
@@ -1,3 +1,42 @@
|
|||||||
|
1.1.1 (2021-11-04)
|
||||||
|
|
||||||
|
* Terminal focus in/out events no longer ring the terminall bell
|
||||||
|
|
||||||
|
* Made mouse work in non-rxvt terminals with recent xterm terminfo
|
||||||
|
|
||||||
|
|
||||||
|
1.1.0 (2021-10-21)
|
||||||
|
|
||||||
|
* Now requesting and processing terminal de/focus events,
|
||||||
|
using a new "defocused" attribute for selected rows
|
||||||
|
|
||||||
|
* Made it possible to show a spectrum visualiser when built against FFTW
|
||||||
|
|
||||||
|
* Any program arguments are now added to MPD's current playlist
|
||||||
|
|
||||||
|
|
||||||
|
1.0.0 (2020-11-05)
|
||||||
|
|
||||||
|
* Coming with a real manual page instead of a help2man-generated stub
|
||||||
|
|
||||||
|
* Added a mode to poll MPD for the elapsed time, enabled by default,
|
||||||
|
fixing two cases of improper tracking
|
||||||
|
|
||||||
|
* Started showing song duration in the library
|
||||||
|
|
||||||
|
* Added C-PgUp/PgDown and C-Left/Right bindings to iterate tabs
|
||||||
|
|
||||||
|
* Added VIM-like C-y and C-e bindings for scrolling
|
||||||
|
|
||||||
|
* Added Windows Explorer-like M-Up binding to go up a directory
|
||||||
|
|
||||||
|
* Worked around a cURL bug crashing the application
|
||||||
|
|
||||||
|
* Fixed handling of direct SHOUTcast streams
|
||||||
|
|
||||||
|
* Miscellaneous little fixes
|
||||||
|
|
||||||
|
|
||||||
0.9.0 (2018-11-02)
|
0.9.0 (2018-11-02)
|
||||||
|
|
||||||
* Initial release
|
* Initial release
|
||||||
|
|||||||
61
README.adoc
61
README.adoc
@@ -11,9 +11,14 @@ names, and should be pronounced as "nincompoop".
|
|||||||
|
|
||||||
Features
|
Features
|
||||||
--------
|
--------
|
||||||
Most things are there. Enough for me to use it exclusively. Note that since I
|
Most stuff is there. Enough for me to use the program exclusively. Among other
|
||||||
only use the filesystem browsing mode, that's also the only thing I care to
|
things, it can display and change PulseAudio volume directly to cover the use
|
||||||
implement for the time being.
|
case of remote control, it has a fast spectrum visualiser, and both
|
||||||
|
the appearance and key bindings can be customized.
|
||||||
|
|
||||||
|
Note that since I only use the filesystem browsing mode, that's also the only
|
||||||
|
thing I care to implement for the time being. Similarly, the search feature is
|
||||||
|
known to be clumsy.
|
||||||
|
|
||||||
image::nncmpp.png[align="center"]
|
image::nncmpp.png[align="center"]
|
||||||
|
|
||||||
@@ -22,11 +27,17 @@ Packages
|
|||||||
Regular releases are sporadic. git master should be stable enough. You can get
|
Regular releases are sporadic. git master should be stable enough. You can get
|
||||||
a package with the latest development version from Archlinux's AUR.
|
a package with the latest development version from Archlinux's AUR.
|
||||||
|
|
||||||
Building and Running
|
Documentation
|
||||||
--------------------
|
-------------
|
||||||
Build dependencies: CMake, pkg-config, help2man, liberty (included),
|
See the link:nncmpp.adoc[man page] for information about usage.
|
||||||
termo (included) +
|
The rest of this README will concern itself with externalities.
|
||||||
Runtime dependencies: ncursesw, libunistring, cURL
|
|
||||||
|
Building
|
||||||
|
--------
|
||||||
|
Build dependencies: CMake, pkg-config, asciidoctor,
|
||||||
|
liberty (included), termo (included) +
|
||||||
|
Runtime dependencies: ncursesw, libunistring, cURL,
|
||||||
|
fftw3 (optional), libpulse (optional)
|
||||||
|
|
||||||
$ git clone --recursive https://git.janouch.name/p/nncmpp.git
|
$ git clone --recursive https://git.janouch.name/p/nncmpp.git
|
||||||
$ mkdir nncmpp/build
|
$ mkdir nncmpp/build
|
||||||
@@ -43,40 +54,6 @@ Or you can try telling CMake to make a package for you. For Debian it is:
|
|||||||
$ cpack -G DEB
|
$ cpack -G DEB
|
||||||
# dpkg -i nncmpp-*.deb
|
# dpkg -i nncmpp-*.deb
|
||||||
|
|
||||||
Note that for versions of CMake before 2.8.9, you need to prefix `cpack` with
|
|
||||||
`fakeroot` or file ownership will end up wrong.
|
|
||||||
|
|
||||||
Having the program installed, create a configuration file and run it.
|
|
||||||
|
|
||||||
Configuration
|
|
||||||
-------------
|
|
||||||
Create _~/.config/nncmpp/nncmpp.conf_ with contents like the following:
|
|
||||||
|
|
||||||
....
|
|
||||||
settings = {
|
|
||||||
address = "localhost:6600"
|
|
||||||
password = "<your password>"
|
|
||||||
root = "~/Music"
|
|
||||||
}
|
|
||||||
colors = {
|
|
||||||
normal = ""
|
|
||||||
highlight = "bold"
|
|
||||||
elapsed = "reverse"
|
|
||||||
remains = "ul"
|
|
||||||
tab_bar = "reverse"
|
|
||||||
tab_active = "ul"
|
|
||||||
even = ""
|
|
||||||
odd = ""
|
|
||||||
selection = "reverse"
|
|
||||||
multiselect = "-1 6"
|
|
||||||
scrollbar = ""
|
|
||||||
}
|
|
||||||
streams = {
|
|
||||||
"dnbradio.com" = "http://www.dnbradio.com/hi.m3u"
|
|
||||||
"BassDrive.com" = "http://bassdrive.com/v2/streams/BassDrive.pls"
|
|
||||||
}
|
|
||||||
....
|
|
||||||
|
|
||||||
Terminal caveats
|
Terminal caveats
|
||||||
----------------
|
----------------
|
||||||
This application aspires to be as close to a GUI as possible. It expects you
|
This application aspires to be as close to a GUI as possible. It expects you
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
#ifndef CONFIG_H
|
#ifndef CONFIG_H
|
||||||
#define CONFIG_H
|
#define CONFIG_H
|
||||||
|
|
||||||
#define PROGRAM_NAME "${CMAKE_PROJECT_NAME}"
|
#define PROGRAM_NAME "${PROJECT_NAME}"
|
||||||
#define PROGRAM_VERSION "${project_VERSION}"
|
#define PROGRAM_VERSION "${PROJECT_VERSION}"
|
||||||
|
|
||||||
#cmakedefine HAVE_RESIZETERM
|
#cmakedefine HAVE_RESIZETERM
|
||||||
|
#cmakedefine WITH_FFTW
|
||||||
|
#cmakedefine WITH_PULSE
|
||||||
|
|
||||||
#endif // ! CONFIG_H
|
#endif /* ! CONFIG_H */
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ colors = {
|
|||||||
|
|
||||||
selection = "231 202"
|
selection = "231 202"
|
||||||
multiselect = "231 88"
|
multiselect = "231 88"
|
||||||
|
defocused = "231 250"
|
||||||
directory = "16 231 bold"
|
directory = "16 231 bold"
|
||||||
|
|
||||||
incoming = "28"
|
incoming = "28"
|
||||||
|
|||||||
2
liberty
2
liberty
Submodule liberty updated: bb30c7d86e...782a9a5977
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* line-editor.c: a line editor component for the TUI part of liberty
|
* line-editor.c: a line editor component for the TUI part of liberty
|
||||||
*
|
*
|
||||||
* Copyright (c) 2017 - 2018, Přemysl Janouch <p@janouch.name>
|
* Copyright (c) 2017 - 2018, 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.
|
||||||
|
|||||||
71
nncmpp.actions
Normal file
71
nncmpp.actions
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
NONE, Do nothing
|
||||||
|
|
||||||
|
QUIT, Quit
|
||||||
|
REDRAW, Redraw screen
|
||||||
|
TAB_HELP, Switch to help tab
|
||||||
|
TAB_LAST, Switch to last tab
|
||||||
|
TAB_PREVIOUS, Switch to previous tab
|
||||||
|
TAB_NEXT, Switch to next tab
|
||||||
|
|
||||||
|
MPD_TOGGLE, Toggle play/pause
|
||||||
|
MPD_STOP, Stop playback
|
||||||
|
MPD_PREVIOUS, Previous song
|
||||||
|
MPD_NEXT, Next song
|
||||||
|
MPD_BACKWARD, Seek backwards
|
||||||
|
MPD_FORWARD, Seek forwards
|
||||||
|
MPD_VOLUME_UP, Increase MPD volume
|
||||||
|
MPD_VOLUME_DOWN, Decrease MPD volume
|
||||||
|
|
||||||
|
MPD_SEARCH, Global search
|
||||||
|
MPD_ADD, Add selection to playlist
|
||||||
|
MPD_REPLACE, Replace playlist
|
||||||
|
MPD_REPEAT, Toggle repeat
|
||||||
|
MPD_RANDOM, Toggle random playback
|
||||||
|
MPD_SINGLE, Toggle single song playback
|
||||||
|
MPD_CONSUME, Toggle consume
|
||||||
|
MPD_UPDATE_DB, Update MPD database
|
||||||
|
MPD_COMMAND, Send raw command to MPD
|
||||||
|
|
||||||
|
#ifdef WITH_PULSE
|
||||||
|
PULSE_VOLUME_UP, Increase PulseAudio volume
|
||||||
|
PULSE_VOLUME_DOWN, Decrease PulseAudio volume
|
||||||
|
PULSE_MUTE, Toggle PulseAudio sink mute
|
||||||
|
#endif
|
||||||
|
|
||||||
|
CHOOSE, Choose item
|
||||||
|
DELETE, Delete item
|
||||||
|
UP, Go up a level
|
||||||
|
MULTISELECT, Toggle multiselect
|
||||||
|
|
||||||
|
SCROLL_UP, Scroll up
|
||||||
|
SCROLL_DOWN, Scroll down
|
||||||
|
MOVE_UP, Move selection up
|
||||||
|
MOVE_DOWN, Move selection down
|
||||||
|
|
||||||
|
GOTO_TOP, Go to top
|
||||||
|
GOTO_BOTTOM, Go to bottom
|
||||||
|
GOTO_ITEM_PREVIOUS, Go to previous item
|
||||||
|
GOTO_ITEM_NEXT, Go to next item
|
||||||
|
GOTO_PAGE_PREVIOUS, Go to previous page
|
||||||
|
GOTO_PAGE_NEXT, Go to next page
|
||||||
|
|
||||||
|
GOTO_VIEW_TOP, Select top item
|
||||||
|
GOTO_VIEW_CENTER, Select center item
|
||||||
|
GOTO_VIEW_BOTTOM, Select bottom item
|
||||||
|
|
||||||
|
EDITOR_CONFIRM, Confirm input
|
||||||
|
|
||||||
|
EDITOR_B_CHAR, Go back a character
|
||||||
|
EDITOR_F_CHAR, Go forward a character
|
||||||
|
EDITOR_B_WORD, Go back a word
|
||||||
|
EDITOR_F_WORD, Go forward a word
|
||||||
|
EDITOR_HOME, Go to start of line
|
||||||
|
EDITOR_END, Go to end of line
|
||||||
|
|
||||||
|
EDITOR_B_DELETE, Delete last character
|
||||||
|
EDITOR_F_DELETE, Delete next character
|
||||||
|
EDITOR_B_KILL_WORD, Delete last word
|
||||||
|
EDITOR_B_KILL_LINE, Delete everything up to BOL
|
||||||
|
EDITOR_F_KILL_LINE, Delete everything up to EOL
|
||||||
136
nncmpp.adoc
Normal file
136
nncmpp.adoc
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
nncmpp(1)
|
||||||
|
=========
|
||||||
|
:doctype: manpage
|
||||||
|
:manmanual: nncmpp Manual
|
||||||
|
:mansource: nncmpp {release-version}
|
||||||
|
|
||||||
|
Name
|
||||||
|
----
|
||||||
|
nncmpp - terminal-based MPD client
|
||||||
|
|
||||||
|
Synopsis
|
||||||
|
--------
|
||||||
|
*nncmpp* [_OPTION_]... [_URL_ | _PATH_]...
|
||||||
|
|
||||||
|
Description
|
||||||
|
-----------
|
||||||
|
*nncmpp* is a terminal-based GUI-like MPD client. On start up it will welcome
|
||||||
|
you with an overview of all key bindings and the actions they're assigned to.
|
||||||
|
Individual tabs can be switched to either using the mouse or by pressing *M-1*
|
||||||
|
through *M-9*, corresponding to the order they appear in.
|
||||||
|
|
||||||
|
As a convenience utility, any program arguments are added to the MPD queue.
|
||||||
|
Note that to add files outside the database, you need to connect to MPD using
|
||||||
|
a socket file.
|
||||||
|
|
||||||
|
Options
|
||||||
|
-------
|
||||||
|
*-d*, *--debug*::
|
||||||
|
Adds a "Debug" tab showing all MPD communication and other information
|
||||||
|
that help debug various issues.
|
||||||
|
|
||||||
|
*-h*, *--help*::
|
||||||
|
Display a help message and exit.
|
||||||
|
|
||||||
|
*-V*, *--version*::
|
||||||
|
Output version information and exit.
|
||||||
|
|
||||||
|
Configuration
|
||||||
|
-------------
|
||||||
|
Unless you run MPD on a remote machine, on an unusual port, protected by
|
||||||
|
a password, or only accessible through a Unix socket, the client doesn't need
|
||||||
|
a configuration file to work. It is, however, likely that you'll want to
|
||||||
|
customize the looks or add some streams. You can start off with the following
|
||||||
|
snippet:
|
||||||
|
|
||||||
|
....
|
||||||
|
settings = {
|
||||||
|
address = "~/.mpd/mpd.socket"
|
||||||
|
password = "<your password>"
|
||||||
|
pulseaudio = on
|
||||||
|
}
|
||||||
|
colors = {
|
||||||
|
normal = ""
|
||||||
|
highlight = "bold"
|
||||||
|
elapsed = "reverse"
|
||||||
|
remains = "ul"
|
||||||
|
tab_bar = "reverse"
|
||||||
|
tab_active = "ul"
|
||||||
|
even = ""
|
||||||
|
odd = ""
|
||||||
|
selection = "reverse"
|
||||||
|
multiselect = "-1 6"
|
||||||
|
defocused = "ul"
|
||||||
|
scrollbar = ""
|
||||||
|
}
|
||||||
|
streams = {
|
||||||
|
"dnbradio.com" = "http://www.dnbradio.com/hi.m3u"
|
||||||
|
"BassDrive.com" = "http://bassdrive.com/v2/streams/BassDrive.pls"
|
||||||
|
}
|
||||||
|
....
|
||||||
|
|
||||||
|
Terminal attributes are accepted in a format similar to that of *git-config*(1),
|
||||||
|
only named colours aren't supported. The distribution contains example colour
|
||||||
|
schemes in the _contrib_ directory.
|
||||||
|
|
||||||
|
// TODO: it seems like liberty should contain an includable snippet about
|
||||||
|
// the format, which could form a part of nncmpp.conf(5).
|
||||||
|
|
||||||
|
Spectrum visualiser
|
||||||
|
-------------------
|
||||||
|
When built against the FFTW library, *nncmpp* can make use of MPD's "fifo"
|
||||||
|
output plugin to show the audio spectrum. This has some caveats, namely that
|
||||||
|
it may not be properly synchronized, only one instance of a client can read from
|
||||||
|
a given named pipe at a time, it will cost you some CPU time, and finally you'll
|
||||||
|
need to set it up manually to match your MPD configuration, e.g.:
|
||||||
|
|
||||||
|
....
|
||||||
|
settings = {
|
||||||
|
...
|
||||||
|
spectrum_path = "~/.mpd/mpd.fifo" # "path"
|
||||||
|
spectrum_format = "44100:16:2" # "format" (samplerate:bits:channels)
|
||||||
|
spectrum_bars = 8 # beware of exponential complexity
|
||||||
|
...
|
||||||
|
}
|
||||||
|
....
|
||||||
|
|
||||||
|
The sample rate should be greater than 40 kHz, the number of bits 8 or 16,
|
||||||
|
and the number of channels doesn't matter, as they're simply averaged together.
|
||||||
|
|
||||||
|
PulseAudio
|
||||||
|
----------
|
||||||
|
If you find standard MPD volume control useless, you may instead configure
|
||||||
|
*nncmpp* to show and control the volume of any PulseAudio sink MPD is currently
|
||||||
|
connected to.
|
||||||
|
|
||||||
|
This feature may be enabled with the *settings.pulseaudio* configuration option,
|
||||||
|
as in the snippet above. To replace the default volume control bindings, use:
|
||||||
|
|
||||||
|
....
|
||||||
|
normal = {
|
||||||
|
"M-PageUp" = "pulse-volume-up"
|
||||||
|
"M-PageDown" = "pulse-volume-down"
|
||||||
|
}
|
||||||
|
....
|
||||||
|
|
||||||
|
The respective actions may also be invoked from the help tab directly.
|
||||||
|
|
||||||
|
For this to work, *nncmpp* needs to access the right PulseAudio daemon--in case
|
||||||
|
your setup is unusual, consult the list of environment variables in
|
||||||
|
*pulseaudio*(1). MPD-compatibles are currently unsupported.
|
||||||
|
|
||||||
|
Files
|
||||||
|
-----
|
||||||
|
*nncmpp* follows the XDG Base Directory Specification.
|
||||||
|
|
||||||
|
_~/.config/nncmpp/nncmpp.conf_::
|
||||||
|
The configuration file.
|
||||||
|
|
||||||
|
Reporting bugs
|
||||||
|
--------------
|
||||||
|
Use https://git.janouch.name/p/nncmpp to report bugs, request features,
|
||||||
|
or submit pull requests.
|
||||||
|
|
||||||
|
See also
|
||||||
|
--------
|
||||||
|
*mpd*(1), *pulseaudio*(1)
|
||||||
2
termo
2
termo
Submodule termo updated: 30e0eee1a8...8265f075b1
Reference in New Issue
Block a user