Simplify timeline types: merge video/audio to media, remove trackCell/blockCells indirection

This commit is contained in:
Ian Gulliver
2026-02-20 08:19:08 -07:00
parent b15fe35a47
commit 17638ad18f
3 changed files with 84 additions and 91 deletions

View File

@@ -17,10 +17,8 @@
--cue-bg: rgba(58, 24, 0, 0.7);
--light-color: #c8e;
--light-bg: rgba(42, 10, 42, 0.55);
--video-color: #4d4;
--video-bg: rgba(10, 42, 10, 0.55);
--audio-color: #58f;
--audio-bg: rgba(10, 10, 42, 0.55);
--media-color: #4d4;
--media-bg: rgba(10, 42, 10, 0.55);
--delay-color: #999;
--delay-bg: rgba(26, 26, 26, 0.55);
--infinity-color: #666;
@@ -106,8 +104,7 @@ header h1 { font-size: 16px; font-weight: 600; letter-spacing: 0.05em; }
border-bottom: 1px solid rgba(255, 204, 0, 0.3);
}
.block.light { color: var(--light-color); border-color: var(--light-color); background: var(--light-bg); }
.block.video { color: var(--video-color); border-color: var(--video-color); background: var(--video-bg); }
.block.audio { color: var(--audio-color); border-color: var(--audio-color); background: var(--audio-bg); }
.block.media { color: var(--media-color); border-color: var(--media-color); background: var(--media-bg); }
.block.delay { color: var(--delay-color); border-color: var(--delay-color); background: var(--delay-bg); }
.hook {

View File

@@ -11,27 +11,27 @@
{"id": "block_q10_preshow", "type": "cue", "name": "Q10 Preshow"},
{"id": "block_preshow_wash", "type": "light", "track": "track_lighting_a", "name": "Preshow Wash"},
{"id": "block_warm_70", "type": "light", "track": "track_lighting_b", "name": "Warm 70%"},
{"id": "block_preshow_loop", "type": "video", "track": "track_video", "name": "Preshow Loop", "loop": true},
{"id": "block_preshow_music", "type": "audio", "track": "track_audio", "name": "Preshow Music", "loop": true},
{"id": "block_preshow_loop", "type": "media", "track": "track_video", "name": "Preshow Loop", "loop": true},
{"id": "block_preshow_music", "type": "media", "track": "track_audio", "name": "Preshow Music", "loop": true},
{"id": "block_q11_house_open", "type": "cue", "name": "Q11 House Open"},
{"id": "block_q12_top_of_show", "type": "cue", "name": "Q12 Top of Show"},
{"id": "block_cool_50", "type": "light", "track": "track_lighting_b", "name": "Cool 50%"},
{"id": "block_3s_delay", "type": "delay", "track": "track_video", "name": "3s Delay"},
{"id": "block_sc1_focus", "type": "light", "track": "track_lighting_a", "name": "SC1 Focus"},
{"id": "block_sc1_blue_80", "type": "light", "track": "track_lighting_b", "name": "SC1 Blue 80%"},
{"id": "block_sc1_projection", "type": "video", "track": "track_video", "name": "Sc1 Projection"},
{"id": "block_lightning_flash", "type": "video", "track": "track_video_ovl", "name": "Lightning Flash"},
{"id": "block_storm_ambience", "type": "audio", "track": "track_audio", "name": "Storm Ambience", "loop": true},
{"id": "block_sc1_projection", "type": "media", "track": "track_video", "name": "Sc1 Projection"},
{"id": "block_lightning_flash", "type": "media", "track": "track_video_ovl", "name": "Lightning Flash"},
{"id": "block_storm_ambience", "type": "media", "track": "track_audio", "name": "Storm Ambience", "loop": true},
{"id": "block_q13_sc1_dialog", "type": "cue", "name": "Q13 Sc1 Dialog"},
{"id": "block_wave_overlay", "type": "video", "track": "track_video_ovl", "name": "Wave Overlay"},
{"id": "block_wave_overlay", "type": "media", "track": "track_video_ovl", "name": "Wave Overlay"},
{"id": "block_dialog_spots", "type": "light", "track": "track_lighting_a", "name": "Dialog Spots"},
{"id": "block_warm_90", "type": "light", "track": "track_lighting_b", "name": "Warm 90%"},
{"id": "block_dialog_underscore", "type": "audio", "track": "track_audio", "name": "Dialog Underscore"},
{"id": "block_dialog_underscore", "type": "media", "track": "track_audio", "name": "Dialog Underscore"},
{"id": "block_q14_sc2_trans", "type": "cue", "name": "Q14 Sc2 Trans"},
{"id": "block_sc2_focus", "type": "light", "track": "track_lighting_a", "name": "SC2 Focus"},
{"id": "block_sc2_amber_60", "type": "light", "track": "track_lighting_b", "name": "SC2 Amber 60%"},
{"id": "block_sc2_background", "type": "video", "track": "track_video", "name": "Sc2 Background", "loop": true},
{"id": "block_sc2_atmos", "type": "audio", "track": "track_audio", "name": "SC2 Atmos", "loop": true}
{"id": "block_sc2_background", "type": "media", "track": "track_video", "name": "Sc2 Background", "loop": true},
{"id": "block_sc2_atmos", "type": "media", "track": "track_audio", "name": "SC2 Atmos", "loop": true}
],
"triggers": [
{