mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-11-08 01:12:59 +00:00
b048b6666d
Speakers can now play arbitrary PCM audio, sampled at 48kHz and with a resolution of 8 bits. Programs can build up buffers of audio locally, play it using `speaker.playAudio`, where it is encoded to DFPWM, sent across the network, decoded, and played on the client. `speaker.playAudio` may return false when a chunk of audio has been submitted but not yet sent to the client. In this case, the program should wait for a speaker_audio_empty event and try again, repeating until it works. While the API is a little odd, this gives us fantastic flexibility (we can play arbitrary streams of audio) while still being resilient in the presence of server lag (either TPS or on the computer thread). Some other notes: - There is a significant buffer on both the client and server, which means that sound take several seconds to finish after playing has started. One can force it to be stopped playing with the new `speaker.stop` call. - This also adds a `cc.audio.dfpwm` module, which allows encoding and decoding DFPWM1a audio files. - I spent so long writing the documentation for this. Who knows if it'll be helpful!
217 lines
8.2 KiB
Lua
217 lines
8.2 KiB
Lua
local completion = require "cc.shell.completion"
|
|
|
|
-- Setup paths
|
|
local sPath = ".:/rom/programs"
|
|
if term.isColor() then
|
|
sPath = sPath .. ":/rom/programs/advanced"
|
|
end
|
|
if turtle then
|
|
sPath = sPath .. ":/rom/programs/turtle"
|
|
else
|
|
sPath = sPath .. ":/rom/programs/rednet:/rom/programs/fun"
|
|
if term.isColor() then
|
|
sPath = sPath .. ":/rom/programs/fun/advanced"
|
|
end
|
|
end
|
|
if pocket then
|
|
sPath = sPath .. ":/rom/programs/pocket"
|
|
end
|
|
if commands then
|
|
sPath = sPath .. ":/rom/programs/command"
|
|
end
|
|
if http then
|
|
sPath = sPath .. ":/rom/programs/http"
|
|
end
|
|
shell.setPath(sPath)
|
|
help.setPath("/rom/help")
|
|
|
|
-- Setup aliases
|
|
shell.setAlias("ls", "list")
|
|
shell.setAlias("dir", "list")
|
|
shell.setAlias("cp", "copy")
|
|
shell.setAlias("mv", "move")
|
|
shell.setAlias("rm", "delete")
|
|
shell.setAlias("clr", "clear")
|
|
shell.setAlias("rs", "redstone")
|
|
shell.setAlias("sh", "shell")
|
|
if term.isColor() then
|
|
shell.setAlias("background", "bg")
|
|
shell.setAlias("foreground", "fg")
|
|
end
|
|
|
|
-- Setup completion functions
|
|
|
|
local function completePastebinPut(shell, text, previous)
|
|
if previous[2] == "put" then
|
|
return fs.complete(text, shell.dir(), true, false)
|
|
end
|
|
end
|
|
|
|
shell.setCompletionFunction("rom/programs/alias.lua", completion.build(nil, completion.program))
|
|
shell.setCompletionFunction("rom/programs/cd.lua", completion.build(completion.dir))
|
|
shell.setCompletionFunction("rom/programs/clear.lua", completion.build({ completion.choice, { "screen", "palette", "all" } }))
|
|
shell.setCompletionFunction("rom/programs/copy.lua", completion.build(
|
|
{ completion.dirOrFile, true },
|
|
completion.dirOrFile
|
|
))
|
|
shell.setCompletionFunction("rom/programs/delete.lua", completion.build({ completion.dirOrFile, many = true }))
|
|
shell.setCompletionFunction("rom/programs/drive.lua", completion.build(completion.dir))
|
|
shell.setCompletionFunction("rom/programs/edit.lua", completion.build(completion.file))
|
|
shell.setCompletionFunction("rom/programs/eject.lua", completion.build(completion.peripheral))
|
|
shell.setCompletionFunction("rom/programs/gps.lua", completion.build({ completion.choice, { "host", "host ", "locate" } }))
|
|
shell.setCompletionFunction("rom/programs/help.lua", completion.build(completion.help))
|
|
shell.setCompletionFunction("rom/programs/id.lua", completion.build(completion.peripheral))
|
|
shell.setCompletionFunction("rom/programs/label.lua", completion.build(
|
|
{ completion.choice, { "get", "get ", "set ", "clear", "clear " } },
|
|
completion.peripheral
|
|
))
|
|
shell.setCompletionFunction("rom/programs/list.lua", completion.build(completion.dir))
|
|
shell.setCompletionFunction("rom/programs/mkdir.lua", completion.build({ completion.dir, many = true }))
|
|
|
|
local complete_monitor_extra = { "scale" }
|
|
shell.setCompletionFunction("rom/programs/monitor.lua", completion.build(
|
|
function(shell, text, previous)
|
|
local choices = completion.peripheral(shell, text, previous, true)
|
|
for _, option in pairs(completion.choice(shell, text, previous, complete_monitor_extra, true)) do
|
|
choices[#choices + 1] = option
|
|
end
|
|
return choices
|
|
end,
|
|
function(shell, text, previous)
|
|
if previous[2] == "scale" then
|
|
return completion.peripheral(shell, text, previous, true)
|
|
else
|
|
return completion.programWithArgs(shell, text, previous, 3)
|
|
end
|
|
end,
|
|
{
|
|
function(shell, text, previous)
|
|
if previous[2] ~= "scale" then
|
|
return completion.programWithArgs(shell, text, previous, 3)
|
|
end
|
|
end,
|
|
many = true,
|
|
}
|
|
))
|
|
|
|
shell.setCompletionFunction("rom/programs/move.lua", completion.build(
|
|
{ completion.dirOrFile, true },
|
|
completion.dirOrFile
|
|
))
|
|
shell.setCompletionFunction("rom/programs/redstone.lua", completion.build(
|
|
{ completion.choice, { "probe", "set ", "pulse " } },
|
|
completion.side
|
|
))
|
|
shell.setCompletionFunction("rom/programs/rename.lua", completion.build(
|
|
{ completion.dirOrFile, true },
|
|
completion.dirOrFile
|
|
))
|
|
shell.setCompletionFunction("rom/programs/shell.lua", completion.build({ completion.programWithArgs, 2, many = true }))
|
|
shell.setCompletionFunction("rom/programs/type.lua", completion.build(completion.dirOrFile))
|
|
shell.setCompletionFunction("rom/programs/set.lua", completion.build({ completion.setting, true }))
|
|
shell.setCompletionFunction("rom/programs/advanced/bg.lua", completion.build({ completion.programWithArgs, 2, many = true }))
|
|
shell.setCompletionFunction("rom/programs/advanced/fg.lua", completion.build({ completion.programWithArgs, 2, many = true }))
|
|
shell.setCompletionFunction("rom/programs/fun/dj.lua", completion.build(
|
|
{ completion.choice, { "play", "play ", "stop " } },
|
|
completion.peripheral
|
|
))
|
|
shell.setCompletionFunction("rom/programs/fun/speaker.lua", completion.build(
|
|
{ completion.choice, { "play ", "stop " } },
|
|
function(shell, text, previous)
|
|
if previous[2] == "play" then return completion.file(shell, text, previous, true)
|
|
elseif previous[2] == "stop" then return completion.peripheral(shell, text, previous, false)
|
|
end
|
|
end,
|
|
function(shell, text, previous)
|
|
if previous[2] == "play" then return completion.peripheral(shell, text, previous, false)
|
|
end
|
|
end
|
|
))
|
|
shell.setCompletionFunction("rom/programs/fun/advanced/paint.lua", completion.build(completion.file))
|
|
shell.setCompletionFunction("rom/programs/http/pastebin.lua", completion.build(
|
|
{ completion.choice, { "put ", "get ", "run " } },
|
|
completePastebinPut
|
|
))
|
|
shell.setCompletionFunction("rom/programs/rednet/chat.lua", completion.build({ completion.choice, { "host ", "join " } }))
|
|
shell.setCompletionFunction("rom/programs/command/exec.lua", completion.build(completion.command))
|
|
shell.setCompletionFunction("rom/programs/http/wget.lua", completion.build({ completion.choice, { "run " } }))
|
|
|
|
if turtle then
|
|
shell.setCompletionFunction("rom/programs/turtle/go.lua", completion.build(
|
|
{ completion.choice, { "left", "right", "forward", "back", "down", "up" }, true, many = true }
|
|
))
|
|
shell.setCompletionFunction("rom/programs/turtle/turn.lua", completion.build(
|
|
{ completion.choice, { "left", "right" }, true, many = true }
|
|
))
|
|
shell.setCompletionFunction("rom/programs/turtle/equip.lua", completion.build(
|
|
nil,
|
|
{ completion.choice, { "left", "right" } }
|
|
))
|
|
shell.setCompletionFunction("rom/programs/turtle/unequip.lua", completion.build(
|
|
{ completion.choice, { "left", "right" } }
|
|
))
|
|
end
|
|
|
|
-- Run autorun files
|
|
if fs.exists("/rom/autorun") and fs.isDir("/rom/autorun") then
|
|
local tFiles = fs.list("/rom/autorun")
|
|
for _, sFile in ipairs(tFiles) do
|
|
if string.sub(sFile, 1, 1) ~= "." then
|
|
local sPath = "/rom/autorun/" .. sFile
|
|
if not fs.isDir(sPath) then
|
|
shell.run(sPath)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
local function findStartups(sBaseDir)
|
|
local tStartups = nil
|
|
local sBasePath = "/" .. fs.combine(sBaseDir, "startup")
|
|
local sStartupNode = shell.resolveProgram(sBasePath)
|
|
if sStartupNode then
|
|
tStartups = { sStartupNode }
|
|
end
|
|
-- It's possible that there is a startup directory and a startup.lua file, so this has to be
|
|
-- executed even if a file has already been found.
|
|
if fs.isDir(sBasePath) then
|
|
if tStartups == nil then
|
|
tStartups = {}
|
|
end
|
|
for _, v in pairs(fs.list(sBasePath)) do
|
|
local sPath = "/" .. fs.combine(sBasePath, v)
|
|
if not fs.isDir(sPath) then
|
|
tStartups[#tStartups + 1] = sPath
|
|
end
|
|
end
|
|
end
|
|
return tStartups
|
|
end
|
|
|
|
-- Show MOTD
|
|
if settings.get("motd.enable") then
|
|
shell.run("motd")
|
|
end
|
|
|
|
-- Run the user created startup, either from disk drives or the root
|
|
local tUserStartups = nil
|
|
if settings.get("shell.allow_startup") then
|
|
tUserStartups = findStartups("/")
|
|
end
|
|
if settings.get("shell.allow_disk_startup") then
|
|
for _, sName in pairs(peripheral.getNames()) do
|
|
if disk.isPresent(sName) and disk.hasData(sName) then
|
|
local startups = findStartups(disk.getMountPath(sName))
|
|
if startups then
|
|
tUserStartups = startups
|
|
break
|
|
end
|
|
end
|
|
end
|
|
end
|
|
if tUserStartups then
|
|
for _, v in pairs(tUserStartups) do
|
|
shell.run(v)
|
|
end
|
|
end
|