Playoff group updates.

[ultimatescore] / nageru / ultimate.lua

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 566b465c65c1be8784e4ff258ccc252819752414..c0ebc95e8fa91d83ca18e71fb096a60eaef2b43f 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,6 +1,6 @@
 -- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
-local futatabi_server = "http://10.1.0.172:9096"
+local futatabi_server = "http://10.42.0.2:9096"
 
 local state = {
        transition_start = -2.0,
@@ -93,7 +93,7 @@ function make_fade_input(scene)
        local ret = {
                input = scene:add_input(),
                resample_effect = scene:add_optional_effect(ResampleEffect.new()),  -- Activated if scaling.
-               wb_effect = scene:add_auto_white_balance()
+               wb_effect = scene:add_white_balance()
        }
        ret.overlay = make_overlay(scene, ret.wb_effect)
        return ret
@@ -134,7 +134,7 @@ fade_scene = make_fade_scene()
 
 function make_sbs_input(scene, has_overlay)
        local input = scene:add_input()
-       local wb_effect = scene:add_auto_white_balance()
+       local wb_effect = scene:add_white_balance()
        local overlay = has_overlay and make_overlay(scene, wb_effect) or nil
        local resample_effect = scene:add_effect({ResampleEffect.new(), ResizeEffect.new()})
        local padding_effect = scene:add_effect(IntegralPaddingEffect.new())
@@ -179,7 +179,7 @@ function make_simple_scene_no_finalize()
 
        local input = scene:add_input()
        local resample_effect = scene:add_effect({ResampleEffect.new(), ResizeEffect.new(), IdentityEffect.new()})
-       local wb_effect = scene:add_auto_white_balance()
+       local wb_effect = scene:add_white_balance()
        local overlay = make_overlay(scene, wb_effect)
 
        return {
@@ -724,6 +724,8 @@ function fetch_input_resolution(signals, signal_num)
        return res
 end
 
+local last_alsa_sound_shark_volume = -1   -- Always update on the first frame.
+
 function update_volume()
        if Nageru.get_num_audio_buses() < 3 or
           Nageru.get_audio_bus_name(2) ~= 'Sound Shark' then
@@ -741,6 +743,13 @@ function update_volume()
                volume_db = -100.0
        end
        cef_input:execute_javascript_async("set_sound_shark_volume_db(" .. volume_db .. ")")
+
+       local desired_alsa_sound_shark_volume = (volume_db < -40.0) and 0 or 154  -- 154 corresponds to 70% in alsamixer for this input.
+       if desired_alsa_sound_shark_volume ~= last_alsa_sound_shark_volume then
+               os.execute("amixer -D hw:CARD=USB sset 'Mix A Input 04' " .. desired_alsa_sound_shark_volume .. " &")
+               os.execute("amixer -D hw:CARD=USB sset 'Mix B Input 04' " .. desired_alsa_sound_shark_volume .. " &")
+               last_alsa_sound_shark_volume = desired_alsa_sound_shark_volume
+       end
 end
 
 local last_rate = 0.0