diff --git a/CMakeLists.txt b/CMakeLists.txt index 232312259..31f87d140 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -588,17 +588,17 @@ target_link_libraries(ncls ) ############################################################################ -# notcurses-view +# ncplayer if(NOT ${USE_MULTIMEDIA} STREQUAL "none") file(GLOB VIEWSRCS CONFIGURE_DEPENDS src/view/*.cpp) -add_executable(notcurses-view ${VIEWSRCS} ${COMPATSRC}) -target_include_directories(notcurses-view +add_executable(ncplayer ${VIEWSRCS} ${COMPATSRC}) +target_include_directories(ncplayer PRIVATE include src "${PROJECT_BINARY_DIR}/include" ) -target_link_libraries(notcurses-view +target_link_libraries(ncplayer PRIVATE notcurses++ ) @@ -750,7 +750,7 @@ install(TARGETS notcurses-tetris DESTINATION bin) if(NOT ${USE_MULTIMEDIA} STREQUAL "none") install(TARGETS ncneofetch DESTINATION bin) install(TARGETS ncls DESTINATION bin) -install(TARGETS notcurses-view DESTINATION bin) +install(TARGETS ncplayer DESTINATION bin) endif() install(TARGETS notcurses-core notcurses notcurses++ diff --git a/NEWS.md b/NEWS.md index 6bacf6c40..20c017ec1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ rearrangements of Notcurses. `notcurses`. The latter contains the heavyweight multimedia code, so that applications which don't need this functionality can link against only the former. `pkg-config` support is present for both. + * The `notcurses-view` binary has been renamed `ncplayer`. * 2.1.5 (2021-01-15): * Notcurses **now depends on GNU Readline at build and runtime**, entirely diff --git a/README.md b/README.md index c0a2522c4..ac769ac24 100644 --- a/README.md +++ b/README.md @@ -131,12 +131,12 @@ may well be possible to use still older versions. Let me know of any successes! Seven binaries are installed as part of Notcurses: * `notcurses-demo`: some demonstration code -* `notcurses-view`: renders visual media (images/videos) +* `ncls`: an `ls` that displays multimedia in the terminal +* `ncneofetch`: a [neofetch](https://github.com/dylanaraps/neofetch) ripoff +* `ncplayer`: renders visual media (images/videos) * `notcurses-input`: decode and print keypresses * `notcurses-tester`: unit testing * `notcurses-tetris`: a tetris clone -* `ncneofetch`: a [neofetch](https://github.com/dylanaraps/neofetch) ripoff -* `ncls`: an `ls` that displays multimedia in the terminal To run `notcurses-demo` from a checkout, provide the `tests/` directory via the `-p` argument. Demos requiring data files will otherwise abort. The base diff --git a/doc/man/index.html b/doc/man/index.html index e82ab955e..d208a4409 100644 --- a/doc/man/index.html +++ b/doc/man/index.html @@ -31,13 +31,13 @@

Executables (section 1)

ncls—list files, displaying multimedia along with them
ncneofetch—generate low-effort posts for r/unixporn
+ ncplayer—renders images and video to a terminal
notcurses-demo—shows off some notcurses features
notcurses-direct-pydemo—validates the Python direct-mode wrappers
notcurses-input—reads and decodes input events
notcurses-pydemo—validates the Python wrappers
notcurses-tester—unit test driver
notcurses-tetris—Tetris in a terminal
- notcurses-view—renders images and video to a terminal

C library (section 3)

notcurses_capabilities—runtime capability detection
diff --git a/doc/man/man1/notcurses-view.1.md b/doc/man/man1/ncplayer.1.md similarity index 80% rename from doc/man/man1/notcurses-view.1.md rename to doc/man/man1/ncplayer.1.md index af3c9a4cb..dfba9d970 100644 --- a/doc/man/man1/notcurses-view.1.md +++ b/doc/man/man1/ncplayer.1.md @@ -1,21 +1,22 @@ -% notcurses-view(1) +% ncplayer(1) % nick black % v2.1.5 # NAME -notcurses-view - Render images and video to a terminal +ncplayer - Render images and video to a terminal # SYNOPSIS -**notcurses-view** [**-h**] [**-V**] [**-q**] [**-d** ***delaymult***] [**-l** ***loglevel***] [**-s** ***scalemode***] [**-k**] [**-L**] [**-t** ***seconds***] files +**ncplayer** [**-h**] [**-V**] [**-q**] [**-d** ***delaymult***] [**-l** ***loglevel***] [**-s** ***scalemode***] [**-k**] [**-L**] [**-t** ***seconds***] files # DESCRIPTION -**notcurses-view** uses a multimedia-enabled notcurses to render images -and videos to a terminal. By default, **stretch**-type scaling is used to -fill the rendering area, and the **sexblitter** blitter is used for a -3x2→1 mapping from pixels to cells. +**ncplayer** uses a multimedia-enabled Notcurses to render images and videos to a +terminal. By default, **stretch**-type scaling is used to fill the rendering +area, and the **sexblitter** blitter is used (where known to work well) for a +3x2→1 mapping from pixels to cells. In a terminal that doesn't support Unicode +13 sextants, the **quadblitter** is used instead. # OPTIONS diff --git a/doc/testing-checklist.md b/doc/testing-checklist.md index fdba06a3a..2976e0e49 100644 --- a/doc/testing-checklist.md +++ b/doc/testing-checklist.md @@ -15,7 +15,7 @@ Run, using `valgrind --tool=memcheck --leak-check=full`: * `notcurses-demo` with `USE_QRCODEGEN=off` * `notcurses-demo` in ASCII mode (`export LANG=C`) * `notcurses-input` -* `notcurses-view` with each scaling mode and an image + video, in three +* `ncplayer` with each scaling mode and an image + video, in three terminal geometries: square, tall, wide * `notcurses-demo` with margins * `notcurses-demo` with FPS plot and HUD up diff --git a/src/view/view.cpp b/src/view/view.cpp index a94261fe4..a8254a8ae 100644 --- a/src/view/view.cpp +++ b/src/view/view.cpp @@ -173,7 +173,7 @@ auto handle_opts(int argc, char** argv, notcurses_options& opts, bool* quiet, usage(std::cout, argv[0], EXIT_SUCCESS); break; case 'V': - printf("notcurses-view version %s\n", notcurses_version()); + printf("ncplayer version %s\n", notcurses_version()); exit(EXIT_SUCCESS); case 'q': *quiet = true;