From 1d0687556a52891aeadc0e8d9a58e44c53cb826b Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Fri, 15 Aug 2014 13:25:46 +0200
Subject: [PATCH] Fix music player's sound management
---
technic/machines/LV/music_player.lua | 140 ++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 74 deletions(-)
diff --git a/technic/machines/LV/music_player.lua b/technic/machines/LV/music_player.lua
index fde83b7..ba5daab 100644
--- a/technic/machines/LV/music_player.lua
+++ b/technic/machines/LV/music_player.lua
@@ -7,9 +7,9 @@
minetest.register_craft({
output = 'technic:music_player',
recipe = {
- {'group:wood', 'group:wood', 'group:wood'},
- {'default:diamond', 'default:diamond', 'default:diamond'},
- {'default:stone', 'default:copper_ingot', 'default:stone'},
+ {'technic:chromium_ingot', 'default:diamond', 'technic:chromium_ingot'},
+ {'default:diamond', 'technic:machine_casing', 'default:diamond'},
+ {'default:mossycobble', 'technic:lv_cable0', 'default:mossycobble'},
}
})
@@ -17,7 +17,7 @@
local music_player_formspec =
"invsize[8,9;]"..
- "label[0,0;"..S("Music Player").."]"..
+ "label[0,0;"..S("%s Music Player"):format("LV").."]"..
"button[4,1;1,1;track1;1]"..
"button[5,1;1,1;track2;2]"..
"button[6,1;1,1;track3;3]"..
@@ -29,30 +29,77 @@
"button[6,3;1,1;track9;9]"..
"button[4,4;1,2;play;Play]"..
"button[6,4;1,2;stop;Stop]"..
- "label[4,0;Current track --]"
+ "label[4,0;"..S("Current track %s"):format("--").."]"
local function play_track(pos, track)
return minetest.sound_play("technic_track"..tostring(track),
{pos = pos, gain = 1.0, loop = true, max_hear_distance = 72,})
end
+local run = function(pos, node)
+ local meta = minetest.get_meta(pos)
+ local eu_input = meta:get_int("LV_EU_input")
+ local machine_name = S("%s Music Player"):format("LV")
+ local machine_node = "technic:music_player"
+ local demand = 150
+
+ local current_track = meta:get_int("current_track")
+ local pos_hash = minetest.hash_node_position(pos)
+ local music_handle = music_handles[pos_hash]
+
+ -- Setup meta data if it does not exist.
+ if not eu_input then
+ meta:set_int("LV_EU_demand", demand)
+ meta:set_int("LV_EU_input", 0)
+ return
+ end
+
+ if meta:get_int("active") == 0 then
+ meta:set_string("infotext", S("%s Idle"):format(machine_name))
+ meta:set_int("LV_EU_demand", 0)
+ return
+ end
+
+ if eu_input < demand then
+ meta:set_string("infotext", S("%s Unpowered"):format(machine_name))
+ if music_handle then
+ minetest.sound_stop(music_handle)
+ music_handle = nil
+ end
+ elseif eu_input >= demand then
+ meta:set_string("infotext", S("%s Active"):format(machine_name))
+ if not music_handle then
+ music_handle = play_track(pos, current_track)
+ end
+ end
+ music_handles[pos_hash] = music_handle
+ meta:set_int("LV_EU_demand", demand)
+end
+
+local function stop_player(pos, node)
+ local pos_hash = minetest.hash_node_position(pos)
+ local music_handle = music_handles[pos_hash]
+ if music_handle then
+ minetest.sound_stop(music_handle)
+ music_handles[pos_hash] = nil
+ end
+end
+
minetest.register_node("technic:music_player", {
- description = S("Music Player"),
+ description = S("%s Music Player"):format("LV"),
tiles = {"technic_music_player_top.png", "technic_machine_bottom.png", "technic_music_player_side.png",
"technic_music_player_side.png", "technic_music_player_side.png", "technic_music_player_side.png"},
- groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+ groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1},
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
local meta = minetest.get_meta(pos)
- meta:set_string("infotext", S("Music Player"))
+ meta:set_string("infotext", S("%s Music Player"):format("LV"))
meta:set_int("active", 0)
meta:set_int("current_track", 1)
meta:set_string("formspec", music_player_formspec)
end,
on_receive_fields = function(pos, formanme, fields, sender)
local meta = minetest.get_meta(pos)
- local pos_hash = minetest.hash_node_position(pos)
- local music_handle = music_handles[pos_hash]
local current_track = meta:get_int("current_track")
if fields.track1 then current_track = 1 end
if fields.track2 then current_track = 2 end
@@ -66,7 +113,7 @@
meta:set_int("current_track", current_track)
meta:set_string("formspec",
"invsize[8,9;]"..
- "label[0,0;"..S("Music Player").."]"..
+ "label[0,0;"..S("%s Music Player"):format("LV").."]"..
"button[4,1;1,1;track1;1]"..
"button[5,1;1,1;track2;2]"..
"button[6,1;1,1;track3;3]"..
@@ -78,71 +125,16 @@
"button[6,3;1,1;track9;9]"..
"button[4,4;1,2;play;Play]"..
"button[6,4;1,2;stop;Stop]"..
- "label[4,0;Current track "
- ..current_track.."]")
- if fields.play then
- if music_handle then
- minetest.sound_stop(music_handle)
- end
- music_handle = play_track(pos, current_track)
- meta:set_int("active", 1)
+ "label[4,0;"..S("Current track %s")
+ :format(current_track).."]")
+ if fields.play or fields.stop then
+ stop_player(pos)
+ meta:set_int("active", fields.play and 1 or 0)
end
- if fields.stop then
- meta:set_int("active", 0)
- if music_handle then
- minetest.sound_stop(music_handle)
- end
- end
- music_handles[pos_hash] = music_handle
end,
-})
-
-minetest.register_abm({
- nodenames = {"technic:music_player"},
- interval = 1,
- chance = 1,
- action = function(pos, node, active_object_count, active_object_count_wider)
- local meta = minetest.get_meta(pos)
- local eu_input = meta:get_int("LV_EU_input")
- local machine_name = S("Music Player")
- local machine_node = "technic:music_player"
- local demand = 150
-
- local current_track = meta:get_int("current_track")
- local pos_hash = minetest.hash_node_position(pos)
- local music_handle = music_handles[pos_hash]
-
- -- Setup meta data if it does not exist.
- if not eu_input then
- meta:set_int("LV_EU_demand", demand)
- meta:set_int("LV_EU_input", 0)
- return
- end
-
- -- Power off automatically if no longer connected to a switching station
- technic.switching_station_timeout_count(pos, "LV")
-
- if meta:get_int("active") == 0 then
- meta:set_string("infotext", S("%s Idle"):format(machine_name))
- meta:set_int("LV_EU_demand", 0)
- return
- end
-
- if eu_input < demand then
- meta:set_string("infotext", S("%s Unpowered"):format(machine_name))
- if music_handle then
- minetest.sound_stop(music_handle)
- music_handle = nil
- end
- elseif eu_input >= demand then
- meta:set_string("infotext", S("%s Active"):format(machine_name))
- if not music_handle then
- music_handle = play_track(pos, current_track)
- end
- end
- music_handles[pos_hash] = music_handle
- meta:set_int("LV_EU_demand", demand)
- end
+ on_destruct = stop_player,
+ technic_run = run,
+ technic_on_disable = stop_player,
})
technic.register_machine("LV", "technic:music_player", technic.receiver)
--
Gitblit v1.8.0