Sound improvements

This commit is contained in:
Till Affeldt
2020-04-18 17:24:59 +02:00
parent a6cfca7745
commit 0c5c9f0d15
4 changed files with 77 additions and 38 deletions

View File

@ -3,48 +3,21 @@ if not climate_mod.settings.sound then return end
local EFFECT_NAME = "climate_api:sound"
local FADE_DURATION = climate_api.LONG_CYCLE
local handles = {}
local removables = {}
local function end_sound(pname, weather, sound)
if removables[pname] == nil
or removables[pname][weather] == nil then return end
local handle = removables[pname][weather]
minetest.sound_stop(handle)
removables[pname][weather] = nil
local modpath = minetest.get_modpath(minetest.get_current_modname())
local soundloop = dofile(modpath .. "/lib/soundloop.lua")
local function start_sound(pname, sound)
return soundloop.play(pname, sound, FADE_DURATION)
end
local function start_sound(pname, weather, sound)
local handle
if handles[pname] == nil then handles[pname] = {} end
if handles[pname][weather] ~= nil then return end
if removables[pname] == nil or removables[pname][weather] == nil then
handle = minetest.sound_play(sound.name, {
to_player = pname,
loop = true,
gain = 0
})
else
handle = removables[pname][weather]
removables[pname][weather] = nil
end
minetest.sound_fade(handle, sound.gain / FADE_DURATION, sound.gain)
handles[pname][weather] = handle
end
local function stop_sound(pname, weather, sound)
if handles[pname] == nil or handles[pname][weather] == nil then return end
local handle = handles[pname][weather]
minetest.sound_fade(handle, -sound.gain / FADE_DURATION, 0)
if removables[pname] == nil then removables[pname] = {} end
removables[pname][weather] = handle
handles[pname][weather] = nil
minetest.after(FADE_DURATION, end_sound, pname, weather, sound)
local function stop_sound(pname, sound)
return soundloop.stop(pname, sound, FADE_DURATION)
end
local function start_effect(player_data)
for playername, data in pairs(player_data) do
for weather, value in pairs(data) do
start_sound(playername, weather, value)
start_sound(playername, value)
end
end
end
@ -53,7 +26,7 @@ local function handle_effect(player_data, prev_data)
for playername, data in pairs(player_data) do
for weather, value in pairs(data) do
if prev_data[playername][weather] == nil then
start_sound(playername, weather, value)
start_sound(playername, value)
end
end
end
@ -61,7 +34,7 @@ local function handle_effect(player_data, prev_data)
for playername, data in pairs(prev_data) do
for weather, value in pairs(data) do
if player_data[playername][weather] == nil then
stop_sound(playername, weather, value)
stop_sound(playername, value)
end
end
end
@ -71,7 +44,7 @@ local function stop_effect(prev_data)
minetest.log(dump2(prev_data, "stop_effect"))
for playername, data in pairs(prev_data) do
for weather, value in pairs(data) do
stop_sound(playername, weather, value)
stop_sound(playername, value)
end
end
end