From 460e03941be8522fad3d28cefc595befbe604b9a Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 7 Nov 2020 17:48:31 +0100 Subject: [PATCH] Remove mpv --- .gitmodules | 7 -- home/.config/mpv/input.conf | 31 ------ home/.config/mpv/mpv.conf | 89 ----------------- .../mpv/script-opts/playlist_view.conf | 1 - home/.config/mpv/script-opts/stats.conf | 4 - .../mpv/scripts/gallery-thumbgen-1.lua | 1 - .../mpv/scripts/gallery-thumbgen-2.lua | 1 - .../mpv/scripts/gallery-thumbgen-3.lua | 1 - home/.config/mpv/scripts/gallery-thumbgen.lua | 1 - home/.config/mpv/scripts/lib/gallery.lua | 1 - home/.config/mpv/scripts/now_playing.lua | 33 ------- home/.config/mpv/scripts/pitchcontrol.lua | 95 ------------------- home/.config/mpv/scripts/playlist-view.lua | 1 - home/.config/mpv/shaders/mpv-prescalers | 1 - mpv-gallery-view | 1 - mpv-prescalers | 1 - 16 files changed, 269 deletions(-) delete mode 100644 home/.config/mpv/input.conf delete mode 100644 home/.config/mpv/mpv.conf delete mode 100644 home/.config/mpv/script-opts/playlist_view.conf delete mode 100644 home/.config/mpv/script-opts/stats.conf delete mode 120000 home/.config/mpv/scripts/gallery-thumbgen-1.lua delete mode 120000 home/.config/mpv/scripts/gallery-thumbgen-2.lua delete mode 120000 home/.config/mpv/scripts/gallery-thumbgen-3.lua delete mode 120000 home/.config/mpv/scripts/gallery-thumbgen.lua delete mode 120000 home/.config/mpv/scripts/lib/gallery.lua delete mode 100644 home/.config/mpv/scripts/now_playing.lua delete mode 100644 home/.config/mpv/scripts/pitchcontrol.lua delete mode 120000 home/.config/mpv/scripts/playlist-view.lua delete mode 120000 home/.config/mpv/shaders/mpv-prescalers delete mode 160000 mpv-gallery-view delete mode 160000 mpv-prescalers diff --git a/.gitmodules b/.gitmodules index 9b450b1..58ad9c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "home/.vim/bundle/Vundle.vim"] path = home/.vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim -[submodule "mpv-gallery-view"] - path = mpv-gallery-view - url = https://github.com/occivink/mpv-gallery-view [submodule "grml-etc-core"] path = grml-etc-core url = https://github.com/grml/grml-etc-core @@ -13,7 +10,3 @@ [submodule "zsh-nix-shell"] path = zsh-nix-shell url = https://github.com/chisui/zsh-nix-shell -[submodule "mpv-prescalers"] - path = mpv-prescalers - url = https://github.com/bjin/mpv-prescalers - shallow = true diff --git a/home/.config/mpv/input.conf b/home/.config/mpv/input.conf deleted file mode 100644 index 6cb89f3..0000000 --- a/home/.config/mpv/input.conf +++ /dev/null @@ -1,31 +0,0 @@ -# audio filter bs2b (for headphones) -b af toggle "bs2b" - -# toggle debanding -D cycle deband - -# variable correction of audio pitch when changing speed -k cycle-values audio-pitch-correction "no" "yes" - -# reverse cycling for audio and video (shift modifier on german keyboard layout) -' cycle audio down -- cycle video down - -c cycle-values audio-channels stereo mono auto - -# Upscaling shaders -K cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/ravu-lite-r4.hook ~~/shaders/mpv-prescalers/compute/ravu-lite-r3.hook ~~/shaders/mpv-prescalers/compute/ravu-lite-r2.hook /dev/null -Alt+K cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/ravu-zoom-r4-yuv.hook ~~/shaders/mpv-prescalers/compute/ravu-zoom-r3-yuv.hook ~~/shaders/mpv-prescalers/compute/ravu-zoom-r2-yuv.hook /dev/null -Alt+k cycle-values glsl-shaders ~~/shaders/mpv-prescalers/compute/nnedi3-nns256-win8x4.hook ~~/shaders/mpv-prescalers/compute/nnedi3-nns128-win8x4.hook /dev/null - -Ctrl+p script-message-to pitchcontrol toggle - -# more granular panning -Alt+left add video-pan-x 0.05 -Alt+right add video-pan-x -0.05 -Alt+up add video-pan-y 0.05 -Alt+down add video-pan-y -0.05 - -# sub-delay for fixing 24 empty frames on blu-ray -Alt+z add sub-delay -1 -Alt+Z add sub-delay +1 diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf deleted file mode 100644 index 925509a..0000000 --- a/home/.config/mpv/mpv.conf +++ /dev/null @@ -1,89 +0,0 @@ -# configure fonts -osd-font = 'DINW07-Medium' - -sub-font = 'Gandhi Sans' -sub-bold = yes -sub-font-size = 44 -sub-use-margins = no -sub-border-size = 2 - -# make vobsub/PGS subtitles look nicer -sub-gauss=0.5 -sub-gray=yes - -# don’t correct pitch of audio -#audio-pitch-correction = no - -# max volume -volume-max = 150 - -# downmix to stereo by default -audio-channels = stereo - -# i18n -#alang = ger,de,deu,eng,en -#slang = ger,de,deu,eng,en - -# allow seeking in streamed media -force-seekable - -# enable hardware decoding when avaliable -hwdec = auto-safe - -# do not show images only one second -image-display-duration = inf - -# better quality (but not too high, otherwise too high frame drop) -profile = gpu-hq -deband = no -dither-depth = auto - -# screenshots -screenshot-format = png - -[musicvideo] -lavfi-complex = '[aid1]asplit=4[ao][a1][a2][a3];[a1]avectorscope=m=lissajous:s=640x600:draw=dot:r=25[avectorscope];[a2]aresample=44100,showwaves=s=1280x600:mode=p2p:colors=red|lightgreen:r=25[showwaves];[a3]showcqt=s=1920x600:axis=0:axis_h=0:r=25[showcqt];[showwaves][avectorscope]hstack=shortest=1[top];[top][showcqt]vstack=shortest=1,fps=25[vo]' -alpha = no - -[musicvideo-1080] -lavfi-complex = '[aid1]asplit=4[ao][a1][a2][a3];[a1]avectorscope=m=lissajous:s=640x540:draw=dot:r=25[avectorscope];[a2]aresample=44100,showwaves=s=1280x540:mode=p2p:colors=red|lightgreen:r=25[showwaves];[a3]showcqt=s=1920x540:axis=0:axis_h=0:r=25[showcqt];[showwaves][avectorscope]hstack=shortest=1[top];[top][showcqt]vstack=shortest=1,fps=25[vo]' -alpha = no - -[musicvideo-c64] -lavfi-complex = '[aid1]channelsplit=4.0[mono][c1][c2][c3];[mono]channelmap=mono,asplit=2[ao][a2];[c1][c2][c3]join=inputs=3:channel_layout=3.0[a1];[a1]aresample=44100,showwaves=s=1920x600:mode=p2p:colors=red|lightgreen|yellow:split_channels=1:r=25[showwaves];[a2]showcqt=s=1920x600:axis=0:axis_h=0:r=25[showcqt];[showwaves][showcqt]vstack=shortest=1,fps=25,format=rgba[vo]' -alpha = no - -[hqencode] -ovc = libx264 -ovcopts-add = crf=18 -oac = flac -audio-format = s16 - -[rain] -lavfi-complex = 'amovie=https\\://s3.sbruder.de/cdn/rain.opus,volume=0.5[rain];[aid1][rain]amix=2:duration=shortest[ao]' - -[lq] -scale = bicubic_fast -cscale = bicubic_fast -dscale = bicubic_fast - -[hq] -scale = ewa_lanczossharp -dscale = ewa_lanczossharp -cscale = ewa_lanczossharp - -glsl-shader=~~/shaders/mpv-prescalers/compute/nnedi3-nns256-win8x4.hook -glsl-shader=~~/shaders/mpv-prescalers/compute/ravu-zoom-r4-chroma.hook - -[interpolate] -blend-subtitles = yes -video-sync = display-resample -interpolation = yes -tscale = box -tscale-window = sphinx -tscale-radius = 1.0 -tscale-clamp = 0.0 - -[clear-speed] -# https://github.com/mpv-player/mpv/issues/4418#issuecomment-368272929 -af-add = scaletempo=stride=28:overlap=.9:search=25 diff --git a/home/.config/mpv/script-opts/playlist_view.conf b/home/.config/mpv/script-opts/playlist_view.conf deleted file mode 100644 index f6b7390..0000000 --- a/home/.config/mpv/script-opts/playlist_view.conf +++ /dev/null @@ -1 +0,0 @@ -thumbs_dir=~/.cache/thumbnails/mpv diff --git a/home/.config/mpv/script-opts/stats.conf b/home/.config/mpv/script-opts/stats.conf deleted file mode 100644 index 63129ae..0000000 --- a/home/.config/mpv/script-opts/stats.conf +++ /dev/null @@ -1,4 +0,0 @@ -font=DINW07-Regular -font_mono=DINW07-Regular -font_size=10 -redraw_delay=0.25 diff --git a/home/.config/mpv/scripts/gallery-thumbgen-1.lua b/home/.config/mpv/scripts/gallery-thumbgen-1.lua deleted file mode 120000 index d03b6d5..0000000 --- a/home/.config/mpv/scripts/gallery-thumbgen-1.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-gallery-view/scripts/gallery-thumbgen.lua \ No newline at end of file diff --git a/home/.config/mpv/scripts/gallery-thumbgen-2.lua b/home/.config/mpv/scripts/gallery-thumbgen-2.lua deleted file mode 120000 index d03b6d5..0000000 --- a/home/.config/mpv/scripts/gallery-thumbgen-2.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-gallery-view/scripts/gallery-thumbgen.lua \ No newline at end of file diff --git a/home/.config/mpv/scripts/gallery-thumbgen-3.lua b/home/.config/mpv/scripts/gallery-thumbgen-3.lua deleted file mode 120000 index d03b6d5..0000000 --- a/home/.config/mpv/scripts/gallery-thumbgen-3.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-gallery-view/scripts/gallery-thumbgen.lua \ No newline at end of file diff --git a/home/.config/mpv/scripts/gallery-thumbgen.lua b/home/.config/mpv/scripts/gallery-thumbgen.lua deleted file mode 120000 index d03b6d5..0000000 --- a/home/.config/mpv/scripts/gallery-thumbgen.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-gallery-view/scripts/gallery-thumbgen.lua \ No newline at end of file diff --git a/home/.config/mpv/scripts/lib/gallery.lua b/home/.config/mpv/scripts/lib/gallery.lua deleted file mode 120000 index f52f4a7..0000000 --- a/home/.config/mpv/scripts/lib/gallery.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../../mpv-gallery-view/scripts/lib/gallery.lua \ No newline at end of file diff --git a/home/.config/mpv/scripts/now_playing.lua b/home/.config/mpv/scripts/now_playing.lua deleted file mode 100644 index 561caf3..0000000 --- a/home/.config/mpv/scripts/now_playing.lua +++ /dev/null @@ -1,33 +0,0 @@ -require 'mp.options' - -function handle_file_load () - if mp.get_property("metadata/by-key/artist") == nil and mp.get_property("metadata/by-key/title") == nil then - -- media-title is filename if no title is set - if mp.get_property("media-title") ~= mp.get_property("filename") then - info = mp.get_property("media-title") - else - info = mp.get_property("filename/no-ext") - end - else - info = mp.get_property("metadata/by-key/artist") .. " – " .. mp.get_property("metadata/by-key/title") - end - - -- check for youtube-dl - if mp.get_property("stream-open-filename") ~= mp.get_property("path") then - info = info .. "\n(" .. mp.get_property("path") .. ")" - end - - file = io.open(options.write, "w") - io.output(file) - io.write(info .. "\n") - io.close(file) -end - -options = { - write = "", -} -read_options(options) - -if options.write ~= "" then - mp.register_event("file-loaded", handle_file_load) -end diff --git a/home/.config/mpv/scripts/pitchcontrol.lua b/home/.config/mpv/scripts/pitchcontrol.lua deleted file mode 100644 index a92adc6..0000000 --- a/home/.config/mpv/scripts/pitchcontrol.lua +++ /dev/null @@ -1,95 +0,0 @@ --- pitchcontrol.lua --- --- Version: 0.2.0 --- URL: https://github.com/FichteFoll/mpv-scripts --- License: ISC - --- Commands for key bindings: --- --- * script-message-to pitchcontrol increase --- Increase pitch by one half-tone. Bound to Alt+R. --- * script-message-to pitchcontrol decrease --- Increase pitch by one half-tone. Bound to Alt+r. --- * script-message-to pitchcontrol toggle --- Toggle pitching. --- * script-message-to pitchcontrol set_halftone_pitch --- Sets pitch to half-tones - positive, negative or 0. - - --- Copyright 2016-2017 FichteFoll --- --- Permission to use, copy, modify, and/or distribute this software for any --- purpose with or without fee is hereby granted, provided that the above --- copyright notice and this permission notice appear in all copies. --- --- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES --- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF --- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY --- SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES --- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN --- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR --- IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -local utils = require 'mp.utils' -local msg = require('mp.msg') -local options = require('mp.options') -local script_name = mp.get_script_name() -- "pitchcontrol" - -local HALFTONE_SCALE = math.pow(2, 1.0/12) -- 1.059463094352953 -local RUBBERBAND_LABEL = string.format("%s-rubberband", script_name) - -local current_pitch = 0 -local active = false - - -function set_halftone_pitch(pitch, activate) - if activate == nil then - activate = true - end - pitch = tonumber(pitch) - local pitch_scale = math.pow(HALFTONE_SCALE, pitch) - - if active then - mp.commandv('af-command', RUBBERBAND_LABEL, 'set-pitch', pitch_scale) - elseif activate then - mp.command(("af add @%s:rubberband=pitch-scale=%s"):format(RUBBERBAND_LABEL, pitch_scale)) - active = true - else - mp.osd_message(("'%s' is inactive"):format(script_name)) - return - end - - current_pitch = pitch - - -- output new pitch - msg.debug(("new pitch-scale: %f"):format(pitch_scale)) - mp.osd_message(("Pitch: %+d halftones"):format(pitch)) -end - - -function increase_handler() - set_halftone_pitch(current_pitch + 1, false) -end - - -function decrease_handler() - set_halftone_pitch(current_pitch - 1, false) -end - - -function toggle_handler() - if active then - mp.command(("af del @%s"):format(RUBBERBAND_LABEL)) - mp.osd_message(("'%s' deactivated"):format(script_name)) - active = false - else - set_halftone_pitch(current_pitch, true) - end -end - - -mp.add_key_binding("Alt+p", 'increase', decrease_handler) -mp.add_key_binding("Alt+P", 'decrease', increase_handler) -mp.register_script_message('toggle', toggle_handler) -mp.register_script_message('set_halftone_pitch', set_halftone_pitch) diff --git a/home/.config/mpv/scripts/playlist-view.lua b/home/.config/mpv/scripts/playlist-view.lua deleted file mode 120000 index 24117b6..0000000 --- a/home/.config/mpv/scripts/playlist-view.lua +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-gallery-view/scripts/playlist-view.lua \ No newline at end of file diff --git a/home/.config/mpv/shaders/mpv-prescalers b/home/.config/mpv/shaders/mpv-prescalers deleted file mode 120000 index 431c5c6..0000000 --- a/home/.config/mpv/shaders/mpv-prescalers +++ /dev/null @@ -1 +0,0 @@ -../../../../mpv-prescalers \ No newline at end of file diff --git a/mpv-gallery-view b/mpv-gallery-view deleted file mode 160000 index 5139d34..0000000 --- a/mpv-gallery-view +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5139d346de67e8dbee8c8983777026502d6bc627 diff --git a/mpv-prescalers b/mpv-prescalers deleted file mode 160000 index b37d0f1..0000000 --- a/mpv-prescalers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b37d0f12223720f5ce48e149678162ae0a984176