colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

sane-sysvol -> sane_sysvol, sane-cast -> sane_cast

Browse Source 
when a script contains a dash, mpv silently renames *parts* of it to _, which causes confusion
This commit is contained in:
Colin 2024-04-21 00:27:30 +00:00
parent 0625bfdd10
commit f50c0a98c2
4 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hosts/common/programs/mpv/default.nix
View File

@ -91,31 +91,31 @@ let
local last_up = cursor.last_event['primary_up'] or { time = 0 }
if cursor.hover_raw or last_down.time >= last_up.time then cursor:move(mouse.x, mouse.y) end"
### patch so that uosc volume control is routed to sane-sysvol.
### patch so that uosc volume control is routed to sane_sysvol.
### this is particularly nice for moby, because it avoids the awkwardness that system volume
### is hard to adjust while screen is on.
### previously i used ao-volume instead of sane-sysvol: but that forced `ao=alsa`
### previously i used ao-volume instead of sane_sysvol: but that forced `ao=alsa`
### and came with heavy perf penalties (especially when adjusting the volume)
substituteInPlace src/uosc/main.lua \
--replace-fail \
"mp.observe_property('volume'" \
"mp.observe_property('user-data/sane-sysvol/volume'" \
"mp.observe_property('user-data/sane_sysvol/volume'" \
--replace-fail \
"mp.observe_property('mute'" \
"mp.observe_property('user-data/sane-sysvol/mute'"
"mp.observe_property('user-data/sane_sysvol/mute'"
substituteInPlace src/uosc/elements/Volume.lua \
--replace-fail \
"mp.commandv('set', 'volume'" \
"mp.set_property_number('user-data/sane-sysvol/volume'" \
"mp.set_property_number('user-data/sane_sysvol/volume'" \
--replace-fail \
"mp.set_property_native('volume'" \
"mp.set_property_number('user-data/sane-sysvol/volume'" \
"mp.set_property_number('user-data/sane_sysvol/volume'" \
--replace-fail \
"mp.set_property_native('mute'" \
"mp.set_property_bool('user-data/sane-sysvol/mute'" \
"mp.set_property_bool('user-data/sane_sysvol/mute'" \
--replace-fail \
"mp.commandv('cycle', 'mute')" \
"mp.set_property_bool('user-data/sane-sysvol/mute', not mp.get_property_bool('user-data/sane-sysvol/mute'))"
"mp.set_property_bool('user-data/sane_sysvol/mute', not mp.get_property_bool('user-data/sane_sysvol/mute'))"
# tweak the top-bar "maximize" button to actually act as a "fullscreen" button.
substituteInPlace src/uosc/elements/TopBar.lua \
@ -212,9 +212,9 @@ in
# for `watch_later`
".local/state/mpv"
];
fs.".config/mpv/scripts/sane-cast/main.lua".symlink.target = ./sane-cast/main.lua;
fs.".config/mpv/scripts/sane-sysvol/main.lua".symlink.target = ./sane-sysvol/main.lua;
fs.".config/mpv/scripts/sane-sysvol/non_blocking_popen.lua".symlink.target = ./sane-sysvol/non_blocking_popen.lua;
fs.".config/mpv/scripts/sane_cast/main.lua".symlink.target = ./sane_cast/main.lua;
fs.".config/mpv/scripts/sane_sysvol/main.lua".symlink.target = ./sane_sysvol/main.lua;
fs.".config/mpv/scripts/sane_sysvol/non_blocking_popen.lua".symlink.target = ./sane_sysvol/non_blocking_popen.lua;
fs.".config/mpv/input.conf".symlink.target = ./input.conf;
fs.".config/mpv/mpv.conf".symlink.target = ./mpv.conf;
fs.".config/mpv/script-opts/osc.conf".symlink.target = ./osc.conf;

0
hosts/common/programs/mpv/sane-cast/main.lua → hosts/common/programs/mpv/sane_cast/main.lua
View File

30
hosts/common/programs/mpv/sane-sysvol/main.lua → hosts/common/programs/mpv/sane_sysvol/main.lua
View File

@ -1,5 +1,5 @@
msg = require('mp.msg')
msg.trace('sane-sysvol: load: begin')
msg = require("mp.msg")
msg.trace("load: begin")
non_blocking_popen = require("non_blocking_popen")
@ -26,7 +26,7 @@ function subprocess(args)
mp.command_native({
name = "subprocess",
args = args,
-- these arguments below probably don't matter: copied from sane-cast
-- these arguments below probably don't matter: copied from sane_cast
detach = false,
capture_stdout = false,
capture_stderr = false,
@ -89,7 +89,7 @@ function sysvol_new()
msg.debug("announcing volume change to mpv:", old_mpv_vol, new_mpv_vol)
self.sysvol = sysvol
mp.set_property_number("user-data/sane-sysvol/volume", new_mpv_vol)
mp.set_property_number("user-data/sane_sysvol/volume", new_mpv_vol)
end,
change_sysmute = function(self, mute)
if mute == nil then
@ -122,7 +122,7 @@ function sysvol_new()
msg.debug("announcing mute to mpv:", mute)
self.sysmute = mute
mp.set_property_bool("user-data/sane-sysvol/mute", mute)
mp.set_property_bool("user-data/sane_sysvol/mute", mute)
end
}
end
@ -220,11 +220,11 @@ function pwmon_new()
if new_vol ~= old_vol then
msg.debug("pipewire volume change:", old_vol, new_vol)
mp.set_property_number("user-data/sane-sysvol/pw-mon-volume", new_vol)
mp.set_property_number("user-data/sane_sysvol/pw-mon-volume", new_vol)
end
if new_mute ~= old_mute then
msg.debug("pipewire mute change:", old_mute, new_mute)
mp.set_property_bool("user-data/sane-sysvol/pw-mon-mute", new_mute)
mp.set_property_bool("user-data/sane_sysvol/pw-mon-mute", new_mute)
end
end
end,
@ -242,12 +242,12 @@ function pwmon_new()
}
end
mp.set_property_number("user-data/sane-sysvol/volume", 0)
mp.set_property_bool("user-data/sane-sysvol/mute", true)
mp.set_property_number("user-data/sane_sysvol/volume", 0)
mp.set_property_bool("user-data/sane_sysvol/mute", true)
local sysvol = sysvol_new()
local first_sysvol_announcement = true
mp.observe_property("user-data/sane-sysvol/volume", "native", function(_, val)
mp.observe_property("user-data/sane_sysvol/volume", "native", function(_, val)
-- we must set the volume property early -- before we actually know the volume
-- else other modules will think it's `nil` and error.
-- but we DON'T want the value we set to actually impact the system volume
@ -256,12 +256,12 @@ mp.observe_property("user-data/sane-sysvol/volume", "native", function(_, val)
end
first_sysvol_announcement = false
end)
mp.observe_property("user-data/sane-sysvol/pw-mon-volume", "native", function(_, val)
mp.observe_property("user-data/sane_sysvol/pw-mon-volume", "native", function(_, val)
sysvol:on_sysvol_change(val)
end)
local first_sysmute_announcement = true
mp.observe_property("user-data/sane-sysvol/mute", "native", function(_, val)
mp.observe_property("user-data/sane_sysvol/mute", "native", function(_, val)
-- we must set the mute property early -- before we actually know the mute
-- else other modules will think it's `nil` and error.
-- but we DON'T want the value we set to actually impact the system mute
@ -270,11 +270,11 @@ mp.observe_property("user-data/sane-sysvol/mute", "native", function(_, val)
end
first_sysmute_announcement = false
end)
mp.observe_property("user-data/sane-sysvol/pw-mon-mute", "native", function(_, val)
mp.observe_property("user-data/sane_sysvol/pw-mon-mute", "native", function(_, val)
sysvol:on_sysmute_change(val)
end)
local pwmon = pwmon_new()
mp.register_event('tick', function() pwmon:service() end)
mp.register_event("tick", function() pwmon:service() end)
msg.trace("sane-sysvol: load: complete")
msg.trace("load: complete")

0
hosts/common/programs/mpv/sane-sysvol/non_blocking_popen.lua → hosts/common/programs/mpv/sane_sysvol/non_blocking_popen.lua
View File