Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17249229c8 | ||
|
|
0f8647790d | ||
|
|
fbeb04385b | ||
|
|
9b08c3af4f | ||
|
|
318871033f | ||
|
|
cb4f8ec758 | ||
|
|
feef763035 | ||
|
|
d25dbf58dc | ||
|
|
568586c541 | ||
|
|
4841c27514 | ||
|
|
df0118ac52 | ||
|
|
e89cc3682a | ||
|
|
0822552830 | ||
|
|
ec01a7deb8 | ||
|
|
7adff685c0 | ||
|
|
c4642f1e99 | ||
|
|
51d9dd09c7 | ||
|
|
c1212644b0 | ||
|
|
c82636e1a9 | ||
|
|
9528128ca7 | ||
|
|
7a49b38cae | ||
|
|
c885bbd782 | ||
|
|
8502c1d194 | ||
|
|
8415bb5f37 | ||
|
|
66b85d3fcc | ||
|
|
3edb0d10be | ||
|
|
2dbc35b285 | ||
|
|
8a2cb92d8c | ||
|
|
0275e30103 | ||
|
|
ffdf3b6fc9 | ||
|
|
1defb71568 | ||
|
|
4ef84f2a97 | ||
|
|
84c335a929 | ||
|
|
f2bf577f34 | ||
|
|
565b8dbd6f | ||
|
|
5a102a4a37 | ||
|
|
c9ac348976 | ||
|
|
a311c8feb1 | ||
|
|
ee3c59210d | ||
|
|
769c616706 | ||
|
|
7da287244b | ||
|
|
841c905c06 | ||
|
|
b86b6bb601 | ||
|
|
f67a263ccd | ||
|
|
90cd039d98 | ||
|
|
7ae30d4cfc | ||
|
|
a8814b42d0 | ||
|
|
3239808a73 | ||
|
|
24aca7d04a | ||
|
|
b7ab169718 | ||
|
|
818d316477 | ||
|
|
a4dfca6b6c | ||
|
|
096bf6debe | ||
|
|
804b1d2f5f | ||
|
|
ef60f1f3b6 | ||
|
|
c768a8ee49 | ||
|
|
daac7689fd | ||
|
|
20cfadca0c | ||
|
|
b1d6034662 | ||
|
|
826cc17e47 | ||
|
|
8be6a83dab | ||
|
|
987fddac24 | ||
|
|
ef52508b1e | ||
|
|
60b0218fa3 | ||
|
|
6271bf34c9 | ||
|
|
89f6aa3a67 | ||
|
|
2273d20160 | ||
|
|
17aa0273a9 | ||
|
|
3a77662a95 | ||
|
|
ccc1db52d3 | ||
|
|
6be062c45f | ||
|
|
58b9a7d413 | ||
|
|
b1d77ee510 | ||
|
|
fb851f089d | ||
|
|
d1e73a3aad | ||
|
|
2a15be21bd | ||
|
|
cdf82f688d | ||
|
|
84cbec2d19 | ||
|
|
a3a4681aac | ||
|
|
3cb29ea45c | ||
|
|
931ab46783 | ||
|
|
8e1d6f44db | ||
|
|
06f88f4142 | ||
|
|
63bf8444bd | ||
|
|
c2d64dcd6d | ||
|
|
305706956e | ||
|
|
5685c5dc3a | ||
|
|
87f05ba2ce | ||
|
|
b140024ebf | ||
|
|
8303b1cf7f | ||
|
|
352f117cb2 | ||
|
|
de22983b36 | ||
|
|
55210b9a61 | ||
|
|
227ee8fca6 | ||
|
|
fbeb63ba79 | ||
|
|
4e42871fae | ||
|
|
db2fdbf68d | ||
|
|
c6569a7ccb | ||
|
|
f529d47f42 | ||
|
|
9f3c154d84 | ||
|
|
f8dd1079f3 | ||
|
|
ed47480116 | ||
|
|
058bef4312 | ||
|
|
29ef5d5f85 | ||
|
|
d8febbd0d8 | ||
|
|
9fb628b473 | ||
|
|
fe80e8c994 | ||
|
|
948dd08214 | ||
|
|
6bff21b234 | ||
|
|
4b3d82ff0f | ||
|
|
966e718f1e | ||
|
|
6b6284d05c | ||
|
|
3901cb8298 | ||
|
|
623d77e531 | ||
|
|
dc1343896d | ||
|
|
77d5120c87 | ||
|
|
08290ece16 | ||
|
|
bdea18e12c | ||
|
|
0464593a02 | ||
|
|
cea641d429 | ||
|
|
25d5416a93 | ||
|
|
81da58ab9c | ||
|
|
a8e3954f01 | ||
|
|
9d04aea55b | ||
|
|
55ca1029a3 | ||
|
|
b2f219739d | ||
|
|
509ef36aa0 | ||
|
|
07a088a23f | ||
|
|
8fbc3701d2 | ||
|
|
0fb2f9c6c3 | ||
|
|
74da99c988 | ||
|
|
5ad0106502 | ||
|
|
048cab79f8 | ||
|
|
cc2d1ef622 | ||
|
|
ad10176e8b | ||
|
|
f3fed0a2a8 | ||
|
|
d95a23c6fb | ||
|
|
2569c09617 | ||
|
|
3637950df5 | ||
|
|
967df83925 | ||
|
|
b3edc2e42e | ||
|
|
4fcf76289c | ||
|
|
eb0dd91126 | ||
|
|
4873ef85ea | ||
|
|
44344c9327 | ||
|
|
536676f11a | ||
|
|
e7cded6879 | ||
|
|
b2036a38e8 | ||
|
|
85fad1ab79 | ||
|
|
e78c58fc28 | ||
|
|
938c5b3de4 | ||
|
|
9761b1d4be | ||
|
|
e3e69d941d | ||
|
|
de81fa3c5d | ||
|
|
f5a9d46881 | ||
|
|
5aedca7305 | ||
|
|
fae8ec5f32 | ||
|
|
7f14ffb11e | ||
|
|
e2ecc248e0 | ||
|
|
aea0670723 | ||
|
|
80038ff152 | ||
|
|
7b940b6a5a | ||
|
|
a11b15e444 | ||
|
|
2c9af9426b | ||
|
|
ecb329e578 | ||
|
|
0981a72eea | ||
|
|
94f015044a | ||
|
|
d4aa588da0 | ||
|
|
3a4e17c735 | ||
|
|
cb750660c3 | ||
|
|
d72949e2f9 | ||
|
|
ac6e67aff0 | ||
|
|
18ab553b0e | ||
|
|
e69db4d26c | ||
|
|
bb5dcb4ba2 | ||
|
|
57841d39ac | ||
|
|
4d9188ab2e | ||
|
|
197ee815a0 | ||
|
|
a9d5f29084 | ||
|
|
4e0915a36e | ||
|
|
523c17b7da | ||
|
|
0c556450cb | ||
|
|
94e114bfdf | ||
|
|
5a1993b6db | ||
|
|
f91bf8715d | ||
|
|
2ac00db0da | ||
|
|
0d0e55de31 | ||
|
|
c11788574e | ||
|
|
fd5198df9f | ||
|
|
75723acc1b | ||
|
|
9d00955004 | ||
|
|
1e4017df03 | ||
|
|
94a934ffa9 | ||
|
|
64a5a6d06f | ||
|
|
b37b8a30f9 | ||
|
|
71932b9756 | ||
|
|
76f51e6f4e | ||
|
|
394d86b94c | ||
|
|
c01206fb8a | ||
|
|
40c453805d | ||
|
|
d0e4a0fb25 | ||
|
|
b22d08eca6 | ||
|
|
11a7af2dc0 | ||
|
|
5ba4d709ae | ||
|
|
724af1499b | ||
|
|
a62a283fd4 | ||
|
|
992bb21bdb | ||
|
|
58050d9ab1 | ||
|
|
efe88b8a0b | ||
|
|
0f72c53aa5 | ||
|
|
b4bba4bf68 | ||
|
|
ea347f211c | ||
|
|
f3d578c81b | ||
|
|
5e78065c2d | ||
|
|
ec7c734bdd | ||
|
|
c45cbc93b7 | ||
|
|
bd396e488c | ||
|
|
d212d5ae2c | ||
|
|
1a39b091a0 | ||
|
|
e564e9884c | ||
|
|
081e4c1bf8 | ||
|
|
5175c1c8c9 | ||
|
|
f6802c7124 | ||
|
|
84aa70f532 | ||
|
|
ed9d7c1ffc | ||
|
|
5ca9778e23 | ||
|
|
e002847777 | ||
|
|
70db34455f | ||
|
|
0f059ece33 | ||
|
|
6d11e8b3fc | ||
|
|
87509bcf99 | ||
|
|
98d30c2056 | ||
|
|
1295e0ed80 | ||
|
|
0f441d825a | ||
|
|
d35823a4a9 | ||
|
|
99aeef7994 | ||
|
|
c46f3a1168 | ||
|
|
fbc8562cf4 | ||
|
|
eb4c379b91 | ||
|
|
09a866e6a1 | ||
|
|
6af2026906 | ||
|
|
27bf74389d | ||
|
|
1c48849853 | ||
|
|
432adfdaef | ||
|
|
716a77f61a | ||
|
|
7fcb2ad3da | ||
|
|
4509befb98 | ||
|
|
af0d372b65 | ||
|
|
89fee6ca4a | ||
|
|
97ffc426fe | ||
|
|
8dcaee0b5b | ||
|
|
7f2bda8ed3 | ||
|
|
5ead064d54 | ||
|
|
5a1a3c566a | ||
|
|
688682d5b5 | ||
|
|
22b780e075 | ||
|
|
7294a1aa2d | ||
|
|
b4f3b52b85 | ||
|
|
6799c40175 | ||
|
|
711ba54af7 | ||
|
|
e1d8b10388 | ||
|
|
7c6ec3e40a | ||
|
|
8fa54d2de7 | ||
|
|
4a321b19ff | ||
|
|
097dd0d9bd | ||
|
|
881addb5b4 | ||
|
|
a2219be198 | ||
|
|
8fa78423e6 | ||
|
|
071ec8be0c | ||
|
|
480ead0fc7 | ||
|
|
a1d9751a6f | ||
|
|
8f490102ee | ||
|
|
f89b9f9ffa | ||
|
|
e8ff4df05f | ||
|
|
670fe3a10a | ||
|
|
3bf053a3b1 | ||
|
|
84a038c498 | ||
|
|
85893ea709 | ||
|
|
3107f928ab | ||
|
|
5b9ff5b742 | ||
|
|
dcb3637cca | ||
|
|
d3271a0405 | ||
|
|
fab2e09903 | ||
|
|
31362d1a43 | ||
|
|
6944db8ab4 | ||
|
|
cb54637e9f | ||
|
|
1f4624c636 |
@@ -1,12 +1,23 @@
|
|||||||
bin/
|
bin/
|
||||||
obj/
|
obj/
|
||||||
Helpers/OAuthCredentials.cs
|
Helpers/OAuthCredentials.cs
|
||||||
|
|
||||||
|
# Bundled FFmpeg (135 MB of DLLs). Fetched once by scripts/fetch-ffmpeg.sh, which pins
|
||||||
|
# the URL + SHA-256; the build then copies it to the output. Never committed — see the
|
||||||
|
# script header for why the hash, not the binaries, is the audit trail.
|
||||||
*.user
|
*.user
|
||||||
*.suo
|
*.suo
|
||||||
.vs/
|
.vs/
|
||||||
*.DotSettings.user
|
*.DotSettings.user
|
||||||
|
|
||||||
|
# Build artifacts — the MSIX + its staging tree are produced by scripts/package-msix.sh,
|
||||||
|
# never committed (the package embeds the published app and the bundled ffmpeg).
|
||||||
|
artifacts/
|
||||||
|
|
||||||
# Confidential business files (gitignored, not committed)
|
# Confidential business files (gitignored, not committed)
|
||||||
MONETIZATION.md
|
MONETIZATION.md
|
||||||
MARCOM.md
|
MARCOM.md
|
||||||
CREDENTIALS.md
|
CREDENTIALS.md
|
||||||
|
.aider*
|
||||||
|
ffmpeg/
|
||||||
|
BuildCounter.txt
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# LlamaCasty — copyright, license, and additional terms
|
||||||
|
|
||||||
|
Copyright (C) 2026 Gramps — https://llamacasty.com
|
||||||
|
|
||||||
|
LlamaCasty is free software: you can redistribute it and/or modify it under the terms of the
|
||||||
|
**GNU General Public License as published by the Free Software Foundation, either version 3 of
|
||||||
|
the License, or (at your option) any later version** (GPL-3.0-or-later), together with the
|
||||||
|
additional terms below, which section 7 of that license permits.
|
||||||
|
The full license text is in [`LICENSE`](LICENSE).
|
||||||
|
|
||||||
|
LlamaCasty is distributed in the hope that it will be useful, but **WITHOUT ANY WARRANTY**;
|
||||||
|
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
Third-party components bundled with LlamaCasty keep their own licenses — see
|
||||||
|
[`THIRD-PARTY-NOTICES.txt`](THIRD-PARTY-NOTICES.txt).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Additional terms (GPL-3.0 section 7)
|
||||||
|
|
||||||
|
1. **Attribution — section 7(b).** Every conveyed copy of this program, modified or not, must keep
|
||||||
|
the copyright notice above and must show, in its About screen (or the equivalent place in its
|
||||||
|
user interface), the notice:
|
||||||
|
|
||||||
|
> Based on LlamaCasty by Gramps — https://llamacasty.com
|
||||||
|
|
||||||
|
2. **Modified versions — section 7(c).** A modified version must be clearly marked as modified,
|
||||||
|
must use a name other than "LlamaCasty", and must not be represented as the original LlamaCasty
|
||||||
|
or as made or endorsed by Gramps.
|
||||||
|
|
||||||
|
3. **Trademarks — section 7(e).** This license grants no right to use the LlamaCasty name, the
|
||||||
|
llama logo, or any other LlamaCasty brand mark, except for the factual attribution required by
|
||||||
|
term 1.
|
||||||
|
|
||||||
|
## Brand artwork — not licensed under the GPL
|
||||||
|
|
||||||
|
The following files are Copyright (C) 2026 Gramps, **all rights reserved**, and are **not**
|
||||||
|
covered by GPL-3.0:
|
||||||
|
|
||||||
|
- `Assets/llamacasty-icon.png`
|
||||||
|
- `Assets/llamacasty-icon.ico`
|
||||||
|
- `Assets/llamacasty-logo.jpg`
|
||||||
|
|
||||||
|
Unmodified copies of LlamaCasty may be redistributed with these files included. Modified versions
|
||||||
|
must replace them with their own artwork. No other use — including on merchandise — is permitted
|
||||||
|
without written permission.
|
||||||
|
|
||||||
|
## Placeholder artwork — licensed with the code
|
||||||
|
|
||||||
|
The scene background images (`Assets/*-background.jpg`) and the default alert video
|
||||||
|
(`Assets/alert-default.mp4`) are AI-generated placeholders, there so the app works the moment it
|
||||||
|
opens. Creators are expected to replace them with their own. They are distributed with the code
|
||||||
|
under GPL-3.0-or-later and carry none of the restrictions above.
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
# AGENTS — how to work in this repo
|
# AGENTS — how to work in this repo
|
||||||
|
|
||||||
This file is auto-read at the start of every session. The project keeps its
|
Auto-read at the start of every session: the rules, the invariants that break the product, and
|
||||||
memory as a linked map of markdown files — read it before doing anything.
|
the map to everything else. `ai.md` is the router, `docs/ai/*.md` is the subsystem truth,
|
||||||
|
`HANDOFF.md` is current state.
|
||||||
|
|
||||||
## ⚠️ CRITICAL: The Good Dog Rule
|
## ⚠️ CRITICAL: The Good Dog Rule
|
||||||
|
|
||||||
@@ -16,9 +17,8 @@ When the user asks for changes that would involve multiple integration tests:
|
|||||||
> *A good dog learns one trick perfectly before learning the next.*
|
> *A good dog learns one trick perfectly before learning the next.*
|
||||||
|
|
||||||
**No feature branches pre-1.0 (decided 2026-08-24):** solo dev, pre-1.0 — all
|
**No feature branches pre-1.0 (decided 2026-08-24):** solo dev, pre-1.0 — all
|
||||||
work lands directly on `main`, committed and pushed per work unit. No
|
work lands directly on `main`, committed per work unit. No `taskNN-*` branches, no PRs. The scope
|
||||||
`taskNN-*` branches, no PRs. The scope discipline above is about test focus,
|
discipline above is about test focus, not git mechanics.
|
||||||
not git mechanics.
|
|
||||||
|
|
||||||
**Commit / push policy (2026-08-30, user directive):** commit every work unit —
|
**Commit / push policy (2026-08-30, user directive):** commit every work unit —
|
||||||
committing is expected and never needs extra permission. Pushing is different:
|
committing is expected and never needs extra permission. Pushing is different:
|
||||||
@@ -27,48 +27,53 @@ that means commits land locally every partial; `git push` happens at the
|
|||||||
session's agreed checkpoint(s), not per-commit. When a milestone warrants a
|
session's agreed checkpoint(s), not per-commit. When a milestone warrants a
|
||||||
push the user will say so (or say "push it").
|
push the user will say so (or say "push it").
|
||||||
|
|
||||||
MUST read the architecture guide before planning or modifying the codebase:
|
## Onboarding (in order — and no further)
|
||||||
[`ai.md`](ai.md) (+ [`schema.md`](schema.md) for the memory-map conventions).
|
|
||||||
|
|
||||||
MUST read the coding guide before writing tests or code: the [Working
|
1. [`HANDOFF.md`](HANDOFF.md) — current state: branch, what's in flight, next action, landmines.
|
||||||
rules](#working-rules) in this file — this repo has no `CODING.md`;
|
**Trust it**; no branch hunting, no file-scanning to re-derive what it already says.
|
||||||
conventions live here and in `ai.md`.
|
2. [`ai.md`](ai.md) — the router: what the product is, the architecture table, and where each
|
||||||
|
subsystem's truth lives.
|
||||||
|
3. **The one** [`docs/ai/`](docs/ai/index.md) file that matches your task — not all of them.
|
||||||
|
The routing table at the top of `ai.md` picks it.
|
||||||
|
4. `<dir>/index.md` — the index for any directory you're about to touch.
|
||||||
|
|
||||||
## Onboarding (in order)
|
`TASKS.md` is the queue. Read it when the user asks what's next or status is part of the
|
||||||
|
question — it is not required reading to write code.
|
||||||
|
|
||||||
1. [`schema.md`](schema.md) — the memory-map conventions (what lives where, how to keep it true).
|
**Why it is this short:** the mandatory read used to be ~56k tokens of map, so sessions paid it
|
||||||
2. [`ai.md`](ai.md) — the AI guide: architecture, patterns, decisions, current state.
|
and then skimmed — which is exactly how stale facts survive. Read the one subsystem you touch.
|
||||||
3. [`TASKS.md`](TASKS.md) — the task queue + authoritative YouTube API research.
|
|
||||||
4. [`HANDOFF.md`](HANDOFF.md) — current operational state: what's in flight, landmines, next step.
|
|
||||||
5. `<dir>/index.md` — the index for any directory you're about to touch.
|
|
||||||
|
|
||||||
**If `HANDOFF.md` exists, trust it as current state** — no `fsck`, no branch
|
## Reading budget
|
||||||
hunting, no file-scanning to re-derive what it already states, unless it points
|
|
||||||
at a problem.
|
Enforced by `scripts/verify.sh`; a commit that pads instead of replacing fails the gate.
|
||||||
|
|
||||||
|
| File | Cap | Role |
|
||||||
|
|---|---|---|
|
||||||
|
| `AGENTS.md` | 210 lines | rules + invariants, always read |
|
||||||
|
| `ai.md` | 100 lines | router only — no narrative, no status |
|
||||||
|
| `HANDOFF.md` | 40 lines | current state, overwritten every time |
|
||||||
|
| `TASKS.md` | 120 lines | the active queue; done work moves to `TASKS/archive.md` |
|
||||||
|
|
||||||
|
If a fact does not fit, it belongs in `docs/ai/<subsystem>.md`, `MyMistakes.md`, or `git log`.
|
||||||
|
|
||||||
## Working rules
|
## Working rules
|
||||||
|
|
||||||
- **Never work without the map.** If the map contradicts the code, the code wins
|
- **Never work without the map.** If the map contradicts the code, the code wins and the facts
|
||||||
and the map gets fixed in the same change (stale facts are corrected, not appended).
|
your change **falsifies** are corrected in the same commit (stale facts are corrected, not
|
||||||
- **Every feature change ships with its memory update in the SAME commit:**
|
appended). Cosmetic drift — a stale task number, a heading — may wait for a sweep; it is not a
|
||||||
`ai.md` for architecture/patterns, `TASKS.md` for status, index files when
|
reason to stall a unit.
|
||||||
layout changes. No code commit without its docs — a follow-up "docs backfill"
|
- **Memory rides with the change, not as a unit of its own.** Correct what the change
|
||||||
commit is a broken rule, not a style.
|
falsifies in the same commit; a broad restatement can be batched at a milestone.
|
||||||
- **Rewrite `HANDOFF.md` at session end, compaction, or any interruption.**
|
- **`HANDOFF.md` is ≤40 lines and is overwritten, never appended:** branch, in flight, dirty
|
||||||
Never end a session with uncommitted work unrecorded — the handoff names the
|
files, next action, new landmines. History belongs to `git log`.
|
||||||
branch, the dirty files, and why it stopped.
|
- **The first time a fact costs a hunt, record it where it will be found:** paths / ports /
|
||||||
- **The first time a fact costs a hunt (secrets path, DB path, port, recovery
|
secrets / build commands → `docs/ai/environment.md`; subsystem traps → that subsystem's
|
||||||
source), record it** in `ai.md`/indexes/`HANDOFF.md` so the next session never
|
`docs/ai` file; one-off recipes → `MyMistakes.md` → Recipes registry.
|
||||||
re-hunts it.
|
- **Derived-solution rule (record once, then grep):** when you work out a reusable solution — a
|
||||||
- **Derived-solution rule (record once, then grep):** the moment you work out a
|
recipe, workaround, or how-to (e.g. how to shrink and re-encode an image for the README) —
|
||||||
reusable solution — a recipe, workaround, or how-to (e.g. how to shrink and
|
write it into `MyMistakes.md` **in the same session**, and **grep `MyMistakes.md` first** on
|
||||||
re-encode an image for the README) — write it into `MyMistakes.md` **in the same
|
any "I've done this before but have to figure it out again" wall. An un-recorded solution
|
||||||
session**, before you finish the task. And always **grep `MyMistakes.md` first**
|
guarantees the user hears it derived again (the image-shrink incident, 2026-08-29).
|
||||||
when you hit a "I've done this before but have to figure it out again" wall. A
|
|
||||||
solution recorded once ends the re-derivation loop; an un-recorded solution is a
|
|
||||||
guarantee you will re-derive it and make the user sit through it again. This is
|
|
||||||
the fix for the image-shrink incident (2026-08-29): the recipe was never written
|
|
||||||
down, so it had to be worked out from scratch a second time.
|
|
||||||
- **Follow existing conventions** — MVVM, `RelayCommand` for actions,
|
- **Follow existing conventions** — MVVM, `RelayCommand` for actions,
|
||||||
`ViewModelBase.SetProperty<T>()`, all styles in `Themes/Controls.xaml`
|
`ViewModelBase.SetProperty<T>()`, all styles in `Themes/Controls.xaml`
|
||||||
(merged once in `App.xaml`; never duplicate per-window).
|
(merged once in `App.xaml`; never duplicate per-window).
|
||||||
@@ -83,13 +88,63 @@ at a problem.
|
|||||||
- **Spin guard (objectively triggered):** a SECOND failed remedy for the same
|
- **Spin guard (objectively triggered):** a SECOND failed remedy for the same
|
||||||
symptom = STOP. No third guess over the same code. Research the established
|
symptom = STOP. No third guess over the same code. Research the established
|
||||||
answer externally, cite its URL in the commit message AND in `MyMistakes.md`,
|
answer externally, cite its URL in the commit message AND in `MyMistakes.md`,
|
||||||
then code it. You do not know everything — repeated failure is a research
|
then code it. Repeated failure is a research trigger, not a persistence trigger.
|
||||||
trigger, not a persistence trigger.
|
|
||||||
- **Response style: no default planning template.** Do the work, then report
|
- **Response style: no default planning template.** Do the work, then report
|
||||||
what changed and what's next. No "Plans & Pitfalls", pros/cons tables, or
|
what changed and what's next. No "Plans & Pitfalls", pros/cons tables, or
|
||||||
step-by-step plans unless the user asks for a plan first (see `ai.md`).
|
step-by-step plans unless the user asks for a plan first. A short diff-style summary beats a
|
||||||
- **No-Fluff Mode is available on request** — unpadded, ruthless review that
|
proposal document every time.
|
||||||
argues rather than reassures (see `ai.md`). Optional, never the default.
|
- **No-Fluff Mode is available on request.** Invoke with "no-fluff mode" (or similar) for
|
||||||
|
ruthless review instead of reassurance: strip pleasantries, emojis and padding; treat the
|
||||||
|
user's input as a draft to deconstruct; give unvarnished truth. Occasional and
|
||||||
|
explicitly-invoked — never the default.
|
||||||
|
|
||||||
|
## Invariants that break the product
|
||||||
|
|
||||||
|
Violating any of these breaks output, wipes a user's data, or ships a legal/trust breach. Each
|
||||||
|
line points at the file that explains it.
|
||||||
|
|
||||||
|
- **The Background is one locked layer per scene** — index 0, never addable/removable/reorderable;
|
||||||
|
Live is `DisplayCapture`, every other canonical scene is static art. Never feed a capture row to
|
||||||
|
the `ActiveBackgroundImage` overlay. → `docs/ai/capture.md`
|
||||||
|
- **Every global overlay composites on every render path** — pump, preview/thumbnails, scene dump.
|
||||||
|
A feature wired into one path is silently absent from the output. → `docs/ai/overlays.md`
|
||||||
|
- **`VideoFrame.Epoch` bumps on every frame from a recycling producer**, or the pump's paste cache
|
||||||
|
and full-render signature serve stale pixels. → `docs/ai/frame-pipeline.md`
|
||||||
|
- **Never demote threads inside `Parallel.For`** — `StripPool` owns four `BelowNormal` threads;
|
||||||
|
strips below 64 rows run inline. → `docs/ai/frame-pipeline.md`
|
||||||
|
- **Submit never blocks:** the encoder queue is bounded, the newest frame is dropped and counted,
|
||||||
|
and `StopAsync` flushes the encoder before awaiting the pump. → `docs/ai/frame-pipeline.md`
|
||||||
|
- **Audio closes before video:** `StopStream` runs `StopLive` (audio EOF) before stopping the pump;
|
||||||
|
the reverse order stalls on pipe backpressure. → `docs/ai/output.md`
|
||||||
|
- **rawvideo is paced by arrival, never by a timestamp** — no `-re`, and `nextTick` is never
|
||||||
|
rebased to wall-now (that turns a hitch into a silent time-lapse). → `docs/ai/output.md`
|
||||||
|
- **The encoder is probed, never libx264** — NVENC → QSV → AMF → OpenH264; no static or GPL codec
|
||||||
|
path. → `docs/ai/output.md`
|
||||||
|
- **REC and ON-AIR are radio-exclusive** — one ffmpeg, one output, in the UI and the VM.
|
||||||
|
→ `docs/ai/output.md`
|
||||||
|
- **ffmpeg is bundled and separate** — never downloaded at runtime, never linked into the app; the
|
||||||
|
pin stays `lgpl-shared`. → `docs/ai/product.md`
|
||||||
|
- **A modal's falsy result never falls through into its side effect** — Cancel on the recording
|
||||||
|
save dialog deletes the temp footage. → `docs/ai/output.md`
|
||||||
|
- **Any test that constructs `MainWindow` must point `LayoutPathOverride` at a temp DB** and clear
|
||||||
|
it in `finally`, or it overwrites the user's real layout. → `docs/ai/environment.md`
|
||||||
|
- **The vertical tier is geometry only**, and the Chat camera is rect-locked in the MODEL
|
||||||
|
(`VerticalShapeLocked`), not just in the UI. → `docs/ai/capture.md`
|
||||||
|
- **Never override the user's camera choice** — there is deliberately no fallback camera.
|
||||||
|
→ `docs/ai/capture.md`
|
||||||
|
- **Chat is rendered, never stored** — no history, no moderation log, no reward payloads; the
|
||||||
|
Store 11.12 certification answer depends on it. → `docs/ai/product.md`
|
||||||
|
- **Full trust only** — a packaged build flipped to `appContainer` silently loses recordings.
|
||||||
|
→ `docs/ai/product.md`
|
||||||
|
- **A `PopupRoot` has no visual parent** — ancestor walks must fall back to
|
||||||
|
`LogicalTreeHelper.GetParent`, or a popup row click reads as an outside click.
|
||||||
|
→ `docs/ai/ui-surface.md`
|
||||||
|
- **Licensing: no non-CC0 icon art, no dropped `THIRD-PARTY-NOTICES.txt`, no
|
||||||
|
licence-incompatible dependency, no unvetted ML model.** → `docs/ai/product.md`
|
||||||
|
- **The private-only broadcast lock is deliberate** — do not unlock it, do not raise it as a
|
||||||
|
question; it ends at v1 by the creator's ruling. → `docs/ai/product.md`
|
||||||
|
- **Read render numbers in Release only** — Debug pixel paths are several× slower.
|
||||||
|
→ `docs/ai/environment.md`
|
||||||
|
|
||||||
## Scope Lock
|
## Scope Lock
|
||||||
|
|
||||||
@@ -115,12 +170,12 @@ don't make it. A stable file touched by an unrelated task is a bug, not a featur
|
|||||||
|
|
||||||
### Pre-commit audit
|
### Pre-commit audit
|
||||||
|
|
||||||
Before every commit, run `scripts/scope-check.sh` with the declared file list.
|
One gate: `./scripts/verify.sh "<file1>" "<file2>" ...` with the declared scope. It runs the doc
|
||||||
If any file appears in `git diff` but not in the declared scope, either justify
|
budgets, a **clean** build (0 warnings), the test suite, and `scope-check.sh`. Docs-only units run
|
||||||
it or revert the change. The script enforces what the rule demands.
|
`scope-check.sh` alone.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
./scripts/scope-check.sh "Models/Scene.cs" "ViewModels/MainViewModel.cs" "MainWindow.xaml"
|
./scripts/verify.sh "Models/Scene.cs" "ViewModels/MainViewModel.cs" "MainWindow.xaml"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Build
|
## Build
|
||||||
@@ -128,7 +183,7 @@ it or revert the change. The script enforces what the rule demands.
|
|||||||
From WSL, ALWAYS use the Windows dotnet host — Linux `dotnet` re-downloads the
|
From WSL, ALWAYS use the Windows dotnet host — Linux `dotnet` re-downloads the
|
||||||
`windowsdesktop.app.*` packs over the slow 9p bridge and re-restores twice (WPF
|
`windowsdesktop.app.*` packs over the slow 9p bridge and re-restores twice (WPF
|
||||||
`_wpftmp`), and `--no-restore` right after an interrupted restore produces bogus
|
`_wpftmp`), and `--no-restore` right after an interrupted restore produces bogus
|
||||||
`NETSDK1064` errors. See `ai.md` → Run for the exact commands and why.
|
`NETSDK1064` errors. See `docs/ai/environment.md` → Run for the exact commands and why.
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
"/mnt/c/Program Files/dotnet/dotnet.exe" build "C:\Users\gramp\Documents\Code\projects\ytLive\ytLive.csproj"
|
"/mnt/c/Program Files/dotnet/dotnet.exe" build "C:\Users\gramp\Documents\Code\projects\ytLive\ytLive.csproj"
|
||||||
|
|||||||
@@ -6,6 +6,9 @@
|
|||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<!-- Design tokens first: every style below resolves its colours, sizes and
|
||||||
|
radii from them (DESIGN.md is the source of truth). -->
|
||||||
|
<ResourceDictionary Source="Themes/Tokens.xaml"/>
|
||||||
<ResourceDictionary Source="Themes/Controls.xaml"/>
|
<ResourceDictionary Source="Themes/Controls.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Threading;
|
using System.Windows.Threading;
|
||||||
using Velopack;
|
|
||||||
using ytLive.Helpers;
|
using ytLive.Helpers;
|
||||||
|
|
||||||
namespace ytLive;
|
namespace ytLive;
|
||||||
@@ -26,20 +25,13 @@ public partial class App : Application
|
|||||||
AppLog.Write(args.Exception, "Dispatcher unhandled exception");
|
AppLog.Write(args.Exception, "Dispatcher unhandled exception");
|
||||||
|
|
||||||
AppLog.Write("App OnStartup begin");
|
AppLog.Write("App OnStartup begin");
|
||||||
|
// Attribution (2026-09-04): every take must be traceable to the exact binary
|
||||||
|
// that produced it — the wordmark shows the release counter (BuildStamp.Release);
|
||||||
|
// the per-build GUID is forensic only and lands here.
|
||||||
|
AppLog.Write($"Build {ytLive.Helpers.BuildStamp.Id} (compiled {ytLive.Helpers.BuildStamp.BuiltLocal})");
|
||||||
|
|
||||||
// Velopack auto-update bootstrap — checks for updates on startup and
|
// There is deliberately NO self-update bootstrap here: the Microsoft Store updates the
|
||||||
// applies them (the app restarts automatically if an update is found).
|
// app (TASK 48 — Store MSIX route), and a second updater would fight it.
|
||||||
// Update URL is configured per-deployment (self-hosted on DO droplet);
|
|
||||||
// when no URL is set, the check is a no-op.
|
|
||||||
try
|
|
||||||
{
|
|
||||||
VelopackApp.Build()
|
|
||||||
.Run();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
AppLog.Write($"Velopack bootstrap failed (non-fatal): {ex.Message}");
|
|
||||||
}
|
|
||||||
|
|
||||||
base.OnStartup(e);
|
base.OnStartup(e);
|
||||||
AppLog.Write("App OnStartup end");
|
AppLog.Write("App OnStartup end");
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION AND CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
https://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
|
After Width: | Height: | Size: 660 KiB |
|
After Width: | Height: | Size: 717 KiB |
|
After Width: | Height: | Size: 560 KiB |
|
After Width: | Height: | Size: 553 KiB |
|
After Width: | Height: | Size: 378 KiB |
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.CameraPickerDialog"
|
<Window x:Class="ytLive.CameraPickerDialog"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Add Webcam" Height="340" Width="460"
|
Title="Add Webcam" Height="340" Width="460"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
@@ -21,10 +21,10 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#1c2a52"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsSelected" Value="True">
|
<Trigger Property="IsSelected" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#2a2450"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Add Webcam" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Add Webcam" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,14"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,14"/>
|
||||||
|
|
||||||
<TextBlock Grid.Row="1" Text="Pick the camera to add to your stream."
|
<TextBlock Grid.Row="1" Text="Pick the camera to add to your stream."
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
<Grid Grid.Row="2">
|
<Grid Grid.Row="2">
|
||||||
<ListBox Background="Transparent" BorderThickness="0"
|
<ListBox Background="Transparent" BorderThickness="0"
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<TextBlock Text="📷" FontSize="15" VerticalAlignment="Center" Margin="0,0,10,0"/>
|
<TextBlock Text="📷" FontSize="15" VerticalAlignment="Center" Margin="0,0,10,0"/>
|
||||||
<TextBlock Text="{Binding Name}" Foreground="#e0e0e0" FontSize="13"
|
<TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.OnSurface}" FontSize="13"
|
||||||
VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
|
VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -67,15 +67,15 @@
|
|||||||
|
|
||||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
|
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Visibility="{Binding IsLoading, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding IsLoading, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Searching for cameras…" Foreground="#a0a0b0" FontSize="13"/>
|
<TextBlock Text="Searching for cameras…" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel VerticalAlignment="Center"
|
<StackPanel VerticalAlignment="Center"
|
||||||
Visibility="{Binding NoCameras, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding NoCameras, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="No cameras found" Foreground="#e0e0e0" FontSize="15"
|
<TextBlock Text="No cameras found" Foreground="{StaticResource Brush.OnSurface}" FontSize="15"
|
||||||
FontWeight="SemiBold" HorizontalAlignment="Center"/>
|
FontWeight="SemiBold" HorizontalAlignment="Center"/>
|
||||||
<TextBlock Text="Check that a webcam is connected and that Windows camera access is enabled."
|
<TextBlock Text="Check that a webcam is connected and that Windows camera access is enabled."
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" MaxWidth="360"
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" MaxWidth="360"
|
||||||
TextAlignment="Center" HorizontalAlignment="Center" Margin="0,8,0,0"/>
|
TextAlignment="Center" HorizontalAlignment="Center" Margin="0,8,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -3,62 +3,8 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<Border Background="#0f3460" Padding="16,4">
|
<Border Background="#0f3460" Padding="16,4">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<!-- Intentionally empty. The hidden label keeps the bar's height unchanged. -->
|
||||||
<ColumnDefinition Width="Auto"/>
|
<TextBlock Style="{StaticResource YtLabel}" Text=" " Visibility="Hidden"/>
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<!-- Gear icon: far left -->
|
|
||||||
<Button Grid.Column="0" ToolTip="Menu" Style="{StaticResource IconButton}"
|
|
||||||
VerticalAlignment="Center" Click="GearButton_Click">
|
|
||||||
<Button.ContextMenu>
|
|
||||||
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
|
||||||
<MenuItem Header="App Settings" Command="{Binding OpenSettingsCommand}"/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="Report Bug" Command="{Binding OpenBugCommand}"/>
|
|
||||||
<MenuItem Header="Feature Request" Command="{Binding OpenFeatureCommand}"/>
|
|
||||||
<MenuItem Header="About" Command="{Binding OpenAboutCommand}"/>
|
|
||||||
</ContextMenu>
|
|
||||||
</Button.ContextMenu>
|
|
||||||
<Path Data="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"
|
|
||||||
Fill="#d0d0d0" Width="16" Height="16" Stretch="Uniform"/>
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
<!-- Stream stats: centered under the preview pane -->
|
|
||||||
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
|
|
||||||
<TextBlock Text="Bitrate:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
|
|
||||||
<TextBlock Style="{StaticResource YtLabel}"
|
|
||||||
Foreground="White" Margin="0,0,20,0">
|
|
||||||
<Run Text="{Binding CurrentHealth.CurrentBitrate, Mode=OneWay}"/>
|
|
||||||
<Run Text=" Mbps"/>
|
|
||||||
</TextBlock>
|
|
||||||
|
|
||||||
<TextBlock Text="FPS:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
|
|
||||||
<TextBlock Style="{StaticResource YtLabel}"
|
|
||||||
Foreground="White" Margin="0,0,24,0">
|
|
||||||
<Run Text="{Binding CurrentHealth.FPS, Mode=OneWay, StringFormat={}{0:0}}"/>
|
|
||||||
</TextBlock>
|
|
||||||
|
|
||||||
<TextBlock Text="Dropped:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
|
|
||||||
<TextBlock Text="{Binding CurrentHealth.DroppedFrames}" Style="{StaticResource YtLabel}"
|
|
||||||
Foreground="White" Margin="0,0,20,0"/>
|
|
||||||
|
|
||||||
<TextBlock Text="Duration:" Style="{StaticResource YtLabel}" Margin="0,0,4,0"/>
|
|
||||||
<TextBlock Text="{Binding CurrentHealth.StreamDuration}" Style="{StaticResource YtLabel}"
|
|
||||||
Foreground="White"/>
|
|
||||||
|
|
||||||
<TextBlock Text="{Binding CurrentHealth.HealthMessage}" Style="{StaticResource YtLabel}"
|
|
||||||
Foreground="#e94560" Margin="20,0,0,0"/>
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<!-- Resolution dropdown: far right -->
|
|
||||||
<ComboBox Grid.Column="2" Style="{StaticResource YtComboBox}" MinWidth="150"
|
|
||||||
ItemsSource="{Binding QualityOptions}"
|
|
||||||
SelectedItem="{Binding SelectedQuality}"
|
|
||||||
DisplayMemberPath="Label"
|
|
||||||
ToolTip="{Binding ResolutionHelp}"
|
|
||||||
IsEnabled="{Binding IsOffline}"/>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
|
|
||||||
namespace ytLive.Controls;
|
namespace ytLive.Controls;
|
||||||
@@ -9,14 +8,4 @@ public partial class BottomBar : UserControl
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GearButton_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (sender is Button { ContextMenu: { } menu } button)
|
|
||||||
{
|
|
||||||
menu.PlacementTarget = button;
|
|
||||||
menu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
|
|
||||||
menu.IsOpen = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,38 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:Helpers="clr-namespace:ytLive.Helpers"
|
xmlns:Helpers="clr-namespace:ytLive.Helpers"
|
||||||
xmlns:models="clr-namespace:ytLive.Models">
|
xmlns:models="clr-namespace:ytLive.Models">
|
||||||
<Border Background="#16213e" CornerRadius="6" Padding="12">
|
<UserControl.Resources>
|
||||||
|
<!-- TASK 63: the border-colour drop-down is the app's own YtComboBox, so the
|
||||||
|
colour entries are drawn by TEMPLATES, in the theme's colours and with the
|
||||||
|
theme's HexToBrush converter — no hand-built menu, no hand-painted brush.
|
||||||
|
The closed box shows the swatch + the colour's NAME; the rows show the
|
||||||
|
swatch + the hex + the name. -->
|
||||||
|
<DataTemplate x:Key="BorderColorClosedTemplate">
|
||||||
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
|
<Border Width="12" Height="12" CornerRadius="2" VerticalAlignment="Center"
|
||||||
|
Background="{Binding Hex, Converter={StaticResource HexToBrush}}"
|
||||||
|
BorderBrush="{StaticResource Brush.Outline}" BorderThickness="1"/>
|
||||||
|
<TextBlock Text="{Binding Name}" Margin="6,0,0,0" FontSize="12"
|
||||||
|
Foreground="{StaticResource Brush.OnSurface}" VerticalAlignment="Center"/>
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
<DataTemplate x:Key="BorderColorRowTemplate">
|
||||||
|
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
|
<Border Width="12" Height="12" CornerRadius="2" VerticalAlignment="Center"
|
||||||
|
Background="{Binding Hex, Converter={StaticResource HexToBrush}}"
|
||||||
|
BorderBrush="{StaticResource Brush.Outline}" BorderThickness="1"/>
|
||||||
|
<TextBlock Text="{Binding Hex}" Margin="6,0,0,0" FontSize="12"
|
||||||
|
Foreground="{StaticResource Brush.OnSurface}" VerticalAlignment="Center"/>
|
||||||
|
<TextBlock Text="{Binding Name}" Margin="8,0,0,0" FontSize="12"
|
||||||
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" VerticalAlignment="Center"/>
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
<Helpers:ClosedBoxTemplateSelector x:Key="BorderColorTemplates"
|
||||||
|
ClosedTemplate="{StaticResource BorderColorClosedTemplate}"
|
||||||
|
RowTemplate="{StaticResource BorderColorRowTemplate}"/>
|
||||||
|
</UserControl.Resources>
|
||||||
|
|
||||||
|
<Border Background="{StaticResource Brush.SurfaceContainer}" CornerRadius="6" Padding="12">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
@@ -17,19 +48,27 @@
|
|||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- LAYERS header + Add button -->
|
<!-- LAYERS header + Add button -->
|
||||||
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,8,0,0">
|
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,8,0,0">
|
||||||
<TextBlock Text="LAYERS" Style="{StaticResource SectionHeader}" VerticalAlignment="Center"/>
|
<Path Data="M12,3 L21,8 L12,13 L3,8 Z M3,12 L12,17 L21,12 M3,16 L12,21 L21,16"
|
||||||
|
Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.8" StrokeLineJoin="Round"
|
||||||
|
Width="16" Height="16" Stretch="Uniform" VerticalAlignment="Center" Margin="0,-4,6,0"/>
|
||||||
|
<TextBlock Text="SCENE LAYERS" Style="{StaticResource SectionHeader}" VerticalAlignment="Center"/>
|
||||||
|
<Border Width="20" Height="20" CornerRadius="10" Background="{StaticResource Brush.Outline}" Margin="6,-4,0,0" VerticalAlignment="Center">
|
||||||
|
<TextBlock Text="{Binding LayerCount}" Foreground="{StaticResource Brush.Tertiary}" FontSize="11" FontWeight="SemiBold"
|
||||||
|
HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||||
|
</Border>
|
||||||
<Button ToolTip="Add Layer" Style="{StaticResource IconButton}" Margin="4,-4,0,0"
|
<Button ToolTip="Add Layer" Style="{StaticResource IconButton}" Margin="4,-4,0,0"
|
||||||
Click="AddSourceButton_Click">
|
Click="AddSourceButton_Click">
|
||||||
<Button.ContextMenu>
|
<Button.ContextMenu>
|
||||||
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
||||||
<MenuItem Header="Webcam" Command="{Binding AddWebcamCommand}"
|
<MenuItem Header="Webcam" Command="{Binding AddWebcamCommand}"
|
||||||
IsEnabled="{Binding CanAddWebcam}"
|
IsEnabled="{Binding CanAddWebcam}"
|
||||||
ToolTip="One webcam at a time — it's already in your stream"/>
|
ToolTip="{Binding WebcamAddToolTip}"/>
|
||||||
<MenuItem Header="Image" Command="{Binding AddImageCommand}"/>
|
<MenuItem Header="Image" Command="{Binding AddImageCommand}"/>
|
||||||
<MenuItem Header="Text" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.TextOverlay}"/>
|
<MenuItem Header="Text" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.TextOverlay}"/>
|
||||||
<MenuItem Header="Countdown" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.Countdown}"
|
<MenuItem Header="Countdown" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.Countdown}"
|
||||||
@@ -40,20 +79,23 @@
|
|||||||
<MenuItem Header="YouTube Chat" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.ChatBox}"
|
<MenuItem Header="YouTube Chat" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.ChatBox}"
|
||||||
IsEnabled="{Binding CanAddYouTubeChat}"
|
IsEnabled="{Binding CanAddYouTubeChat}"
|
||||||
ToolTip="One chat layer at a time — it's already in your stream"/>
|
ToolTip="One chat layer at a time — it's already in your stream"/>
|
||||||
|
<MenuItem Header="Stream Alerts" Command="{Binding AddSourceCommand}" CommandParameter="{x:Static models:SourceType.AlertBox}"
|
||||||
|
IsEnabled="{Binding CanAddAlerts}"
|
||||||
|
ToolTip="Celebration zone for Super Chat & memberships — one alert layer at a time"/>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Button.ContextMenu>
|
</Button.ContextMenu>
|
||||||
<Path Data="M12,4 L12,20 M4,12 L20,12" Stroke="#e94560" StrokeThickness="2"
|
<Path Data="M12,4 L12,20 M4,12 L20,12" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Helpers:FocusPreservingListBox x:Name="SourceList" Grid.Row="1" Background="Transparent" BorderThickness="0"
|
<Helpers:FocusPreservingListBox x:Name="SourceList" Grid.Row="1" MinHeight="84" MaxHeight="240" Background="Transparent" BorderThickness="0"
|
||||||
ItemsSource="{Binding StagedScene.Elements}"
|
ItemsSource="{Binding StagedScene.Elements}"
|
||||||
SelectedItem="{Binding SelectedElement, Mode=TwoWay}"
|
SelectedItem="{Binding SelectedElement, Mode=TwoWay}"
|
||||||
PreviewMouseLeftButtonDown="List_PreviewMouseLeftButtonDown"
|
PreviewMouseLeftButtonDown="List_PreviewMouseLeftButtonDown"
|
||||||
PreviewMouseMove="List_PreviewMouseMove"
|
PreviewMouseMove="List_PreviewMouseMove"
|
||||||
PreviewMouseLeftButtonUp="List_PreviewMouseLeftButtonUp"
|
PreviewMouseLeftButtonUp="List_PreviewMouseLeftButtonUp"
|
||||||
Foreground="#e0e0e0" FontSize="13">
|
Foreground="{StaticResource Brush.OnSurface}" FontSize="13">
|
||||||
<Helpers:FocusPreservingListBox.ItemContainerStyle>
|
<Helpers:FocusPreservingListBox.ItemContainerStyle>
|
||||||
<Style TargetType="ListBoxItem" BasedOn="{StaticResource YtListBoxItem}">
|
<Style TargetType="ListBoxItem" BasedOn="{StaticResource YtListBoxItem}">
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||||
@@ -61,20 +103,27 @@
|
|||||||
<DataTrigger Binding="{Binding IsVisible}" Value="False">
|
<DataTrigger Binding="{Binding IsVisible}" Value="False">
|
||||||
<Setter Property="Opacity" Value="0.45"/>
|
<Setter Property="Opacity" Value="0.45"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
|
<!-- The transient zoom layer has no editing UI — never
|
||||||
|
show it as a layer row (TASK 51). -->
|
||||||
|
<DataTrigger Binding="{Binding IsZoomLayer}" Value="True">
|
||||||
|
<Setter Property="Visibility" Value="Collapsed"/>
|
||||||
|
</DataTrigger>
|
||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
</Helpers:FocusPreservingListBox.ItemContainerStyle>
|
</Helpers:FocusPreservingListBox.ItemContainerStyle>
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid Margin="0,2"
|
<Grid Margin="8,2,0,2"
|
||||||
Tag="{Binding DataContext.CanChangeBackground, RelativeSource={RelativeSource AncestorType=Window}}">
|
Tag="{Binding DataContext.CanChangeBackground, RelativeSource={RelativeSource AncestorType=Window}}">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
|
||||||
<Grid.ContextMenu>
|
<Grid.ContextMenu>
|
||||||
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
||||||
<MenuItem Header="Change Capture…" Click="BackgroundMenu_ChangeCapture">
|
<MenuItem Header="Change Capture…" Click="BackgroundMenu_ChangeCapture">
|
||||||
@@ -93,6 +142,31 @@
|
|||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</MenuItem.Visibility>
|
</MenuItem.Visibility>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
|
<MenuItem Header="Capture Window…"
|
||||||
|
ItemsSource="{Binding DataContext.OpenWindows, RelativeSource={RelativeSource AncestorType=Window}}">
|
||||||
|
<MenuItem.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource AllTrueToVis}">
|
||||||
|
<Binding Path="IsBackground"/>
|
||||||
|
<Binding Path="PlacementTarget.Tag" RelativeSource="{RelativeSource AncestorType={x:Type ContextMenu}}"/>
|
||||||
|
</MultiBinding>
|
||||||
|
</MenuItem.Visibility>
|
||||||
|
<MenuItem.ItemContainerStyle>
|
||||||
|
<Style TargetType="MenuItem">
|
||||||
|
<Setter Property="Header" Value="{Binding Label}"/>
|
||||||
|
<Setter Property="Command"
|
||||||
|
Value="{Binding DataContext.CaptureWindowCommand, RelativeSource={RelativeSource AncestorType=Window}}"/>
|
||||||
|
<Setter Property="CommandParameter" Value="{Binding}"/>
|
||||||
|
</Style>
|
||||||
|
</MenuItem.ItemContainerStyle>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem Header="Refresh Window List" Click="BackgroundMenu_RefreshWindowList">
|
||||||
|
<MenuItem.Visibility>
|
||||||
|
<MultiBinding Converter="{StaticResource AllTrueToVis}">
|
||||||
|
<Binding Path="IsBackground"/>
|
||||||
|
<Binding Path="PlacementTarget.Tag" RelativeSource="{RelativeSource AncestorType={x:Type ContextMenu}}"/>
|
||||||
|
</MultiBinding>
|
||||||
|
</MenuItem.Visibility>
|
||||||
|
</MenuItem>
|
||||||
<Separator>
|
<Separator>
|
||||||
<Separator.Visibility>
|
<Separator.Visibility>
|
||||||
<MultiBinding Converter="{StaticResource AllTrueToVis}">
|
<MultiBinding Converter="{StaticResource AllTrueToVis}">
|
||||||
@@ -106,7 +180,40 @@
|
|||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Grid.ContextMenu>
|
</Grid.ContextMenu>
|
||||||
|
|
||||||
<TextBlock Grid.Column="0" Text="{Binding Name}" VerticalAlignment="Center"
|
<Grid Grid.Column="0" Width="16" Height="16" Margin="0,0,6,0" VerticalAlignment="Center">
|
||||||
|
<Path Data="M7,8 H17 A4,4 0 0 1 21,12 V14 A3,3 0 0 1 17,16 L15,14 H9 L7,16 A3,3 0 0 1 3,14 V12 A4,4 0 0 1 7,8 Z M8,11 V13 M7,12 H9 M15,11 H15.01 M17,13 H17.01" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsLiveCapture}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M3,5 H21 V19 H3 Z M3,16 L9,10 L13,14 L16,11 L21,16" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><MultiDataTrigger><MultiDataTrigger.Conditions><Condition Binding="{Binding IsBackground}" Value="True"/><Condition Binding="{Binding IsLiveCapture}" Value="False"/></MultiDataTrigger.Conditions><Setter Property="Visibility" Value="Visible"/></MultiDataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M3,7 H15 V17 H3 Z M15,11 L21,8 V16 L15,13" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsWebcam}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M4,4 H20 V20 H4 Z M4,16 L9,11 L13,15 L16,12 L20,16 M15,8 H15.01" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsImageSource}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M5,5 H19 M12,5 V19 M8,19 H16" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsTextOverlay}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M12,3 A9,9 0 1 0 12.01,3 M12,7 V12 L15,14" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsCountdown}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M12,3 A9,9 0 1 0 12.01,3 M3,12 H21 M12,3 C8,7 8,17 12,21 M12,3 C16,7 16,17 12,21" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsWebSource}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M4,5 H20 V16 H10 L6,20 V16 H4 Z" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsChatBox}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M4,5 H20 V19 H4 Z M10,9 L15,12 L10,15 Z" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsMediaSource}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
<Path Data="M6,16 V11 A6,6 0 0 1 18,11 V16 L20,18 H4 Z M10,20 H14" Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round" Stretch="Uniform">
|
||||||
|
<Path.Style><Style TargetType="Path"><Setter Property="Visibility" Value="Collapsed"/><Style.Triggers><DataTrigger Binding="{Binding IsAlertBox}" Value="True"><Setter Property="Visibility" Value="Visible"/></DataTrigger></Style.Triggers></Style></Path.Style>
|
||||||
|
</Path>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<TextBlock Grid.Column="1" Text="{Binding Name}" VerticalAlignment="Center"
|
||||||
Padding="4,2" TextTrimming="CharacterEllipsis">
|
Padding="4,2" TextTrimming="CharacterEllipsis">
|
||||||
<TextBlock.Style>
|
<TextBlock.Style>
|
||||||
<Style TargetType="TextBlock">
|
<Style TargetType="TextBlock">
|
||||||
@@ -120,13 +227,12 @@
|
|||||||
</TextBlock.Style>
|
</TextBlock.Style>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
|
|
||||||
<TextBox Grid.Column="0" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Grid.Column="1" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" BorderThickness="0"
|
BorderThickness="0" FontSize="12"
|
||||||
Padding="4,2" VerticalContentAlignment="Center"
|
|
||||||
IsVisibleChanged="SourceNameBox_IsVisibleChanged"
|
IsVisibleChanged="SourceNameBox_IsVisibleChanged"
|
||||||
KeyDown="SourceNameBox_KeyDown" LostFocus="SourceNameBox_LostFocus">
|
KeyDown="SourceNameBox_KeyDown" LostFocus="SourceNameBox_LostFocus">
|
||||||
<TextBox.Style>
|
<TextBox.Style>
|
||||||
<Style TargetType="TextBox">
|
<Style TargetType="TextBox" BasedOn="{StaticResource YtTextBoxCompact}">
|
||||||
<Setter Property="Visibility" Value="Collapsed"/>
|
<Setter Property="Visibility" Value="Collapsed"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding IsEditing}" Value="True">
|
<DataTrigger Binding="{Binding IsEditing}" Value="True">
|
||||||
@@ -137,26 +243,26 @@
|
|||||||
</TextBox.Style>
|
</TextBox.Style>
|
||||||
</TextBox>
|
</TextBox>
|
||||||
|
|
||||||
<Button Grid.Column="1" ToolTip="Edit Layer Name"
|
<Button Grid.Column="2" ToolTip="Edit Layer Name"
|
||||||
Command="{Binding DataContext.EditElementCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
Command="{Binding DataContext.EditElementCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
||||||
CommandParameter="{Binding}" Style="{StaticResource IconButton}">
|
CommandParameter="{Binding}" Style="{StaticResource IconButton}">
|
||||||
<Path Data="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"
|
<Path Data="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"
|
||||||
Fill="#d0d0d0" Width="13" Height="13" Stretch="Uniform"/>
|
Fill="{StaticResource Brush.OnSurface}" Width="13" Height="13" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button Grid.Column="2" Style="{StaticResource EyeButton}"
|
<Button Grid.Column="3" Style="{StaticResource EyeButton}"
|
||||||
Command="{Binding DataContext.ToggleElementVisibilityCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
Command="{Binding DataContext.ToggleElementVisibilityCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
||||||
CommandParameter="{Binding}">
|
CommandParameter="{Binding}">
|
||||||
<Path Style="{StaticResource EyeIconStyle}" Fill="#d0d0d0"
|
<Path Style="{StaticResource EyeIconStyle}" Fill="{StaticResource Brush.OnSurface}"
|
||||||
Width="13" Height="13" Stretch="Uniform"/>
|
Width="13" Height="13" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Button Grid.Column="3" ToolTip="Remove Layer"
|
<Button Grid.Column="4" ToolTip="Remove Layer"
|
||||||
Command="{Binding DataContext.RemoveSourceCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
Command="{Binding DataContext.RemoveSourceCommand, RelativeSource={RelativeSource AncestorType=ListBox}}"
|
||||||
CommandParameter="{Binding}" Style="{StaticResource IconButton}"
|
CommandParameter="{Binding}" Style="{StaticResource IconButton}"
|
||||||
Visibility="{Binding IsBackground, Converter={StaticResource HiddenBoolToVis}}">
|
Visibility="{Binding IsBackground, Converter={StaticResource HiddenBoolToVis}}">
|
||||||
<Path Data="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"
|
<Path Data="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"
|
||||||
Fill="#d0d0d0" Width="13" Height="13" Stretch="Uniform"/>
|
Fill="{StaticResource Brush.OnSurface}" Width="13" Height="13" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -167,163 +273,294 @@
|
|||||||
HorizontalAlignment="Center" VerticalAlignment="Center"
|
HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||||
Visibility="{Binding ShowSourcesEmptyHint, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding ShowSourcesEmptyHint, Converter={StaticResource BoolToVis}}"/>
|
||||||
|
|
||||||
|
<!-- Resource alert: pinned to the bottom of the Layers panel.
|
||||||
|
Red when a required resource (the one-and-only webcam)
|
||||||
|
could not be locked; persists and re-polls until resolved. -->
|
||||||
|
<Border Grid.Row="3" Margin="0,8,0,0" Padding="8,6" CornerRadius="4"
|
||||||
|
Background="{StaticResource Brush.ErrorContainer}" BorderBrush="{StaticResource Brush.Error}" BorderThickness="1"
|
||||||
|
Visibility="{Binding WebcamLockAlert, Converter={StaticResource NotNullToVis}}">
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock Text="{Binding WebcamLockAlert}" Foreground="{StaticResource Brush.OnError}" FontSize="11"
|
||||||
|
TextWrapping="Wrap"/>
|
||||||
|
<Button Content="Retry" Command="{Binding RetryWebcamLockCommand}"
|
||||||
|
Style="{StaticResource YtButtonSecondary}" Padding="10,2"
|
||||||
|
HorizontalAlignment="Right" Margin="0,6,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
<!-- ELEMENTS panel: per-element config beneath Sources.
|
<!-- ELEMENTS panel: per-element config beneath Sources.
|
||||||
Collapses entirely when no element is selected. -->
|
Collapses entirely when no element is selected. -->
|
||||||
<Rectangle Grid.Row="3" Height="1" Fill="#2c3a5c" Margin="0,10,0,2"
|
<Rectangle Grid.Row="4" Height="1" Fill="{StaticResource Brush.Outline}" Margin="0,22,0,10"/>
|
||||||
Visibility="{Binding SelectedElement, Converter={StaticResource NotNullToVis}}"/>
|
<StackPanel Grid.Row="5" Orientation="Horizontal" Margin="0,8,0,0">
|
||||||
<StackPanel Grid.Row="4" Orientation="Horizontal" Margin="0,8,0,0"
|
<Path Data="M12,8 A4,4 0 1 0 12.01,8 M19.4,15 L21,16.2 L19.4,19 L17.2,18.3 A7,7 0 0 1 15,19.4 L14.5,21.5 H9.5 L9,19.4 A7,7 0 0 1 6.8,18.3 L4.6,19 L3,16.2 L4.6,15 A7,7 0 0 1 4.6,9 L3,7.8 L4.6,5 L6.8,5.7 A7,7 0 0 1 9,4.6 L9.5,2.5 H14.5 L15,4.6 A7,7 0 0 1 17.2,5.7 L19.4,5 L21,7.8 L19.4,9 A7,7 0 0 1 19.4,15 Z"
|
||||||
Visibility="{Binding SelectedElement, Converter={StaticResource NotNullToVis}}">
|
Stroke="{StaticResource Brush.Tertiary}" StrokeThickness="1.6" StrokeLineJoin="Round"
|
||||||
|
Width="16" Height="16" Stretch="Uniform" VerticalAlignment="Center" Margin="0,0,6,0"/>
|
||||||
<TextBlock Text="PROPERTIES" Style="{StaticResource SectionHeader}" VerticalAlignment="Center"/>
|
<TextBlock Text="PROPERTIES" Style="{StaticResource SectionHeader}" VerticalAlignment="Center"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ScrollViewer x:Name="ElementsScrollViewer" Grid.Row="5" VerticalScrollBarVisibility="Auto" Background="Transparent"
|
<TextBlock Grid.Row="6" Text="Select an item to edit its properties" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12"
|
||||||
|
Margin="8,4,0,0" TextWrapping="Wrap"
|
||||||
|
Visibility="{Binding SelectedElement, Converter={StaticResource NullToVis}}"/>
|
||||||
|
<ScrollViewer x:Name="ElementsScrollViewer" Grid.Row="6" VerticalScrollBarVisibility="Auto" Background="Transparent"
|
||||||
Visibility="{Binding SelectedElement, Converter={StaticResource NotNullToVis}}">
|
Visibility="{Binding SelectedElement, Converter={StaticResource NotNullToVis}}">
|
||||||
<StackPanel x:Name="ElementsPanel" Margin="0,4,0,0">
|
<StackPanel x:Name="ElementsPanel" Margin="8,4,0,0">
|
||||||
<!-- Opacity + mirror/shape (draggable elements: image, webcam) -->
|
<!-- Opacity + mirror/shape (draggable elements: image, webcam) -->
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsDraggable, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
<StackPanel Visibility="{Binding SelectedElement.IsDraggable, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsChatBox, Converter={StaticResource InverseBoolToVis}}">
|
<StackPanel Visibility="{Binding SelectedElement.IsChatBox, Converter={StaticResource InverseBoolToVis}}">
|
||||||
<TextBlock Text="Opacity" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
|
<TextBlock Text="Opacity" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="0,0,0,2"/>
|
||||||
<DockPanel Margin="0,0,0,6">
|
<DockPanel Margin="0,0,0,6">
|
||||||
<TextBlock x:Name="OpacityValueText" Text="100%" Foreground="#a0a0b0" FontSize="11"
|
<TextBlock x:Name="OpacityValueText" Text="100%" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11"
|
||||||
DockPanel.Dock="Right" VerticalAlignment="Center" Margin="8,0,0,0" Width="32"/>
|
DockPanel.Dock="Right" VerticalAlignment="Center" Margin="8,0,0,0" Width="32"/>
|
||||||
<Slider x:Name="OpacitySlider" Width="120" Minimum="0" Maximum="1"
|
<Slider x:Name="OpacitySlider" Width="120" Minimum="0" Maximum="1"
|
||||||
Value="{Binding SelectedElement.Opacity, Mode=TwoWay}"
|
Value="{Binding SelectedElement.Opacity, Mode=TwoWay}"
|
||||||
ValueChanged="OpacitySlider_ValueChanged" VerticalAlignment="Center"/>
|
ValueChanged="OpacitySlider_ValueChanged" VerticalAlignment="Center"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,4"
|
<!-- TASK 59: the shape is a CHOICE (Rect | Circle) under a
|
||||||
Visibility="{Binding IsWebcamSelected, Converter={StaticResource BoolToVis}}">
|
"Shape" title, with Rect selected by default — the circle
|
||||||
|
is not offered in the vertical Chat layout, so that option
|
||||||
|
is not even shown there (CanToggleClipShape). -->
|
||||||
|
<StackPanel Visibility="{Binding IsWebcamSelected, Converter={StaticResource BoolToVis}}">
|
||||||
|
<TextBlock Text="Shape" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,4"/>
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="10,0,0,4">
|
||||||
<Button Content="{Binding SelectedElement.MirrorButtonText}"
|
<Button Content="{Binding SelectedElement.MirrorButtonText}"
|
||||||
Style="{StaticResource YtButtonSecondary}" Padding="10,4"
|
Style="{StaticResource YtButtonSecondary}" Padding="10,4"
|
||||||
Click="MirrorButton_Click"/>
|
Click="MirrorButton_Click"/>
|
||||||
<Button Content="{Binding SelectedElement.ShapeButtonText}"
|
<ToggleButton Style="{StaticResource SegmentToggle}" Padding="10,4" Margin="8,0,0,0"
|
||||||
Style="{StaticResource YtButtonSecondary}" Padding="10,4"
|
IsChecked="{Binding SelectedElement.IsRectShape, Mode=TwoWay}">
|
||||||
Margin="8,0,0,0" Click="ShapeButton_Click"/>
|
<TextBlock Text="Rect" Style="{StaticResource SegmentLabel}"/>
|
||||||
|
</ToggleButton>
|
||||||
|
<ToggleButton Style="{StaticResource SegmentToggle}" Padding="10,4" Margin="4,0,0,0"
|
||||||
|
IsChecked="{Binding SelectedElement.IsRoundShape, Mode=TwoWay}"
|
||||||
|
Visibility="{Binding CanToggleClipShape, Converter={StaticResource BoolToVis}}">
|
||||||
|
<TextBlock Text="Circle" Style="{StaticResource SegmentLabel}"/>
|
||||||
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
<!-- The drag hint sits under the shape row — indented, so the
|
||||||
|
parentage shows. -->
|
||||||
<TextBlock Text="Drag to move · drag the corner dot to resize"
|
<TextBlock Text="Drag to move · drag the corner dot to resize"
|
||||||
Foreground="#a0a0b0" FontSize="10" Margin="0,2,0,0"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="10" Margin="10,2,0,0"/>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- Webcam geometry (TASK 57): under the vertical tier the camera
|
||||||
|
keeps its OWN placement, so these fields edit the LIVE one —
|
||||||
|
the placement the current tier shows. Gated on the VM's
|
||||||
|
IsWebcamSelected (the same condition as the mirror/shape row
|
||||||
|
above) so the webcam's border/background section stays the
|
||||||
|
one panel bound to SelectedElement.IsWebcam. -->
|
||||||
|
<StackPanel Visibility="{Binding IsWebcamSelected, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
|
<TextBlock Text="Geometry" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,4"/>
|
||||||
|
<!-- TASK 61: the four fields share ONE fixed width — wide enough
|
||||||
|
for the largest geometry value (1920, plus a typed sign) and
|
||||||
|
no wider, so Y/H no longer stretch to fill the row. -->
|
||||||
|
<DockPanel Margin="10,0,0,4" LastChildFill="False">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="X" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
||||||
|
<TextBox Text="{Binding SelectedElement.X, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}" Width="44"/>
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text=" Y" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
||||||
|
<TextBox Text="{Binding SelectedElement.Y, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}" Width="44"/>
|
||||||
|
</DockPanel>
|
||||||
|
<DockPanel Margin="10,0,0,4" LastChildFill="False">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="W" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
||||||
|
<TextBox Text="{Binding SelectedElement.Width, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}" Width="44"/>
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text=" H" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
||||||
|
<TextBox Text="{Binding SelectedElement.Height, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}" Width="44"/>
|
||||||
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Webcam border config -->
|
<!-- Webcam border config -->
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsWebcam, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
<StackPanel Visibility="{Binding SelectedElement.IsWebcam, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
<TextBlock Text="Border Color" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
|
<TextBlock Text="Border Color" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
<DockPanel Margin="0,0,0,6">
|
<!-- TASK 63: the border colour is picked with the app's OWN
|
||||||
<Button DockPanel.Dock="Right" Content="..." Width="24" Height="24"
|
drop-down (YtComboBox) — the same widget the Display
|
||||||
Click="WebcamBorderColorPicker_Click" Margin="4,0,0,0"
|
and Font pickers use — not a hand-rolled menu. The hex
|
||||||
ToolTip="Pick color"/>
|
field stays for a colour the creator types; the
|
||||||
<TextBox Text="{Binding SelectedElement.BorderColor, UpdateSourceTrigger=PropertyChanged}"
|
drop-down carries the colour's name. -->
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
<DockPanel Margin="10,0,0,6">
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"
|
<TextBox DockPanel.Dock="Left"
|
||||||
MaxLength="7" ToolTip="#RRGGBB"/>
|
Text="{Binding SelectedElement.BorderColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}"
|
||||||
|
MaxLength="7" ToolTip="#RRGGBB" Width="60"
|
||||||
|
VerticalAlignment="Center"/>
|
||||||
|
<ComboBox ItemsSource="{Binding SelectedElement.BorderColorOptions}"
|
||||||
|
SelectedItem="{Binding SelectedElement.BorderColorEntry, Mode=TwoWay}"
|
||||||
|
ItemTemplateSelector="{StaticResource BorderColorTemplates}"
|
||||||
|
Style="{StaticResource YtComboBox}"
|
||||||
|
ToolTip="Border colour" MinWidth="100"
|
||||||
|
Margin="8,0,0,0" VerticalAlignment="Center"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
<TextBlock Text="Border Thickness" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
|
<TextBlock Text="Border Thickness" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
<DockPanel Margin="0,0,0,6">
|
<DockPanel Margin="10,0,0,6">
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" Margin="4,0,0,0"
|
Width="22" Height="22" Margin="4,0,0,0"
|
||||||
Click="WebcamBorderAccept_Click">
|
Click="WebcamBorderAccept_Click">
|
||||||
<Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
|
<Path Data="M4,9 L8,14 L16,4" Stroke="{StaticResource Brush.Positive}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" ToolTip="Revert"
|
Width="22" Height="22" ToolTip="Revert"
|
||||||
Click="WebcamBorderRevert_Click" Margin="4,0,0,0">
|
Click="WebcamBorderRevert_Click" Margin="4,0,0,0">
|
||||||
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
|
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="{StaticResource Brush.OnSurfaceVariant}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Slider DockPanel.Dock="Left" Width="120" Minimum="0" Maximum="10"
|
<Slider DockPanel.Dock="Left" Width="120" Minimum="0" Maximum="10"
|
||||||
Value="{Binding SelectedElement.BorderWidth, Mode=TwoWay}"
|
Value="{Binding SelectedElement.BorderWidth, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
|
VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
|
||||||
<TextBlock Text="{Binding SelectedElement.BorderWidth}" Foreground="#a0a0b0" FontSize="11"
|
<TextBlock Text="{Binding SelectedElement.BorderWidth}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11"
|
||||||
VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
|
VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
|
<!-- TASK 51: background effects — two pills acting as radio buttons
|
||||||
|
(one on turns the other off; both off = no effect). TASK 59:
|
||||||
|
the pills are indented under the Background title, and the
|
||||||
|
strength row one level deeper, under Blur. -->
|
||||||
|
<TextBlock Text="Background" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,6"/>
|
||||||
|
<DockPanel Margin="10,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Remove" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<ToggleButton x:Name="RemoveBackgroundPill" Style="{StaticResource PillToggle}"
|
||||||
|
IsChecked="{Binding SelectedElement.RemoveBackground, Mode=TwoWay}"
|
||||||
|
AutomationProperties.Name="Remove background"
|
||||||
|
ToolTip="Remove the background behind you — the layers below show through"
|
||||||
|
HorizontalAlignment="Left"/>
|
||||||
|
</DockPanel>
|
||||||
|
<DockPanel Margin="10,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Blur" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<ToggleButton x:Name="BlurBackgroundPill" Style="{StaticResource PillToggle}"
|
||||||
|
IsChecked="{Binding SelectedElement.BlurBackground, Mode=TwoWay}"
|
||||||
|
AutomationProperties.Name="Blur background"
|
||||||
|
ToolTip="Blur the background behind you"
|
||||||
|
HorizontalAlignment="Left"/>
|
||||||
|
</DockPanel>
|
||||||
|
<DockPanel Margin="20,0,0,6"
|
||||||
|
Visibility="{Binding SelectedElement.HasBackgroundEffect, Converter={StaticResource BoolToVis}}">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Strength" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.BackgroundStrength, StringFormat={}{0:P0}}"
|
||||||
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Margin="8,0,0,0" Width="34"/>
|
||||||
|
<Slider x:Name="BackgroundStrengthSlider" Minimum="0" Maximum="1"
|
||||||
|
Value="{Binding SelectedElement.BackgroundStrength, Mode=TwoWay}"
|
||||||
|
TickFrequency="0.05" IsSnapToTickEnabled="True" VerticalAlignment="Center"
|
||||||
|
AutomationProperties.Name="Background effect strength"
|
||||||
|
ToolTip="Blur: how strong the blur is · Remove: how soft the edge is"/>
|
||||||
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Countdown config -->
|
<!-- Countdown config -->
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsCountdown, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
<StackPanel Visibility="{Binding SelectedElement.IsCountdown, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
<TextBlock Text="Timer (minutes)" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
|
<TextBlock Text="Timer (minutes)" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="0,0,0,2"/>
|
||||||
<DockPanel Margin="0,0,0,6">
|
<DockPanel Margin="0,0,0,6">
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" Margin="4,0,0,0"
|
Width="22" Height="22" Margin="4,0,0,0"
|
||||||
Click="CountdownAccept_Click">
|
Click="CountdownAccept_Click">
|
||||||
<Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
|
<Path Data="M4,9 L8,14 L16,4" Stroke="{StaticResource Brush.Positive}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" ToolTip="Revert"
|
Width="22" Height="22" ToolTip="Revert"
|
||||||
Click="CountdownRevert_Click" Margin="4,0,0,0">
|
Click="CountdownRevert_Click" Margin="4,0,0,0">
|
||||||
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
|
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="{StaticResource Brush.OnSurfaceVariant}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Slider DockPanel.Dock="Left" Width="120" Minimum="1" Maximum="60"
|
<Slider DockPanel.Dock="Left" Width="120" Minimum="1" Maximum="60"
|
||||||
Value="{Binding SelectedElement.TimerMinutes, Mode=TwoWay}"
|
Value="{Binding SelectedElement.TimerMinutes, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
|
VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
|
||||||
<TextBlock Text="{Binding SelectedElement.TimerMinutes}" Foreground="#a0a0b0" FontSize="11"
|
<TextBlock Text="{Binding SelectedElement.TimerMinutes}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11"
|
||||||
VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
|
VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Web source config -->
|
<!-- Web source config -->
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsWebSource, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
<StackPanel Visibility="{Binding SelectedElement.IsWebSource, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
<TextBlock Text="Geometry" Foreground="#a0a0b0" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,4"/>
|
<TextBlock Text="Geometry" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,4"/>
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="X" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
<TextBlock DockPanel.Dock="Left" Text="X" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
||||||
<TextBox Text="{Binding SelectedElement.X, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
<TextBox Text="{Binding SelectedElement.X, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"/>
|
<TextBlock DockPanel.Dock="Left" Text=" Y" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
||||||
<TextBlock DockPanel.Dock="Left" Text=" Y" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
|
||||||
<TextBox Text="{Binding SelectedElement.Y, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
<TextBox Text="{Binding SelectedElement.Y, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="W" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
<TextBlock DockPanel.Dock="Left" Text="W" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="16"/>
|
||||||
<TextBox Text="{Binding SelectedElement.Width, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
<TextBox Text="{Binding SelectedElement.Width, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"/>
|
<TextBlock DockPanel.Dock="Left" Text=" H" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
||||||
<TextBlock DockPanel.Dock="Left" Text=" H" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="20" Margin="8,0,0,0"/>
|
|
||||||
<TextBox Text="{Binding SelectedElement.Height, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
<TextBox Text="{Binding SelectedElement.Height, UpdateSourceTrigger=PropertyChanged, StringFormat=F0}"
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
<TextBlock Text="URI" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"/>
|
<TextBlock Text="URI" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="0,0,0,2"/>
|
||||||
<DockPanel>
|
<DockPanel>
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" Margin="4,0,0,0" IsTabStop="False"
|
Width="22" Height="22" Margin="4,0,0,0" IsTabStop="False"
|
||||||
Click="WebAccept_Click">
|
Click="WebAccept_Click">
|
||||||
<Path Data="M4,9 L8,14 L16,4" Stroke="#22c55e" StrokeThickness="2"
|
<Path Data="M4,9 L8,14 L16,4" Stroke="{StaticResource Brush.Positive}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
<Button DockPanel.Dock="Right" Style="{StaticResource IconButton}"
|
||||||
Width="22" Height="22" ToolTip="Revert" IsTabStop="False"
|
Width="22" Height="22" ToolTip="Revert" IsTabStop="False"
|
||||||
Click="WebRevert_Click" Margin="4,0,0,0">
|
Click="WebRevert_Click" Margin="4,0,0,0">
|
||||||
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="#e94560" StrokeThickness="2"
|
<Path Data="M5,5 L15,15 M15,5 L5,15" Stroke="{StaticResource Brush.OnSurfaceVariant}" StrokeThickness="2"
|
||||||
Width="14" Height="14" Stretch="Uniform"/>
|
Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
<TextBox Text="{Binding SelectedElement.WebUri, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding SelectedElement.WebUri, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0d0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}"
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="12"
|
|
||||||
ToolTip="https://example.com"/>
|
ToolTip="https://example.com"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Chat box config -->
|
<!-- Chat box config -->
|
||||||
<StackPanel Visibility="{Binding SelectedElement.IsChatBox, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
<StackPanel Visibility="{Binding SelectedElement.IsChatBox, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
<TextBlock Text="Chat Overlay" Foreground="#a0a0b0" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
<TextBlock Text="Chat Overlay" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||||
|
|
||||||
|
<!-- Border (same controls as the webcam's border) -->
|
||||||
|
<TextBlock Text="Border Color" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,2"/>
|
||||||
|
<DockPanel Margin="10,0,0,6">
|
||||||
|
<TextBox DockPanel.Dock="Left"
|
||||||
|
Text="{Binding SelectedElement.BorderColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}"
|
||||||
|
MaxLength="7" ToolTip="#RRGGBB" Width="60"
|
||||||
|
VerticalAlignment="Center"/>
|
||||||
|
<ComboBox ItemsSource="{Binding SelectedElement.BorderColorOptions}"
|
||||||
|
SelectedItem="{Binding SelectedElement.BorderColorEntry, Mode=TwoWay}"
|
||||||
|
ItemTemplateSelector="{StaticResource BorderColorTemplates}"
|
||||||
|
Style="{StaticResource YtComboBox}"
|
||||||
|
ToolTip="Border colour" MinWidth="100"
|
||||||
|
Margin="8,0,0,0" VerticalAlignment="Center"/>
|
||||||
|
</DockPanel>
|
||||||
|
<TextBlock Text="Border Thickness" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,2"/>
|
||||||
|
<DockPanel Margin="10,0,0,6">
|
||||||
|
<Slider DockPanel.Dock="Left" Width="120" Minimum="0" Maximum="10"
|
||||||
|
Value="{Binding SelectedElement.BorderWidth, Mode=TwoWay}"
|
||||||
|
VerticalAlignment="Center" TickFrequency="1" IsSnapToTickEnabled="True"/>
|
||||||
|
<TextBlock Text="{Binding SelectedElement.BorderWidth}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11"
|
||||||
|
VerticalAlignment="Center" Margin="8,0,0,0" Width="20"/>
|
||||||
|
</DockPanel>
|
||||||
|
<TextBlock Text="Border Opacity" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,2"/>
|
||||||
|
<DockPanel Margin="10,0,0,8">
|
||||||
|
<Slider DockPanel.Dock="Left" Width="120" Minimum="0" Maximum="1"
|
||||||
|
Value="{Binding SelectedElement.BorderOpacity, Mode=TwoWay}"
|
||||||
|
VerticalAlignment="Center"/>
|
||||||
|
<TextBlock Text="{Binding SelectedElement.BorderOpacity, StringFormat={}{0:P0}}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11"
|
||||||
|
VerticalAlignment="Center" Margin="8,0,0,0" Width="34"/>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Font Size -->
|
<!-- Font Size -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Font Size" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Font Size" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<Slider x:Name="ChatFontSizeSlider" Width="120" Minimum="8" Maximum="72" TickFrequency="2" IsSnapToTickEnabled="True"
|
<Slider x:Name="ChatFontSizeSlider" Width="120" Minimum="8" Maximum="72" TickFrequency="2" IsSnapToTickEnabled="True"
|
||||||
Value="{Binding SelectedElement.ChatFontSize, Mode=TwoWay}"
|
Value="{Binding SelectedElement.ChatFontSize, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatFontSize, StringFormat={}{0:0}}" Foreground="#e0e0e0" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="24"/>
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatFontSize, StringFormat={}{0:0}}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="24"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Font Family -->
|
<!-- Font Family -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Font" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Font" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<ComboBox SelectedValue="{Binding SelectedElement.ChatFontFamily, Mode=TwoWay}"
|
<ComboBox SelectedValue="{Binding SelectedElement.ChatFontFamily, Mode=TwoWay}"
|
||||||
SelectedValuePath="Content"
|
SelectedValuePath="Content"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" FontSize="11"
|
Style="{StaticResource YtComboBox}"
|
||||||
Width="140" VerticalAlignment="Center">
|
Width="140" VerticalAlignment="Center">
|
||||||
<ComboBoxItem Content="Segoe UI"/>
|
<ComboBoxItem Content="Segoe UI"/>
|
||||||
<ComboBoxItem Content="Arial"/>
|
<ComboBoxItem Content="Arial"/>
|
||||||
@@ -336,77 +573,137 @@
|
|||||||
|
|
||||||
<!-- Font Color -->
|
<!-- Font Color -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Font Color" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Font Color" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<TextBox Text="{Binding SelectedElement.ChatFontColor, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding SelectedElement.ChatFontColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}" Width="80"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="11" Width="80"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Member Color -->
|
<!-- Member Color -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Member" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Member" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<TextBox Text="{Binding SelectedElement.ChatMemberColor, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding SelectedElement.ChatMemberColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}" Width="80"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="11" Width="80"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Super Chat Color -->
|
<!-- Super Chat Color -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Super Chat" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Super Chat" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<TextBox Text="{Binding SelectedElement.ChatSuperChatColor, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding SelectedElement.ChatSuperChatColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}" Width="80"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="11" Width="80"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Max Messages -->
|
<!-- Max Messages -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Max Msgs" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Max Msgs" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<Slider x:Name="ChatMaxMsgsSlider" Width="120" Minimum="1" Maximum="20" TickFrequency="1" IsSnapToTickEnabled="True"
|
<Slider x:Name="ChatMaxMsgsSlider" Width="120" Minimum="1" Maximum="20" TickFrequency="1" IsSnapToTickEnabled="True"
|
||||||
Value="{Binding SelectedElement.ChatMaxMessages, Mode=TwoWay}"
|
Value="{Binding SelectedElement.ChatMaxMessages, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatMaxMessages}" Foreground="#e0e0e0" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="24"/>
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatMaxMessages}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="24"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Background Color -->
|
<!-- Background Color -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Background" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Background" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<TextBox Text="{Binding SelectedElement.ChatBackgroundColor, UpdateSourceTrigger=PropertyChanged}"
|
<TextBox Text="{Binding SelectedElement.ChatBackgroundColor, UpdateSourceTrigger=PropertyChanged}"
|
||||||
Background="#0f3460" Foreground="#e0e0e0" BorderThickness="1"
|
Style="{StaticResource YtTextBoxCompact}" Width="80"/>
|
||||||
BorderBrush="#2c3a5c" Padding="4,2" FontSize="11" Width="80"/>
|
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Background Opacity -->
|
<!-- Background Opacity -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Bg Opacity" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Bg Opacity" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<Slider x:Name="ChatBgOpacitySlider" Width="120" Minimum="0" Maximum="1"
|
<Slider x:Name="ChatBgOpacitySlider" Width="120" Minimum="0" Maximum="1"
|
||||||
Value="{Binding SelectedElement.ChatBackgroundOpacity, Mode=TwoWay}"
|
Value="{Binding SelectedElement.ChatBackgroundOpacity, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatBackgroundOpacity, StringFormat={}{0:0%}}" Foreground="#e0e0e0" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="32"/>
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatBackgroundOpacity, StringFormat={}{0:0%}}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="32"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Fade After (seconds) -->
|
<!-- Fade After (seconds) -->
|
||||||
<DockPanel Margin="0,0,0,4">
|
<DockPanel Margin="0,0,0,4">
|
||||||
<TextBlock DockPanel.Dock="Left" Text="Fade After" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
<TextBlock DockPanel.Dock="Left" Text="Fade After" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="70"/>
|
||||||
<Slider x:Name="ChatFadeSlider" Width="120" Minimum="0" Maximum="60" TickFrequency="5" IsSnapToTickEnabled="True"
|
<Slider x:Name="ChatFadeSlider" Width="120" Minimum="0" Maximum="60" TickFrequency="5" IsSnapToTickEnabled="True"
|
||||||
Value="{Binding SelectedElement.ChatFadeSeconds, Mode=TwoWay}"
|
Value="{Binding SelectedElement.ChatFadeSeconds, Mode=TwoWay}"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatFadeSeconds, StringFormat='{}{0}s'}" Foreground="#e0e0e0" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="28"/>
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.ChatFadeSeconds, StringFormat='{}{0}s'}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="28"/>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|
||||||
<!-- Toggles -->
|
<!-- Toggles -->
|
||||||
<CheckBox Content="Show timestamps" Foreground="#a0a0b0" FontSize="11" Margin="0,4,0,2"
|
<CheckBox Content="Show timestamps" Style="{StaticResource YtCheckBox}" Margin="0,4,0,2"
|
||||||
IsChecked="{Binding SelectedElement.ChatShowTimestamps, Mode=TwoWay}"/>
|
IsChecked="{Binding SelectedElement.ChatShowTimestamps, Mode=TwoWay}"/>
|
||||||
<CheckBox Content="Show badges" Foreground="#a0a0b0" FontSize="11" Margin="0,0,0,2"
|
<CheckBox Content="Show badges" Style="{StaticResource YtCheckBox}" Margin="0,0,0,2"
|
||||||
IsChecked="{Binding SelectedElement.ChatShowBadges, Mode=TwoWay}"/>
|
IsChecked="{Binding SelectedElement.ChatShowBadges, Mode=TwoWay}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- Stream Alerts config -->
|
||||||
|
<StackPanel Visibility="{Binding SelectedElement.IsAlertBox, Converter={StaticResource BoolToVis}}" Margin="0,0,0,8">
|
||||||
|
<TextBlock Text="Stream Alerts" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,0,0,6"/>
|
||||||
|
<TextBlock Text="The built-in clip plays on every alert (Super Chat, membership…) unless a custom video is picked."
|
||||||
|
Foreground="#888" FontSize="10" TextWrapping="Wrap" Margin="0,0,0,6"/>
|
||||||
|
|
||||||
|
<DockPanel Margin="0,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Built-in video" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<ToggleButton Style="{StaticResource PillToggle}"
|
||||||
|
IsChecked="{Binding SelectedElement.AlertUseDefaultVideo, Mode=TwoWay}"
|
||||||
|
HorizontalAlignment="Left"/>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<Grid Margin="0,0,0,4"
|
||||||
|
Visibility="{Binding SelectedElement.AlertUseDefaultVideo, Converter={StaticResource InverseBoolToVis}}">
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<TextBox Grid.Column="0" Text="{Binding SelectedElement.AlertVideoPath, Mode=OneWay}"
|
||||||
|
Style="{StaticResource YtTextBoxCompact}"
|
||||||
|
IsReadOnly="True" Foreground="{StaticResource Brush.OnSurfaceVariant}" VerticalAlignment="Center"/>
|
||||||
|
<Button Grid.Column="1" Content="Browse…" Command="{Binding BrowseAlertVideoCommand}"
|
||||||
|
CommandParameter="{Binding SelectedElement}" Style="{StaticResource YtButtonSecondary}"
|
||||||
|
Margin="4,0,0,0" Padding="8,2"/>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Button Content="Reset to built-in" Command="{Binding ResetAlertVideoCommand}"
|
||||||
|
CommandParameter="{Binding SelectedElement}" Style="{StaticResource YtButtonSecondary}"
|
||||||
|
HorizontalAlignment="Left" Padding="8,2" Margin="0,0,4,0"/>
|
||||||
|
<TextBlock Text="Custom clips are referenced from disk — never stored in the layout."
|
||||||
|
Foreground="#888" FontSize="10" TextWrapping="Wrap" Margin="0,4,0,6"/>
|
||||||
|
|
||||||
|
<DockPanel Margin="0,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Message ticker" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<ToggleButton Style="{StaticResource PillToggle}"
|
||||||
|
IsChecked="{Binding SelectedElement.AlertShowTicker, Mode=TwoWay}"
|
||||||
|
HorizontalAlignment="Left"/>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<!-- Announcement display: scroll (marquee), flash (pulse) or
|
||||||
|
solid (still). Inline items, not a bound ItemsSource —
|
||||||
|
same shape as the chat Font selector above. -->
|
||||||
|
<DockPanel Margin="0,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Display" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<ComboBox SelectedValue="{Binding SelectedElement.AlertDisplayMethod, Mode=TwoWay}"
|
||||||
|
SelectedValuePath="Tag"
|
||||||
|
Style="{StaticResource YtComboBox}"
|
||||||
|
Width="140" VerticalAlignment="Center">
|
||||||
|
<ComboBoxItem Content="Scroll" Tag="TickerScroll"/>
|
||||||
|
<ComboBoxItem Content="Flash" Tag="Flash"/>
|
||||||
|
<ComboBoxItem Content="Solid" Tag="Solid"/>
|
||||||
|
</ComboBox>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<DockPanel Margin="0,0,0,4">
|
||||||
|
<TextBlock DockPanel.Dock="Left" Text="Volume" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Width="84"/>
|
||||||
|
<Slider Width="120" Minimum="0" Maximum="1"
|
||||||
|
Value="{Binding SelectedElement.AlertVideoVolume, Mode=TwoWay}"
|
||||||
|
VerticalAlignment="Center"/>
|
||||||
|
<TextBlock DockPanel.Dock="Right" Text="{Binding SelectedElement.AlertVideoVolume, StringFormat={}{0:0%}}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" Margin="6,0,0,0" VerticalAlignment="Center" Width="32"/>
|
||||||
|
</DockPanel>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Background properties -->
|
<!-- Background properties -->
|
||||||
<StackPanel Margin="0,8,0,0"
|
<StackPanel Margin="0,8,0,0"
|
||||||
Visibility="{Binding SelectedElement.IsBackground, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding SelectedElement.IsBackground, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Background" Style="{StaticResource SubHeader}"/>
|
<TextBlock Text="Background" Style="{StaticResource SubHeader}"/>
|
||||||
<StackPanel Margin="4,0,0,0">
|
<StackPanel Margin="4,0,0,0">
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,8">
|
<StackPanel Orientation="Horizontal" Margin="0,0,0,8">
|
||||||
<TextBlock Text="Use default background:" Foreground="#a0a0b0" FontSize="11" VerticalAlignment="Center"/>
|
<TextBlock Text="Use default background:" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center"/>
|
||||||
<ToggleButton Style="{StaticResource PillToggle}"
|
<ToggleButton Style="{StaticResource PillToggle}"
|
||||||
IsChecked="{Binding SelectedElement.UseDefaultBackground, Mode=TwoWay}"
|
IsChecked="{Binding SelectedElement.UseDefaultBackground, Mode=TwoWay}"
|
||||||
Margin="8,0,0,0"/>
|
Margin="8,0,0,0"/>
|
||||||
@@ -418,13 +715,13 @@
|
|||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBox Grid.Column="0" Text="{Binding SelectedElement.CustomBackgroundPath, Mode=OneWay}"
|
<TextBox Grid.Column="0" Text="{Binding SelectedElement.CustomBackgroundPath, Mode=OneWay}"
|
||||||
IsReadOnly="True" Background="#0f3460" Foreground="#a0a0b0"
|
Style="{StaticResource YtTextBoxCompact}"
|
||||||
FontSize="11" VerticalAlignment="Center"/>
|
IsReadOnly="True" Foreground="{StaticResource Brush.OnSurfaceVariant}" VerticalAlignment="Center"/>
|
||||||
<Button Grid.Column="1" Content="Browse…" Command="{Binding BrowseBackgroundCommand}"
|
<Button Grid.Column="1" Content="Browse…" Command="{Binding BrowseBackgroundCommand}"
|
||||||
Style="{StaticResource YtButtonSecondary}" Margin="4,0,0,0" Padding="8,2"/>
|
Style="{StaticResource YtButtonSecondary}" Margin="4,0,0,0" Padding="8,2"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
<TextBlock Text="{Binding BackgroundSizeMismatchText}"
|
<TextBlock Text="{Binding BackgroundSizeMismatchText}"
|
||||||
Foreground="#ef4444" FontSize="11" TextWrapping="Wrap"
|
Foreground="{StaticResource Brush.Error}" FontSize="11" TextWrapping="Wrap"
|
||||||
Margin="0,4,0,0"
|
Margin="0,4,0,0"
|
||||||
Visibility="{Binding BackgroundSizeMismatch, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding BackgroundSizeMismatch, Converter={StaticResource BoolToVis}}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
@@ -445,15 +742,25 @@
|
|||||||
<!-- Inactive overlay (shown when NOT live) -->
|
<!-- Inactive overlay (shown when NOT live) -->
|
||||||
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"
|
<StackPanel Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Visibility="{Binding ShowChatInactiveMessage, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding ShowChatInactiveMessage, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Chat is inactive" Foreground="#a0a0b0" FontSize="13"
|
<TextBlock Text="Chat is inactive" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13"
|
||||||
HorizontalAlignment="Center" Margin="0,0,0,4"/>
|
HorizontalAlignment="Center" Margin="0,0,0,4"/>
|
||||||
<TextBlock Text="Chat becomes active once LlamaCasty is connected and streaming on YouTube."
|
<TextBlock Text="Chat becomes active once LlamaCasty is connected and streaming on YouTube."
|
||||||
Foreground="#666" FontSize="11" TextWrapping="Wrap"
|
Foreground="#666" FontSize="11" TextWrapping="Wrap"
|
||||||
HorizontalAlignment="Center" TextAlignment="Center" MaxWidth="240"/>
|
HorizontalAlignment="Center" TextAlignment="Center" MaxWidth="240"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- Pinned message -->
|
||||||
|
<Border Grid.Row="1" VerticalAlignment="Top" Margin="4,4,4,0" Padding="6,4" CornerRadius="4"
|
||||||
|
Background="{StaticResource Brush.SurfaceContainerHigh}" BorderBrush="{StaticResource Brush.Tertiary}" BorderThickness="1"
|
||||||
|
Visibility="{Binding PinnedChatMessage, Converter={StaticResource NotNullToVis}}">
|
||||||
|
<StackPanel>
|
||||||
|
<TextBlock Text="{Binding PinnedChatMessage.AuthorName}" Foreground="{StaticResource Brush.Tertiary}" FontWeight="SemiBold" FontSize="11"/>
|
||||||
|
<TextBlock Text="{Binding PinnedChatMessage.Message}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11" TextWrapping="Wrap"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
<!-- Message feed (shown when live) -->
|
<!-- Message feed (shown when live) -->
|
||||||
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0"
|
<ListBox Grid.Row="1" Background="Transparent" BorderThickness="0" Margin="0,40,0,0"
|
||||||
ItemsSource="{Binding ChatMessages}"
|
ItemsSource="{Binding ChatMessages}"
|
||||||
ItemContainerStyle="{StaticResource YtListBoxItem}"
|
ItemContainerStyle="{StaticResource YtListBoxItem}"
|
||||||
Visibility="{Binding ShowChatInactiveMessage, Converter={StaticResource InverseBoolToVis}}"
|
Visibility="{Binding ShowChatInactiveMessage, Converter={StaticResource InverseBoolToVis}}"
|
||||||
@@ -465,8 +772,8 @@
|
|||||||
<Setter Property="Background" Value="Transparent"/>
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
<DataTrigger Binding="{Binding IsSuperChat}" Value="True">
|
<DataTrigger Binding="{Binding IsSuperChat}" Value="True">
|
||||||
<Setter Property="Background" Value="#2a1a0a"/>
|
<Setter Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
<Setter Property="BorderBrush" Value="#eab308"/>
|
<Setter Property="BorderBrush" Value="{StaticResource Brush.Secondary}"/>
|
||||||
<Setter Property="BorderThickness" Value="1,0,1,0"/>
|
<Setter Property="BorderThickness" Value="1,0,1,0"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
@@ -477,17 +784,17 @@
|
|||||||
<TextBlock Text="⭐" FontSize="10" Margin="0,0,4,0"
|
<TextBlock Text="⭐" FontSize="10" Margin="0,0,4,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Visibility="{Binding IsMember, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding IsMember, Converter={StaticResource BoolToVis}}"/>
|
||||||
<TextBlock Text="{Binding AuthorName}" Foreground="#e94560"
|
<TextBlock Text="{Binding AuthorName}" Foreground="{StaticResource Brush.Tertiary}"
|
||||||
FontWeight="Bold" FontSize="12" VerticalAlignment="Center"/>
|
FontWeight="Bold" FontSize="12" VerticalAlignment="Center"/>
|
||||||
<TextBlock Text="{Binding SuperChatAmount, StringFormat=${0:F2}}"
|
<TextBlock Text="{Binding SuperChatAmount, StringFormat=${0:F2}}"
|
||||||
Foreground="#eab308" FontWeight="Bold" FontSize="12"
|
Foreground="{StaticResource Brush.Secondary}" FontWeight="Bold" FontSize="12"
|
||||||
Margin="8,0,0,0" VerticalAlignment="Center"
|
Margin="8,0,0,0" VerticalAlignment="Center"
|
||||||
Visibility="{Binding IsSuperChat, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding IsSuperChat, Converter={StaticResource BoolToVis}}"/>
|
||||||
<TextBlock Text="{Binding SuperChatCurrency}" Foreground="#eab308"
|
<TextBlock Text="{Binding SuperChatCurrency}" Foreground="{StaticResource Brush.Secondary}"
|
||||||
FontSize="11" Margin="2,0,0,0" VerticalAlignment="Center"
|
FontSize="11" Margin="2,0,0,0" VerticalAlignment="Center"
|
||||||
Visibility="{Binding IsSuperChat, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding IsSuperChat, Converter={StaticResource BoolToVis}}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBlock Text="{Binding Message}" Foreground="#e0e0e0"
|
<TextBlock Text="{Binding Message}" Foreground="{StaticResource Brush.OnSurface}"
|
||||||
TextWrapping="Wrap" Margin="0,2,0,0"/>
|
TextWrapping="Wrap" Margin="0,2,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ public partial class LeftPanel : UserControl
|
|||||||
private int _dragIndex = -1;
|
private int _dragIndex = -1;
|
||||||
private bool _isDragging;
|
private bool _isDragging;
|
||||||
private object? _lastHoveredItem;
|
private object? _lastHoveredItem;
|
||||||
|
private bool _dragReordered;
|
||||||
|
|
||||||
public LeftPanel()
|
public LeftPanel()
|
||||||
{
|
{
|
||||||
@@ -53,9 +54,12 @@ public partial class LeftPanel : UserControl
|
|||||||
{
|
{
|
||||||
while (child != null && !ReferenceEquals(child, ancestor))
|
while (child != null && !ReferenceEquals(child, ancestor))
|
||||||
{
|
{
|
||||||
child = child is Visual or System.Windows.Media.Media3D.Visual3D
|
var next = child is Visual or System.Windows.Media.Media3D.Visual3D
|
||||||
? VisualTreeHelper.GetParent(child)
|
? VisualTreeHelper.GetParent(child)
|
||||||
: LogicalTreeHelper.GetParent(child);
|
: null;
|
||||||
|
child = next
|
||||||
|
?? LogicalTreeHelper.GetParent(child)
|
||||||
|
?? (child as FrameworkElement)?.TemplatedParent;
|
||||||
}
|
}
|
||||||
return child != null;
|
return child != null;
|
||||||
}
|
}
|
||||||
@@ -93,12 +97,6 @@ public partial class LeftPanel : UserControl
|
|||||||
webcam.IsMirrored = !webcam.IsMirrored;
|
webcam.IsMirrored = !webcam.IsMirrored;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShapeButton_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if ((DataContext as MainViewModel)?.SelectedElement is WebcamSceneConfig webcam)
|
|
||||||
webcam.ToggleClipShape();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SourceMenu_Remove(object sender, RoutedEventArgs e)
|
private void SourceMenu_Remove(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is MenuItem { DataContext: SceneElement element } && DataContext is MainViewModel vm)
|
if (sender is MenuItem { DataContext: SceneElement element } && DataContext is MainViewModel vm)
|
||||||
@@ -115,6 +113,11 @@ public partial class LeftPanel : UserControl
|
|||||||
(DataContext as MainViewModel)?.RefreshBackgroundAutoCapture();
|
(DataContext as MainViewModel)?.RefreshBackgroundAutoCapture();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void BackgroundMenu_RefreshWindowList(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
(DataContext as MainViewModel)?.RefreshWindowsCommand.Execute(null);
|
||||||
|
}
|
||||||
|
|
||||||
private void OpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
|
private void OpacitySlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
|
||||||
=> OpacityValueText.Text = $"{Math.Round(e.NewValue * 100)}%";
|
=> OpacityValueText.Text = $"{Math.Round(e.NewValue * 100)}%";
|
||||||
|
|
||||||
@@ -159,6 +162,7 @@ public partial class LeftPanel : UserControl
|
|||||||
_dragStartPoint = e.GetPosition(listBox);
|
_dragStartPoint = e.GetPosition(listBox);
|
||||||
_isDragging = false;
|
_isDragging = false;
|
||||||
_lastHoveredItem = null;
|
_lastHoveredItem = null;
|
||||||
|
_dragReordered = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void List_PreviewMouseMove(object sender, MouseEventArgs e)
|
private void List_PreviewMouseMove(object sender, MouseEventArgs e)
|
||||||
@@ -196,6 +200,7 @@ public partial class LeftPanel : UserControl
|
|||||||
items.Insert(targetIndex, dragged);
|
items.Insert(targetIndex, dragged);
|
||||||
_dragIndex = targetIndex;
|
_dragIndex = targetIndex;
|
||||||
_lastHoveredItem = targetItem;
|
_lastHoveredItem = targetItem;
|
||||||
|
_dragReordered = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void List_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
private void List_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||||
@@ -207,9 +212,13 @@ public partial class LeftPanel : UserControl
|
|||||||
{
|
{
|
||||||
if (_isDragging)
|
if (_isDragging)
|
||||||
listBox.ReleaseMouseCapture();
|
listBox.ReleaseMouseCapture();
|
||||||
|
var reordered = _dragReordered;
|
||||||
_dragIndex = -1;
|
_dragIndex = -1;
|
||||||
_isDragging = false;
|
_isDragging = false;
|
||||||
_lastHoveredItem = null;
|
_lastHoveredItem = null;
|
||||||
|
_dragReordered = false;
|
||||||
|
if (reordered && DataContext is MainViewModel vm)
|
||||||
|
vm.OnSceneElementsReordered();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ListBoxItem? FindItemContainerAt(ListBox listBox, Point position)
|
private static ListBoxItem? FindItemContainerAt(ListBox listBox, Point position)
|
||||||
@@ -235,36 +244,6 @@ public partial class LeftPanel : UserControl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void WebcamBorderColorPicker_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if ((DataContext as MainViewModel)?.SelectedElement is not SceneElement src) return;
|
|
||||||
if (sender is FrameworkElement fe && fe.ContextMenu == null)
|
|
||||||
{
|
|
||||||
var menu = new System.Windows.Controls.ContextMenu();
|
|
||||||
string[] colors = ["#FFFFFF", "#000000", "#FF0000", "#00FF00", "#0000FF",
|
|
||||||
"#FFFF00", "#FF00FF", "#00FFFF", "#FF8800", "#8800FF",
|
|
||||||
"#e94560", "#22c55e", "#3b82f6", "#f59e0b"];
|
|
||||||
foreach (var c in colors)
|
|
||||||
{
|
|
||||||
var item = new System.Windows.Controls.MenuItem { Header = c, ToolTip = c };
|
|
||||||
var brush = new System.Windows.Media.SolidColorBrush(
|
|
||||||
(System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString(c));
|
|
||||||
item.Icon = new System.Windows.Controls.Border
|
|
||||||
{
|
|
||||||
Width = 16, Height = 16,
|
|
||||||
Background = brush,
|
|
||||||
CornerRadius = new System.Windows.CornerRadius(2)
|
|
||||||
};
|
|
||||||
var color = c;
|
|
||||||
item.Click += (_, _) => src.BorderColor = color;
|
|
||||||
menu.Items.Add(item);
|
|
||||||
}
|
|
||||||
fe.ContextMenu = menu;
|
|
||||||
}
|
|
||||||
if (sender is FrameworkElement fe2)
|
|
||||||
fe2.ContextMenu.IsOpen = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void WebcamBorderRevert_Click(object sender, RoutedEventArgs e)
|
private void WebcamBorderRevert_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (_snapshotElement is Models.Source src)
|
if (_snapshotElement is Models.Source src)
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
<UserControl x:Class="ytLive.Controls.OverlayHost"
|
<UserControl x:Class="ytLive.Controls.OverlayHost"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:Helpers="clr-namespace:ytLive.Helpers">
|
xmlns:Helpers="clr-namespace:ytLive.Helpers"
|
||||||
|
xmlns:Models="clr-namespace:ytLive.Models"
|
||||||
|
xmlns:services="clr-namespace:ytLive.Services">
|
||||||
<Grid Grid.RowSpan="3"
|
<Grid Grid.RowSpan="3"
|
||||||
Visibility="{Binding IsAnyOverlayOpen, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding IsAnyOverlayOpen, Converter={StaticResource BoolToVis}}">
|
||||||
<Button Background="#99000000" BorderThickness="0" Cursor="Hand"
|
<Button Background="{StaticResource Brush.ScrimDarkStrong}" BorderThickness="0" Cursor="Hand"
|
||||||
Command="{Binding CloseOverlayCommand}">
|
Command="{Binding CloseOverlayCommand}">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
@@ -13,7 +15,7 @@
|
|||||||
</Button.Template>
|
</Button.Template>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Border Background="#0A0C1A" CornerRadius="8" Width="650" MaxHeight="700"
|
<Border Background="{StaticResource Brush.Background}" CornerRadius="8" Width="650" MaxHeight="700"
|
||||||
VerticalAlignment="Center" HorizontalAlignment="Center"
|
VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Padding="28" BorderBrush="#333" BorderThickness="1">
|
Padding="28" BorderBrush="#333" BorderThickness="1">
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -25,29 +27,90 @@
|
|||||||
<!-- Header -->
|
<!-- Header -->
|
||||||
<Grid Grid.Row="0">
|
<Grid Grid.Row="0">
|
||||||
<TextBlock Text="{Binding OverlayTitle}" FontSize="18" FontWeight="Bold"
|
<TextBlock Text="{Binding OverlayTitle}" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" VerticalAlignment="Center"/>
|
Foreground="{StaticResource Brush.OnSurface}" VerticalAlignment="Center"/>
|
||||||
<Button HorizontalAlignment="Right" ToolTip="Close" Style="{StaticResource IconButton}"
|
<Button HorizontalAlignment="Right" ToolTip="Close" Style="{StaticResource IconButton}"
|
||||||
Command="{Binding CloseOverlayCommand}">
|
Command="{Binding CloseOverlayCommand}">
|
||||||
<Path Data="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
|
<Path Data="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"
|
||||||
Fill="#d0d0d0" Width="14" Height="14" Stretch="Uniform"/>
|
Fill="{StaticResource Brush.OnSurface}" Width="14" Height="14" Stretch="Uniform"/>
|
||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- App Settings: broadcast fields live in the preview's
|
<!-- App Settings: broadcast fields live in the preview's
|
||||||
Text pull-out now — this panel keeps app-level prefs only.
|
Text pull-out now — this panel keeps app-level prefs only.
|
||||||
(Currently empty; the overlay shell stays for future use.) -->
|
(Currently empty; the overlay shell stays for future use.) -->
|
||||||
<StackPanel Grid.Row="1" Margin="0,16,0,0"
|
<StackPanel Grid.Row="1" Margin="0,8,0,0"
|
||||||
Visibility="{Binding IsSettingsOpen, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding IsSettingsOpen, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Default Location for Recordings" Style="{StaticResource YtLabel}" Margin="0,0,0,4"/>
|
|
||||||
<TextBox Style="{StaticResource YtTextBox}"
|
<TextBlock Text="Recordings" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
Text="{Binding RecordFolderDisplay, Mode=OneWay}"
|
<TextBlock Text="Default location" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="10,0,0,2"/>
|
||||||
IsReadOnly="True" Margin="0,0,0,12" Foreground="#a0a0b0"/>
|
<DockPanel Margin="10,0,0,8">
|
||||||
<StackPanel Orientation="Horizontal">
|
<Button DockPanel.Dock="Right" Content="Browse…" Command="{Binding ChooseRecordFolderCommand}"
|
||||||
<Button Content="Browse…" Command="{Binding ChooseRecordFolderCommand}"
|
Style="{StaticResource YtButtonSecondary}" Padding="8,2" FontSize="11" Margin="6,0,0,0"/>
|
||||||
Style="{StaticResource YtButtonSecondary}" Margin="0,0,8,0"/>
|
<Button DockPanel.Dock="Right" Content="Use Downloads" Command="{Binding ResetRecordFolderCommand}"
|
||||||
<Button Content="Use Downloads" Command="{Binding ResetRecordFolderCommand}"
|
Style="{StaticResource YtButtonSecondary}" Padding="8,2" FontSize="11" Margin="6,0,0,0"/>
|
||||||
Style="{StaticResource YtButtonSecondary}"/>
|
<TextBox Style="{StaticResource YtTextBoxCompact}" Text="{Binding RecordFolderDisplay, Mode=OneWay}"
|
||||||
|
IsReadOnly="True" Foreground="{StaticResource Brush.OnSurfaceVariant}" VerticalAlignment="Center"/>
|
||||||
|
</DockPanel>
|
||||||
|
|
||||||
|
<TextBlock Text="Brand logo" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
|
<TextBlock Text="Image file (shown on every scene)" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="10,0,0,2"/>
|
||||||
|
<DockPanel Margin="10,0,0,8">
|
||||||
|
<Button DockPanel.Dock="Right" Content="Browse…" Command="{Binding BrowseBrandLogoCommand}"
|
||||||
|
Style="{StaticResource YtButtonSecondary}" Padding="8,2" FontSize="11" Margin="6,0,0,0"/>
|
||||||
|
<!-- A file NAME says nothing about the picture. The thumbnail shows what
|
||||||
|
is set; hovering enlarges it, a click collapses it again. -->
|
||||||
|
<Border x:Name="BrandLogoThumbFrame" DockPanel.Dock="Left" Width="28" Height="28"
|
||||||
|
Margin="0,0,6,0" CornerRadius="4" ClipToBounds="True"
|
||||||
|
Background="{StaticResource Brush.SurfaceContainerLowest}"
|
||||||
|
BorderBrush="{StaticResource Brush.Outline}" BorderThickness="1"
|
||||||
|
Cursor="Hand" ToolTip="Hover to enlarge — click to close"
|
||||||
|
Visibility="{Binding BrandLogoPreviewImage, Converter={StaticResource NotNullToVis}}">
|
||||||
|
<Image x:Name="BrandLogoThumbImage" Source="{Binding BrandLogoPreviewImage}"
|
||||||
|
Stretch="Uniform" MouseEnter="BrandLogoThumb_MouseEnter"
|
||||||
|
MouseLeave="BrandLogoThumb_MouseLeave"
|
||||||
|
MouseLeftButtonUp="BrandLogoThumb_Click"/>
|
||||||
|
</Border>
|
||||||
|
<TextBox Style="{StaticResource YtTextBoxCompact}" Text="{Binding BrandLogoFileDisplay, Mode=OneWay}"
|
||||||
|
IsReadOnly="True" Foreground="{StaticResource Brush.OnSurfaceVariant}" VerticalAlignment="Center"/>
|
||||||
|
</DockPanel>
|
||||||
|
<Popup x:Name="BrandLogoPreviewPopup" PlacementTarget="{Binding ElementName=BrandLogoThumbFrame}"
|
||||||
|
Placement="Right" HorizontalOffset="6" StaysOpen="True" AllowsTransparency="True"
|
||||||
|
IsHitTestVisible="True" MouseLeave="BrandLogoPreviewPopup_MouseLeave">
|
||||||
|
<Border Padding="6" CornerRadius="6"
|
||||||
|
Background="{StaticResource Brush.SurfaceContainerHighest}"
|
||||||
|
BorderBrush="{StaticResource Brush.Outline}" BorderThickness="1">
|
||||||
|
<StackPanel>
|
||||||
|
<Image Source="{Binding BrandLogoPreviewImage}" MaxWidth="420" MaxHeight="320"
|
||||||
|
Stretch="Uniform" RenderOptions.BitmapScalingMode="HighQuality"/>
|
||||||
|
<TextBlock Text="{Binding BrandLogoFileDisplay}" FontSize="11" Margin="0,6,0,0"
|
||||||
|
Foreground="{StaticResource Brush.OnSurfaceVariant}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</Popup>
|
||||||
|
|
||||||
|
<TextBlock Text="Preview" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
|
<TextBlock Text="Zoom view shape" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="10,0,0,2"/>
|
||||||
|
<ComboBox Style="{StaticResource YtComboBox}" Margin="10,0,0,8" SelectedValue="{Binding ZoomShape}" SelectedValuePath="Tag">
|
||||||
|
<ComboBoxItem Content="Circle" Tag="{x:Static Models:ZoomShape.Circle}"/>
|
||||||
|
<ComboBoxItem Content="Phone (Vertical Rectangle)" Tag="{x:Static Models:ZoomShape.VerticalRectangle}"/>
|
||||||
|
<ComboBoxItem Content="Tablet (Horizontal Rectangle)" Tag="{x:Static Models:ZoomShape.HorizontalRectangle}"/>
|
||||||
|
</ComboBox>
|
||||||
|
|
||||||
|
<TextBlock Text="Scene transition" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" FontWeight="SemiBold" Margin="0,8,0,2"/>
|
||||||
|
<TextBlock Text="Type" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" Margin="10,0,0,2"/>
|
||||||
|
<ComboBox Style="{StaticResource YtComboBox}" Margin="10,0,0,8" SelectedValue="{Binding SelectedTransitionType}" SelectedValuePath="Tag">
|
||||||
|
<ComboBoxItem Content="Cut" Tag="{x:Static services:TransitionType.Cut}"/>
|
||||||
|
<ComboBoxItem Content="Fade" Tag="{x:Static services:TransitionType.Fade}"/>
|
||||||
|
<ComboBoxItem Content="Move" Tag="{x:Static services:TransitionType.Move}"/>
|
||||||
|
<ComboBoxItem Content="Wipe" Tag="{x:Static services:TransitionType.Wipe}"/>
|
||||||
|
</ComboBox>
|
||||||
|
<DockPanel Margin="10,0,0,6">
|
||||||
|
<TextBlock DockPanel.Dock="Right" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="11" VerticalAlignment="Center" Margin="8,0,0,0" Width="56">
|
||||||
|
<Run Text="{Binding TransitionDurationMs, StringFormat={}{0:0}}"/><Run Text=" ms"/>
|
||||||
|
</TextBlock>
|
||||||
|
<Slider Minimum="100" Maximum="2000" TickFrequency="50" IsSnapToTickEnabled="True"
|
||||||
|
Value="{Binding TransitionDurationMs, Mode=TwoWay}" VerticalAlignment="Center"/>
|
||||||
|
</DockPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Report Bug -->
|
<!-- Report Bug -->
|
||||||
@@ -88,22 +151,22 @@
|
|||||||
|
|
||||||
<!-- About -->
|
<!-- About -->
|
||||||
<Grid Grid.Row="1" Margin="0,16,0,0"
|
<Grid Grid.Row="1" Margin="0,16,0,0"
|
||||||
Background="#171928"
|
Background="{StaticResource Brush.SurfaceContainerLow}"
|
||||||
Visibility="{Binding IsAboutOpen, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding IsAboutOpen, Converter={StaticResource BoolToVis}}">
|
||||||
|
|
||||||
<!-- Hub view -->
|
<!-- Hub view -->
|
||||||
<StackPanel Visibility="{Binding IsHubVisible, Converter={StaticResource BoolToVis}}">
|
<StackPanel Visibility="{Binding IsHubVisible, Converter={StaticResource BoolToVis}}">
|
||||||
<Image Source="/ytLive;component/Assets/llamacasty-logo.jpg" Height="125" Stretch="Uniform"
|
<Image Source="/ytLive;component/Assets/llamacasty-logo.jpg" Height="125" Stretch="Uniform"
|
||||||
HorizontalAlignment="Center" Margin="0,0,0,12"/>
|
HorizontalAlignment="Center" Margin="0,0,0,12"/>
|
||||||
<TextBlock Text="{Binding AppVersionLabel}" Foreground="#a0a0b0" FontSize="12"
|
<TextBlock Text="{Binding AppVersionLabel}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12"
|
||||||
HorizontalAlignment="Center" Margin="0,4,0,0"/>
|
HorizontalAlignment="Center" Margin="0,4,0,0"/>
|
||||||
<TextBlock Text="Live streaming for YouTube — simple enough that even the most right-brained person can intuit it."
|
<TextBlock Text="Live streaming for YouTube — simple enough that even the most right-brained person can intuit it."
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" MaxWidth="380"
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" MaxWidth="380"
|
||||||
TextAlignment="Center" Margin="0,16,0,0"/>
|
TextAlignment="Center" Margin="0,16,0,0"/>
|
||||||
<TextBlock Text="Free forever — live streams carry a brief "made with LlamaCasty!" flash. A subscription removes it and adds alerts."
|
<TextBlock Text="Free forever — live streams carry a brief "made with LlamaCasty!" flash. A subscription removes it and adds alerts."
|
||||||
Foreground="#888" FontSize="12" TextWrapping="Wrap" MaxWidth="380"
|
Foreground="#888" FontSize="12" TextWrapping="Wrap" MaxWidth="380"
|
||||||
TextAlignment="Center" Margin="0,12,0,0"/>
|
TextAlignment="Center" Margin="0,12,0,0"/>
|
||||||
<TextBlock Text="Made by gramps · llama chile shop" Foreground="#a0a0b0" FontSize="12"
|
<TextBlock Text="Made by gramps · llama chile shop" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12"
|
||||||
HorizontalAlignment="Center" Margin="0,16,0,8"/>
|
HorizontalAlignment="Center" Margin="0,16,0,8"/>
|
||||||
|
|
||||||
<!-- Creator hub links -->
|
<!-- Creator hub links -->
|
||||||
@@ -133,11 +196,11 @@
|
|||||||
<!-- Licensing/legal panel -->
|
<!-- Licensing/legal panel -->
|
||||||
<StackPanel Visibility="{Binding IsLicensesOpen, Converter={StaticResource BoolToVis}}">
|
<StackPanel Visibility="{Binding IsLicensesOpen, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Third-party notices & license texts" FontSize="15" FontWeight="Bold"
|
<TextBlock Text="Third-party notices & license texts" FontSize="15" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,8"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,8"/>
|
||||||
<Border Background="#10101e" CornerRadius="4" Padding="10" MaxHeight="360"
|
<Border Background="{StaticResource Brush.SurfaceContainerLowest}" CornerRadius="4" Padding="10" MaxHeight="360"
|
||||||
BorderBrush="#333" BorderThickness="1">
|
BorderBrush="#333" BorderThickness="1">
|
||||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||||
<TextBlock Text="{Binding LicensesText}" Foreground="#b8b8c8" FontSize="11"
|
<TextBlock Text="{Binding LicensesText}" Foreground="{StaticResource Brush.OnSurface}" FontSize="11"
|
||||||
FontFamily="Consolas" TextWrapping="Wrap"/>
|
FontFamily="Consolas" TextWrapping="Wrap"/>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -149,9 +212,9 @@
|
|||||||
<!-- License key entry panel -->
|
<!-- License key entry panel -->
|
||||||
<StackPanel Visibility="{Binding IsLicenseEntryOpen, Converter={StaticResource BoolToVis}}">
|
<StackPanel Visibility="{Binding IsLicenseEntryOpen, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Activate LlamaCasty Premium" FontSize="15" FontWeight="Bold"
|
<TextBlock Text="Activate LlamaCasty Premium" FontSize="15" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,8"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,8"/>
|
||||||
<TextBlock Text="Enter your license key to remove the branding watermark."
|
<TextBlock Text="Enter your license key to remove the branding watermark."
|
||||||
Foreground="#a0a0b0" FontSize="12" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
||||||
<TextBlock Text="License Key" Style="{StaticResource YtLabel}" Margin="0,0,0,4"/>
|
<TextBlock Text="License Key" Style="{StaticResource YtLabel}" Margin="0,0,0,4"/>
|
||||||
<TextBox Style="{StaticResource YtTextBox}" Margin="0,0,0,12"
|
<TextBox Style="{StaticResource YtTextBox}" Margin="0,0,0,12"
|
||||||
Text="{Binding LicenseKey, UpdateSourceTrigger=PropertyChanged}"
|
Text="{Binding LicenseKey, UpdateSourceTrigger=PropertyChanged}"
|
||||||
@@ -159,7 +222,7 @@
|
|||||||
<Button Content="Activate" Command="{Binding ActivateLicenseCommand}"
|
<Button Content="Activate" Command="{Binding ActivateLicenseCommand}"
|
||||||
Style="{StaticResource YtButton}" HorizontalAlignment="Right"
|
Style="{StaticResource YtButton}" HorizontalAlignment="Right"
|
||||||
Margin="0,0,0,8"/>
|
Margin="0,0,0,8"/>
|
||||||
<TextBlock Text="{Binding LicenseMessage}" Foreground="#a0a0b0" FontSize="12"
|
<TextBlock Text="{Binding LicenseMessage}" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12"
|
||||||
TextWrapping="Wrap" Margin="0,0,0,8"/>
|
TextWrapping="Wrap" Margin="0,0,0,8"/>
|
||||||
<Button Content="← Back to About" Style="{StaticResource YtButtonSecondary}"
|
<Button Content="← Back to About" Style="{StaticResource YtButtonSecondary}"
|
||||||
HorizontalAlignment="Left" Margin="0,8,0,0"
|
HorizontalAlignment="Left" Margin="0,8,0,0"
|
||||||
|
|||||||
@@ -11,6 +11,36 @@ public partial class OverlayHost : UserControl
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Is the enlarged brand-logo preview showing? Test seam — a Popup is a separate
|
||||||
|
/// window, so nothing else can observe it.</summary>
|
||||||
|
internal bool IsBrandLogoPreviewOpen => BrandLogoPreviewPopup.IsOpen;
|
||||||
|
|
||||||
|
/// <summary>Hover opens the enlargement. Nothing to show when no image is set, so the
|
||||||
|
/// thumbnail simply does nothing in that case.</summary>
|
||||||
|
private void BrandLogoThumb_MouseEnter(object sender, System.Windows.Input.MouseEventArgs e)
|
||||||
|
=> OpenBrandLogoPreview();
|
||||||
|
|
||||||
|
/// <summary>Leaving the thumbnail closes it — unless the pointer walked onto the popup
|
||||||
|
/// itself (which sits beside it), where it stays put so the creator can look closely.</summary>
|
||||||
|
private void BrandLogoThumb_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
|
||||||
|
{
|
||||||
|
if (BrandLogoPreviewPopup.Child?.IsMouseOver == true) return;
|
||||||
|
CloseBrandLogoPreview();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>A click collapses the enlargement — the explicit "enough, thanks" gesture.</summary>
|
||||||
|
private void BrandLogoThumb_Click(object sender, System.Windows.Input.MouseButtonEventArgs e)
|
||||||
|
=> CloseBrandLogoPreview();
|
||||||
|
|
||||||
|
private void BrandLogoPreviewPopup_MouseLeave(object sender, System.Windows.Input.MouseEventArgs e)
|
||||||
|
=> CloseBrandLogoPreview();
|
||||||
|
|
||||||
|
/// <summary>The thumbnail is hidden when no image is set (see the XAML), so there is nothing
|
||||||
|
/// to open in that case — no empty frame can appear.</summary>
|
||||||
|
internal void OpenBrandLogoPreview() => BrandLogoPreviewPopup.IsOpen = true;
|
||||||
|
|
||||||
|
internal void CloseBrandLogoPreview() => BrandLogoPreviewPopup.IsOpen = false;
|
||||||
|
|
||||||
private void BackToAbout_Click(object sender, RoutedEventArgs e)
|
private void BackToAbout_Click(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (DataContext is MainViewModel vm)
|
if (DataContext is MainViewModel vm)
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ public partial class PreviewPane : UserControl
|
|||||||
{
|
{
|
||||||
private bool _isDraggingOverlay;
|
private bool _isDraggingOverlay;
|
||||||
private bool _isResizing;
|
private bool _isResizing;
|
||||||
|
private bool _isZoomDragging;
|
||||||
private Point _grabOffset;
|
private Point _grabOffset;
|
||||||
private double _resizeAspect;
|
private double _resizeAspect;
|
||||||
|
|
||||||
@@ -29,8 +30,93 @@ public partial class PreviewPane : UserControl
|
|||||||
public PreviewPane()
|
public PreviewPane()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
DataContextChanged += PreviewPane_DataContextChanged;
|
||||||
|
OverlayElements.ItemContainerGenerator.StatusChanged += (_, _) => UpdateSelectedLayerZOrder();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void PreviewPane_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.OldValue is MainViewModel oldVm)
|
||||||
|
{
|
||||||
|
oldVm.PropertyChanged -= ViewModel_PropertyChanged;
|
||||||
|
oldVm.PreviewTransition -= PlayPreviewTransition;
|
||||||
|
}
|
||||||
|
if (e.NewValue is MainViewModel newVm)
|
||||||
|
{
|
||||||
|
newVm.PropertyChanged += ViewModel_PropertyChanged;
|
||||||
|
newVm.PreviewTransition += PlayPreviewTransition;
|
||||||
|
UpdateZoomBox();
|
||||||
|
UpdateSelectedLayerZOrder();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Animates the outgoing picture away over the new scene: a fade for Fade and Move,
|
||||||
|
/// a right-to-left shrink for Wipe. Cut plays nothing.</summary>
|
||||||
|
private void PlayPreviewTransition(ytLive.Services.TransitionType type, double milliseconds)
|
||||||
|
{
|
||||||
|
TransitionOverlay.BeginAnimation(System.Windows.UIElement.OpacityProperty, null);
|
||||||
|
TransitionOverlay.Clip = null;
|
||||||
|
if (type == ytLive.Services.TransitionType.Cut || milliseconds <= 0)
|
||||||
|
{
|
||||||
|
TransitionOverlay.Visibility = Visibility.Collapsed;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var snapshot = new System.Windows.Media.Imaging.RenderTargetBitmap(1920, 1080, 96, 96,
|
||||||
|
System.Windows.Media.PixelFormats.Pbgra32);
|
||||||
|
snapshot.Render(PreviewCanvas);
|
||||||
|
TransitionOverlay.Source = snapshot;
|
||||||
|
TransitionOverlay.Opacity = 1;
|
||||||
|
TransitionOverlay.Visibility = Visibility.Visible;
|
||||||
|
var duration = TimeSpan.FromMilliseconds(milliseconds);
|
||||||
|
|
||||||
|
if (type == ytLive.Services.TransitionType.Wipe)
|
||||||
|
{
|
||||||
|
var clip = new System.Windows.Media.RectangleGeometry(new Rect(0, 0, 1920, 1080));
|
||||||
|
TransitionOverlay.Clip = clip;
|
||||||
|
var reveal = new System.Windows.Media.Animation.RectAnimation(new Rect(0, 0, 0, 1080), duration)
|
||||||
|
{
|
||||||
|
FillBehavior = System.Windows.Media.Animation.FillBehavior.Stop,
|
||||||
|
};
|
||||||
|
reveal.Completed += (_, _) => TransitionOverlay.Visibility = Visibility.Collapsed;
|
||||||
|
clip.BeginAnimation(System.Windows.Media.RectangleGeometry.RectProperty, reveal);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var fade = new System.Windows.Media.Animation.DoubleAnimation(1, 0, duration)
|
||||||
|
{
|
||||||
|
FillBehavior = System.Windows.Media.Animation.FillBehavior.Stop,
|
||||||
|
};
|
||||||
|
fade.Completed += (_, _) => TransitionOverlay.Visibility = Visibility.Collapsed;
|
||||||
|
TransitionOverlay.BeginAnimation(System.Windows.UIElement.OpacityProperty, fade);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.PropertyName == nameof(MainViewModel.SelectedElement))
|
||||||
|
UpdateSelectedLayerZOrder();
|
||||||
|
if (e.PropertyName == nameof(MainViewModel.IsZoomActive) || e.PropertyName == nameof(MainViewModel.ZoomState) || e.PropertyName == nameof(MainViewModel.ZoomShape))
|
||||||
|
{
|
||||||
|
UpdateZoomBox();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateSelectedLayerZOrder()
|
||||||
|
{
|
||||||
|
var selected = (DataContext as MainViewModel)?.SelectedElement;
|
||||||
|
if (selected != null && !IsDraggableElement(selected))
|
||||||
|
selected = null;
|
||||||
|
|
||||||
|
for (var i = 0; i < OverlayElements.Items.Count; i++)
|
||||||
|
{
|
||||||
|
if (OverlayElements.ItemContainerGenerator.ContainerFromIndex(i) is UIElement container)
|
||||||
|
Panel.SetZIndex(container, ReferenceEquals(OverlayElements.Items[i], selected) ? 1 : 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Static images and the webcam share the move/resize/selection behavior.
|
// Static images and the webcam share the move/resize/selection behavior.
|
||||||
public static bool IsDraggableElement(SceneElement element)
|
public static bool IsDraggableElement(SceneElement element)
|
||||||
=> element.IsDraggable;
|
=> element.IsDraggable;
|
||||||
@@ -279,6 +365,34 @@ public partial class PreviewPane : UserControl
|
|||||||
sb.Children.Add(anim);
|
sb.Children.Add(anim);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>The border-colour submenu is BUILT from the palette on open: the list of
|
||||||
|
/// offered colours lives once, in <see cref="BorderColorPalette"/> (TASK 63's rule —
|
||||||
|
/// a picker never carries its own copy). The generated rows inherit this menu's
|
||||||
|
/// DataContext (the <see cref="SceneElement"/>), so the click handler is unchanged.</summary>
|
||||||
|
private void WebcamBorderColorMenu_SubmenuOpened(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is not MenuItem { DataContext: SceneElement element } menu) return;
|
||||||
|
|
||||||
|
menu.Items.Clear();
|
||||||
|
var none = new MenuItem { Header = "None", Tag = string.Empty, IsCheckable = true,
|
||||||
|
IsChecked = string.IsNullOrEmpty(element.BorderColor) };
|
||||||
|
none.Click += WebcamMenu_SetBorderColor;
|
||||||
|
menu.Items.Add(none);
|
||||||
|
|
||||||
|
foreach (var colour in BorderColorPalette.All)
|
||||||
|
{
|
||||||
|
var row = new MenuItem
|
||||||
|
{
|
||||||
|
Header = colour.ToString(),
|
||||||
|
Tag = colour.Hex,
|
||||||
|
IsCheckable = true,
|
||||||
|
IsChecked = string.Equals(element.BorderColor, colour.Hex, StringComparison.OrdinalIgnoreCase),
|
||||||
|
};
|
||||||
|
row.Click += WebcamMenu_SetBorderColor;
|
||||||
|
menu.Items.Add(row);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void WebcamMenu_SetBorderColor(object sender, RoutedEventArgs e)
|
private void WebcamMenu_SetBorderColor(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (sender is MenuItem { DataContext: SceneElement element, Tag: string color })
|
if (sender is MenuItem { DataContext: SceneElement element, Tag: string color })
|
||||||
@@ -370,7 +484,7 @@ public partial class PreviewPane : UserControl
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var hit = HitElement(vm, p);
|
var hit = HitElementAt(vm, p);
|
||||||
if (hit != null)
|
if (hit != null)
|
||||||
{
|
{
|
||||||
vm.SelectedElement = hit;
|
vm.SelectedElement = hit;
|
||||||
@@ -387,12 +501,29 @@ public partial class PreviewPane : UserControl
|
|||||||
private void Preview_MouseMove(object sender, MouseEventArgs e)
|
private void Preview_MouseMove(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
var vm = DataContext as MainViewModel;
|
var vm = DataContext as MainViewModel;
|
||||||
if (vm is null || !vm.IsEditMode) return;
|
if (vm is null) return;
|
||||||
if (!_isDraggingOverlay && !_isResizing) return;
|
|
||||||
|
|
||||||
var grid = (Grid)sender;
|
var grid = (Grid)sender;
|
||||||
var toCanvas = CanvasGrid.TransformToVisual(grid).Inverse;
|
var toCanvas = CanvasGrid.TransformToVisual(grid).Inverse;
|
||||||
var p = toCanvas.Transform(e.GetPosition(grid));
|
var p = toCanvas.Transform(e.GetPosition(grid));
|
||||||
|
|
||||||
|
if (e.LeftButton == MouseButtonState.Pressed && vm.IsZoomActive)
|
||||||
|
{
|
||||||
|
if (!_isZoomDragging)
|
||||||
|
{
|
||||||
|
vm.StartZoomMove(p.X, p.Y);
|
||||||
|
_isZoomDragging = true;
|
||||||
|
grid.CaptureMouse();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
vm.UpdateZoomMove(p.X, p.Y);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!vm.IsEditMode) return;
|
||||||
|
if (!_isDraggingOverlay && !_isResizing) return;
|
||||||
|
|
||||||
var selected = vm.SelectedElement;
|
var selected = vm.SelectedElement;
|
||||||
if (selected == null)
|
if (selected == null)
|
||||||
{
|
{
|
||||||
@@ -401,6 +532,15 @@ public partial class PreviewPane : UserControl
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (_isDraggingOverlay)
|
if (_isDraggingOverlay)
|
||||||
|
{
|
||||||
|
// TASK 57: under the vertical tier the camera snaps into the
|
||||||
|
// cropped band (one of six spots) instead of free-floating over
|
||||||
|
// the master — outside the band it is not in the stream at all.
|
||||||
|
if (vm.IsVerticalTier && selected is WebcamSceneConfig verticalCam)
|
||||||
|
{
|
||||||
|
vm.MoveWebcamInVerticalTier(verticalCam, p.X - _grabOffset.X, p.Y - _grabOffset.Y);
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
var minX = -(selected.Width - 20);
|
var minX = -(selected.Width - 20);
|
||||||
var maxX = 1920 - 20;
|
var maxX = 1920 - 20;
|
||||||
@@ -409,6 +549,7 @@ public partial class PreviewPane : UserControl
|
|||||||
selected.X = Math.Clamp(p.X - _grabOffset.X, Math.Min(minX, maxX), Math.Max(minX, maxX));
|
selected.X = Math.Clamp(p.X - _grabOffset.X, Math.Min(minX, maxX), Math.Max(minX, maxX));
|
||||||
selected.Y = Math.Clamp(p.Y - _grabOffset.Y, Math.Min(minY, maxY), Math.Max(minY, maxY));
|
selected.Y = Math.Clamp(p.Y - _grabOffset.Y, Math.Min(minY, maxY), Math.Max(minY, maxY));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else if (_isResizing)
|
else if (_isResizing)
|
||||||
{
|
{
|
||||||
var isWebcam = selected is WebcamSceneConfig;
|
var isWebcam = selected is WebcamSceneConfig;
|
||||||
@@ -425,18 +566,76 @@ public partial class PreviewPane : UserControl
|
|||||||
}
|
}
|
||||||
selected.Width = newW;
|
selected.Width = newW;
|
||||||
selected.Height = newH;
|
selected.Height = newH;
|
||||||
|
|
||||||
|
// TASK 57: inside the vertical band the size snaps (the Chat
|
||||||
|
// camera has two sizes: the small tile or one whole area) and the
|
||||||
|
// camera ends up on its spot.
|
||||||
|
if (vm.IsVerticalTier && selected is WebcamSceneConfig verticalCam)
|
||||||
|
vm.ResizeWebcamInVerticalTier(verticalCam, newW, newH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Preview_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
private void Preview_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||||
=> EndPreviewDrag((Grid)sender);
|
{
|
||||||
|
if (_isZoomDragging && DataContext is MainViewModel vm)
|
||||||
|
{
|
||||||
|
vm.EndZoomMove();
|
||||||
|
_isZoomDragging = false;
|
||||||
|
((Grid)sender).ReleaseMouseCapture();
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
EndPreviewDrag((Grid)sender);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Preview_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
// Ctrl + right-click opens the element / backdrop context menu — sources and windows can
|
||||||
|
// be changed at ANY time, live or not (creator ruling 2026-10-30). Plain right-click stays
|
||||||
|
// with the zoom box, which is why the menu needed its own chord.
|
||||||
|
// Returning without Handled lets WPF's ContextMenuService open the menu under the cursor.
|
||||||
|
if ((Keyboard.Modifiers & ModifierKeys.Control) != 0) return;
|
||||||
|
|
||||||
|
var vm = DataContext as MainViewModel;
|
||||||
|
if (vm == null) return;
|
||||||
|
var grid = (Grid)sender;
|
||||||
|
var toCanvas = CanvasGrid.TransformToVisual(grid).Inverse;
|
||||||
|
var p = toCanvas.Transform(e.GetPosition(grid));
|
||||||
|
if ((vm.IsLive || vm.IsRecording) && !vm.IsEditMode)
|
||||||
|
{
|
||||||
|
if (vm.IsZoomActive)
|
||||||
|
{
|
||||||
|
vm.DismissZoom();
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
vm.ActivateZoom(p.X, p.Y);
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
vm.ToggleZoom();
|
||||||
|
e.Handled = true;
|
||||||
|
} private void Preview_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
if (_isZoomDragging)
|
||||||
|
{
|
||||||
|
var grid = (Grid)sender;
|
||||||
|
grid.ReleaseMouseCapture();
|
||||||
|
_isZoomDragging = false;
|
||||||
|
if (DataContext is MainViewModel vm) vm.EndZoomMove();
|
||||||
|
e.Handled = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void EndPreviewDrag(Grid grid)
|
private void EndPreviewDrag(Grid grid)
|
||||||
{
|
{
|
||||||
if (_isDraggingOverlay || _isResizing)
|
if (_isDraggingOverlay || _isResizing || _isZoomDragging)
|
||||||
grid.ReleaseMouseCapture();
|
grid.ReleaseMouseCapture();
|
||||||
_isDraggingOverlay = false;
|
_isDraggingOverlay = false;
|
||||||
_isResizing = false;
|
_isResizing = false;
|
||||||
|
_isZoomDragging = false;
|
||||||
|
if (DataContext is MainViewModel vm) vm.EndZoomMove();
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HitHandle(Point mouseScreen, SceneElement element)
|
private bool HitHandle(Point mouseScreen, SceneElement element)
|
||||||
@@ -445,20 +644,67 @@ public partial class PreviewPane : UserControl
|
|||||||
return Math.Abs(mouseScreen.X - corner.X) <= 20 && Math.Abs(mouseScreen.Y - corner.Y) <= 20;
|
return Math.Abs(mouseScreen.X - corner.X) <= 20 && Math.Abs(mouseScreen.Y - corner.Y) <= 20;
|
||||||
}
|
}
|
||||||
|
|
||||||
private SceneElement? HitElement(MainViewModel vm, Point p)
|
internal SceneElement? HitElementAt(MainViewModel vm, Point p)
|
||||||
{
|
{
|
||||||
var scene = vm.StagedScene;
|
var scene = vm.StagedScene;
|
||||||
if (scene == null) return null;
|
if (scene == null) return null;
|
||||||
|
|
||||||
|
// A layer selected from the list temporarily wins both preview stacking and hit-testing;
|
||||||
|
// the scene's persistent element order remains unchanged.
|
||||||
|
if (vm.SelectedElement is { } selected && IsHitTestable(selected) && Contains(selected, p))
|
||||||
|
return selected;
|
||||||
|
|
||||||
for (var i = scene.Elements.Count - 1; i >= 0; i--)
|
for (var i = scene.Elements.Count - 1; i >= 0; i--)
|
||||||
{
|
{
|
||||||
var element = scene.Elements[i];
|
var element = scene.Elements[i];
|
||||||
if (!IsDraggableElement(element)) continue;
|
if (IsHitTestable(element) && Contains(element, p))
|
||||||
if (element is Source { IsEnabled: false }) continue;
|
|
||||||
if (element is WebcamSceneConfig { IsVisible: false }) continue;
|
|
||||||
if (p.X >= element.X && p.X <= element.X + element.Width &&
|
|
||||||
p.Y >= element.Y && p.Y <= element.Y + element.Height)
|
|
||||||
return element;
|
return element;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool IsHitTestable(SceneElement element)
|
||||||
|
=> IsDraggableElement(element)
|
||||||
|
&& element is not Source { IsEnabled: false }
|
||||||
|
&& element is not WebcamSceneConfig { IsVisible: false };
|
||||||
|
|
||||||
|
private static bool Contains(SceneElement element, Point point)
|
||||||
|
=> point.X >= element.X && point.X <= element.X + element.Width
|
||||||
|
&& point.Y >= element.Y && point.Y <= element.Y + element.Height;
|
||||||
|
|
||||||
|
private void UpdateZoomBox()
|
||||||
|
{
|
||||||
|
if (DataContext is not MainViewModel vm) return;
|
||||||
|
if (vm.IsZoomActive && ZoomVisualBrush != null)
|
||||||
|
{
|
||||||
|
// The preview mirrors the output zoom layer: sample the WHOLE composed
|
||||||
|
// preview (CanvasGrid = backdrop + every element layer — the same all-layer
|
||||||
|
// source the output compositor magnifies) at the FIXED capture window (the
|
||||||
|
// box/2 region centred on the click) → 2x via Stretch=Fill. Moving the box
|
||||||
|
// only moves the ZoomBox element; the Viewbox stays glued to the capture.
|
||||||
|
ZoomVisualBrush.Visual = CanvasGrid;
|
||||||
|
ZoomVisualBrush.Viewbox = new Rect(
|
||||||
|
vm.ZoomState.CaptureX,
|
||||||
|
vm.ZoomState.CaptureY,
|
||||||
|
vm.ZoomState.Width / 2,
|
||||||
|
vm.ZoomState.Height / 2);
|
||||||
|
ZoomVisualBrush.ViewboxUnits = BrushMappingMode.Absolute;
|
||||||
|
if (vm.ZoomShape == Models.ZoomShape.Circle)
|
||||||
|
{
|
||||||
|
ZoomCircleOutline.Visibility = Visibility.Visible;
|
||||||
|
ZoomRectOutline.Visibility = Visibility.Collapsed;
|
||||||
|
ZoomBox.Clip = new EllipseGeometry(new Rect(0, 0, vm.ZoomState.Width, vm.ZoomState.Height));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ZoomCircleOutline.Visibility = Visibility.Collapsed;
|
||||||
|
ZoomRectOutline.Visibility = Visibility.Visible;
|
||||||
|
ZoomBox.Clip = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (!vm.IsZoomActive && ZoomVisualBrush != null && ReferenceEquals(ZoomVisualBrush.Visual, CanvasGrid))
|
||||||
|
{
|
||||||
|
ZoomVisualBrush.Visual = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,50 +1,83 @@
|
|||||||
<UserControl x:Class="ytLive.Controls.SceneThumbnailStrip"
|
<UserControl x:Class="ytLive.Controls.SceneThumbnailStrip"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
<Border Background="#0d1117" CornerRadius="4" Margin="0,0,0,4" Padding="4">
|
<Border Background="{StaticResource Brush.SurfaceContainerLowest}" CornerRadius="4" Padding="4">
|
||||||
<ItemsControl ItemsSource="{Binding Scenes}">
|
<ItemsControl ItemsSource="{Binding Scenes}" HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
<ItemsControl.ItemsPanel>
|
<ItemsControl.ItemsPanel>
|
||||||
<ItemsPanelTemplate>
|
<ItemsPanelTemplate>
|
||||||
<UniformGrid Rows="1" Columns="5"/>
|
<StackPanel Orientation="Horizontal"/>
|
||||||
</ItemsPanelTemplate>
|
</ItemsPanelTemplate>
|
||||||
</ItemsControl.ItemsPanel>
|
</ItemsControl.ItemsPanel>
|
||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Border CornerRadius="4" Margin="2" Padding="2"
|
<Border Width="196" Height="130" CornerRadius="4" Margin="2" Padding="2"
|
||||||
BorderThickness="2"
|
BorderThickness="2"
|
||||||
BorderBrush="Transparent"
|
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="Thumbnail_MouseLeftButtonDown">
|
MouseLeftButtonDown="Thumbnail_MouseLeftButtonDown">
|
||||||
<Border.Style>
|
<Border.Style>
|
||||||
<Style TargetType="Border">
|
<Style TargetType="Border">
|
||||||
<Setter Property="BorderBrush" Value="#333344"/>
|
<Setter Property="BorderBrush" Value="{StaticResource Brush.Outline}"/>
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
|
<!-- Active scene = orange (creator ruling 2026-10-30): it marks
|
||||||
|
the stage you are working on, not a selection — blue is
|
||||||
|
the interactive accent and read as "selected". Live
|
||||||
|
stays red. -->
|
||||||
<DataTrigger Binding="{Binding IsStaged}" Value="True">
|
<DataTrigger Binding="{Binding IsStaged}" Value="True">
|
||||||
<Setter Property="BorderBrush" Value="#e94560"/>
|
<Setter Property="BorderBrush" Value="{StaticResource Brush.Attention}"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
<DataTrigger Binding="{Binding IsLive}" Value="True">
|
<DataTrigger Binding="{Binding IsLive}" Value="True">
|
||||||
<Setter Property="BorderBrush" Value="#22c55e"/>
|
<Setter Property="BorderBrush" Value="{StaticResource Brush.Primary}"/>
|
||||||
</DataTrigger>
|
</DataTrigger>
|
||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
</Border.Style>
|
</Border.Style>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Border CornerRadius="3" Background="{StaticResource Brush.SurfaceContainerLowest}" ClipToBounds="True">
|
||||||
<RowDefinition Height="*"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Border Grid.Row="0" CornerRadius="3"
|
|
||||||
Background="#0a0a1a" ClipToBounds="True">
|
|
||||||
<Image Source="{Binding Snapshot}"
|
<Image Source="{Binding Snapshot}"
|
||||||
Stretch="UniformToFill"
|
Stretch="UniformToFill"
|
||||||
RenderOptions.BitmapScalingMode="LowQuality"/>
|
RenderOptions.BitmapScalingMode="LowQuality"/>
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock Grid.Row="1" Foreground="#a0a0b0" FontSize="10"
|
|
||||||
HorizontalAlignment="Center"
|
<Border HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6" Padding="8,3"
|
||||||
Margin="0,2,0,0"
|
CornerRadius="3" Background="{StaticResource Brush.Primary}">
|
||||||
TextTrimming="CharacterEllipsis">
|
<Border.Style>
|
||||||
<Run Text="{Binding Name, Mode=OneWay}"/><Run Text=" "/><Run Text="{Binding HotkeyLabel, Mode=OneWay}" Foreground="#6a6a7a" FontWeight="SemiBold"/>
|
<Style TargetType="Border">
|
||||||
</TextBlock>
|
<Setter Property="Visibility" Value="Collapsed"/>
|
||||||
|
<Style.Triggers>
|
||||||
|
<DataTrigger Binding="{Binding IsStaged}" Value="True">
|
||||||
|
<Setter Property="Visibility" Value="Visible"/>
|
||||||
|
</DataTrigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
</Border.Style>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Ellipse Width="8" Height="8" Fill="{StaticResource Brush.Primary}" VerticalAlignment="Center" Margin="0,0,5,0">
|
||||||
|
<Ellipse.Triggers>
|
||||||
|
<EventTrigger RoutedEvent="FrameworkElement.Loaded">
|
||||||
|
<BeginStoryboard>
|
||||||
|
<Storyboard RepeatBehavior="Forever" AutoReverse="True">
|
||||||
|
<DoubleAnimation Storyboard.TargetProperty="Opacity" From="1" To="0.15" Duration="0:0:0.6"/>
|
||||||
|
</Storyboard>
|
||||||
|
</BeginStoryboard>
|
||||||
|
</EventTrigger>
|
||||||
|
</Ellipse.Triggers>
|
||||||
|
</Ellipse>
|
||||||
|
<TextBlock Text="PROGRAM" Foreground="White" FontSize="11" FontWeight="Bold" VerticalAlignment="Center"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Border HorizontalAlignment="Right" VerticalAlignment="Top" Margin="6" Padding="8,2"
|
||||||
|
CornerRadius="10" Background="#000000">
|
||||||
|
<TextBlock Text="{Binding HotkeyLabel, Mode=OneWay}" Foreground="White" FontSize="16" FontWeight="SemiBold"/>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- The scene name wears the same pill as the hotkey chip, so both
|
||||||
|
labels stay readable over any thumbnail. -->
|
||||||
|
<Border HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="6"
|
||||||
|
Padding="8,2" CornerRadius="10" Background="#000000">
|
||||||
|
<TextBlock Text="{Binding Name, Mode=OneWay}" Foreground="White" FontSize="15" FontWeight="SemiBold"
|
||||||
|
TextTrimming="CharacterEllipsis"/>
|
||||||
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|||||||
@@ -11,6 +11,16 @@ public partial class SceneThumbnailStrip : UserControl
|
|||||||
public SceneThumbnailStrip()
|
public SceneThumbnailStrip()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
Loaded += (_, _) =>
|
||||||
|
{
|
||||||
|
if (DataContext is MainViewModel vm)
|
||||||
|
foreach (var scene in vm.Scenes)
|
||||||
|
{
|
||||||
|
var staged = scene.IsStaged;
|
||||||
|
scene.IsStaged = !staged;
|
||||||
|
scene.IsStaged = staged;
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Thumbnail_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
private void Thumbnail_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<UserControl x:Class="ytLive.Controls.TopBar"
|
<UserControl x:Class="ytLive.Controls.TopBar"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:helpers="clr-namespace:ytLive.Helpers"
|
||||||
x:Name="TopBarRoot">
|
x:Name="TopBarRoot">
|
||||||
<!-- LOGO / BRAND — clicking opens the in-app About overlay -->
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
@@ -10,109 +10,146 @@
|
|||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<!-- Logo / Brand — clicking opens the in-app About overlay -->
|
<!-- LOGO / BRAND — clicking opens the in-app About overlay; the gear sits
|
||||||
<Button Grid.Column="0" Background="Transparent" BorderThickness="0" Cursor="Hand"
|
a couple characters past the build stamp and opens App Settings. -->
|
||||||
VerticalAlignment="Center" Margin="0,0,24,0" ToolTip="About LlamaCasty"
|
<StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center"
|
||||||
|
Margin="0,0,24,0">
|
||||||
|
<Button Background="Transparent" BorderThickness="0" Cursor="Hand"
|
||||||
|
VerticalAlignment="Center" ToolTip="About LlamaCasty"
|
||||||
Command="{Binding OpenAboutCommand}">
|
Command="{Binding OpenAboutCommand}">
|
||||||
<Button.Template>
|
<Button.Template>
|
||||||
<ControlTemplate TargetType="Button">
|
<ControlTemplate TargetType="Button">
|
||||||
<ContentPresenter/>
|
<ContentPresenter/>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
</Button.Template>
|
</Button.Template>
|
||||||
<TextBlock FontSize="22" FontWeight="Bold">
|
<!-- Wordmark: "LlamaCas" + "ty" in YouTube red (creator ruling 2026-10-30 — never
|
||||||
<Run Text="LlamaCas" Foreground="#e0e0e0"/><Run Text="ty" Foreground="#e94560"/>
|
re-colour it). The Run elements MUST stay adjacent: whitespace between inline
|
||||||
|
Runs renders as a space and splits the name into "LlamaCas ty". -->
|
||||||
|
<TextBlock FontSize="22" FontWeight="Bold" VerticalAlignment="Center">
|
||||||
|
<Run Text="LlamaCas" Foreground="{StaticResource Brush.OnSurface}"/><Run Text="ty" Foreground="{StaticResource Brush.Youtube}"/><Run
|
||||||
|
x:Name="BuildIdStamp" Text="{x:Static helpers:BuildStamp.Label}" FontSize="9"
|
||||||
|
BaselineAlignment="Superscript" Foreground="{StaticResource Brush.OnSurfaceVariant}"
|
||||||
|
ToolTipService.ToolTip="{x:Static helpers:BuildStamp.Label}"/><Run Text=" " FontSize="4"/>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
</Button>
|
</Button>
|
||||||
|
<!-- Settings gear (user directive): a couple characters beyond the brand,
|
||||||
<!-- REC / ON-AIR pills (intent) + status signs (reality) -->
|
nudged right a couple more places 2026-09-22 (build 77 feedback).
|
||||||
<StackPanel Grid.Column="1" Orientation="Horizontal"
|
Moved up from the bottom bar — one menu: App Settings / Bug / Feature / About. -->
|
||||||
HorizontalAlignment="Center" VerticalAlignment="Center">
|
<Button Style="{StaticResource IconButton}" Margin="18,0,0,2" VerticalAlignment="Center"
|
||||||
<!-- REC pill: local recording needs no sign-in -->
|
ToolTip="Menu" Click="GearButton_Click" PreviewMouseRightButtonDown="GearButton_PreviewMouseRightButtonDown">
|
||||||
<TextBlock Text="REC" Foreground="#e94560" FontWeight="Bold" FontSize="12"
|
<Button.ContextMenu>
|
||||||
VerticalAlignment="Center" Margin="0,0,6,0"/>
|
<ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
||||||
<ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
|
<MenuItem Header="App Settings" Command="{Binding OpenSettingsCommand}"/>
|
||||||
IsChecked="{Binding RecordPillOn}"/>
|
<Separator/>
|
||||||
<!-- ON-AIR pill: greyed out until signed in -->
|
<MenuItem Header="Report Bug" Command="{Binding OpenBugCommand}"/>
|
||||||
<TextBlock Text="ON-AIR" Foreground="#e94560" FontWeight="Bold" FontSize="12"
|
<MenuItem Header="Feature Request" Command="{Binding OpenFeatureCommand}"/>
|
||||||
VerticalAlignment="Center" Margin="16,0,6,0"/>
|
<MenuItem Header="About" Command="{Binding OpenAboutCommand}"/>
|
||||||
<ToggleButton Style="{StaticResource PillToggle}" VerticalAlignment="Center"
|
</ContextMenu>
|
||||||
IsChecked="{Binding OnAirPillOn}"
|
</Button.ContextMenu>
|
||||||
IsEnabled="{Binding CanToggleOnAir}"
|
<Path Data="M19.43,12.98c0.04,-0.32 0.07,-0.65 0.07,-0.98c0,-0.33 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.38,-0.31 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98c0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.38,0.31 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64L19.43,12.98zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5c0,-1.93 1.57,-3.5 3.5,-3.5c1.93,0 3.5,1.57 3.5,3.5C15.5,13.93 13.93,15.5 12,15.5z"
|
||||||
ToolTip="{Binding AccountStatusLightToolTip}"/>
|
Fill="{StaticResource Brush.Attention}" Width="18" Height="18" Stretch="Uniform"/>
|
||||||
<!-- Status signs: REC dot + ON-AIR dot -->
|
</Button>
|
||||||
<Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
|
<!-- EDIT: explicit toggle. Neutral = off (chat), blue = on (layers/properties). The
|
||||||
Fill="{Binding RecDotBrush}" Opacity="{Binding RecDotOpacity}"/>
|
trigger used to set the SAME colour as the resting state, so the button never
|
||||||
<TextBlock Text="REC" Style="{StaticResource StatusSignText}"/>
|
looked pressed. -->
|
||||||
<!-- ON-AIR sign: gray offline, red public, green private -->
|
<ToggleButton IsChecked="{Binding EditingActive, Mode=TwoWay}" Content="EDIT"
|
||||||
<Ellipse Width="12" Height="12" VerticalAlignment="Center" Margin="16,0,0,0"
|
Cursor="Hand" Height="32" Padding="14,0" Margin="18,0,0,2" VerticalAlignment="Center"
|
||||||
Fill="{Binding OnAirBrush}"/>
|
FontWeight="Bold" FontSize="12" Foreground="{StaticResource Brush.OnAccent}" BorderThickness="0">
|
||||||
<TextBlock Text="ON-AIR" Style="{StaticResource StatusSignText}"/>
|
<ToggleButton.Template>
|
||||||
<Border Background="#8f1f1f" CornerRadius="3" Padding="6,1" Margin="8,0,0,0"
|
<ControlTemplate TargetType="ToggleButton">
|
||||||
VerticalAlignment="Center"
|
<Border x:Name="EditBody" Background="{StaticResource Brush.SurfaceContainerHigh}" CornerRadius="4" Padding="{TemplateBinding Padding}">
|
||||||
Visibility="{Binding IsLivePrivate, Converter={StaticResource BoolToVis}}">
|
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
|
||||||
<TextBlock Text="PRIVATE" FontSize="11" FontWeight="Bold" Foreground="White"/>
|
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock Text="{Binding LiveElapsedText}" Foreground="White" FontSize="14"
|
<ControlTemplate.Triggers>
|
||||||
FontFamily="Consolas" VerticalAlignment="Center" Margin="14,0,0,0"
|
<Trigger Property="IsChecked" Value="True">
|
||||||
Visibility="{Binding IsLive, Converter={StaticResource BoolToVis}}"/>
|
<Setter TargetName="EditBody" Property="Background" Value="{StaticResource Brush.Tertiary}"/>
|
||||||
|
</Trigger>
|
||||||
|
</ControlTemplate.Triggers>
|
||||||
|
</ControlTemplate>
|
||||||
|
</ToggleButton.Template>
|
||||||
|
</ToggleButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<!-- Three-state top bar: logged-out / idle / live -->
|
<!-- Session surface (top bar redesign): the bar is ONE surface rendered by
|
||||||
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
|
the FIRST decision — Record or Stream. Each world is the whole bar; the
|
||||||
<!-- Status light -->
|
other world never exists on screen. While running, the bar drops to a
|
||||||
<Ellipse Width="8" Height="8" Margin="0,0,8,0" VerticalAlignment="Center"
|
reality line + End so nothing mid-session can be re-armed. -->
|
||||||
ToolTip="{Binding AccountStatusLightToolTip}">
|
<StackPanel Grid.Column="1" Orientation="Horizontal"
|
||||||
<Ellipse.Style>
|
HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
<Style TargetType="Ellipse">
|
<!-- IDLE: the mode switch + the action(s) of the armed world. The three
|
||||||
<Setter Property="Fill" Value="#ef4444"/>
|
controls share one height (build 77 feedback) so they read as one
|
||||||
<Style.Triggers>
|
family — segments host, Start/Go Live, and Test all sit at 32. -->
|
||||||
<DataTrigger Binding="{Binding IsConnected}" Value="True">
|
<StackPanel Orientation="Horizontal"
|
||||||
<Setter Property="Fill" Value="#22c55e"/>
|
Visibility="{Binding ShowIdleWorld, Converter={StaticResource BoolToVis}}">
|
||||||
</DataTrigger>
|
<Border Background="{StaticResource Brush.SurfaceContainerLowest}" CornerRadius="4" Padding="2" Height="32" VerticalAlignment="Center">
|
||||||
<DataTrigger Binding="{Binding IsLive}" Value="True">
|
<StackPanel Orientation="Horizontal">
|
||||||
<Setter Property="Fill" Value="#e94560"/>
|
<ToggleButton Style="{StaticResource RecordPillToggle}"
|
||||||
</DataTrigger>
|
IsChecked="{Binding RecordPillOn}">
|
||||||
</Style.Triggers>
|
<!-- the label follows the pill's own foreground: muted when armed-off,
|
||||||
</Style>
|
dark on red when armed (SegmentLabel pins its own colour) -->
|
||||||
</Ellipse.Style>
|
<TextBlock Text="REC" FontSize="12" FontWeight="Bold" VerticalAlignment="Center"
|
||||||
</Ellipse>
|
Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=ToggleButton}}"/>
|
||||||
<!-- Avatar (connected only); shows the channel initial when
|
</ToggleButton>
|
||||||
the profile image is missing or fails to download -->
|
<ToggleButton Style="{StaticResource RecordPillToggle}"
|
||||||
<Border Width="26" Height="26" CornerRadius="13" Background="#16213e" ClipToBounds="True"
|
IsChecked="{Binding OnAirPillOn}">
|
||||||
Margin="0,0,8,0" VerticalAlignment="Center"
|
<TextBlock Text="ON-AIR" FontSize="12" FontWeight="Bold" VerticalAlignment="Center"
|
||||||
ToolTip="{Binding AccountDisplayName}"
|
Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=ToggleButton}}"/>
|
||||||
Visibility="{Binding IsConnected, Converter={StaticResource BoolToVis}}">
|
</ToggleButton>
|
||||||
<Grid>
|
</StackPanel>
|
||||||
<Image x:Name="AvatarImage" Stretch="UniformToFill"/>
|
|
||||||
<TextBlock x:Name="AvatarInitial" Foreground="#e0e0e0" FontSize="13"
|
|
||||||
FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"
|
|
||||||
Visibility="Collapsed"/>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
</Border>
|
||||||
<!-- Sign In button (disconnected + offline) -->
|
<!-- Go face names the world: "Start Recording" vs "Go Live".
|
||||||
<Button Content="Sign In" Style="{StaticResource YtButton}"
|
(Signed-out ON-AIR Start routes to the sign-in — StartSession.) -->
|
||||||
Margin="0,0,12,0"
|
<Button Content="{Binding PrimaryStartButtonLabel}" Style="{StaticResource YtButton}"
|
||||||
Command="{Binding StartStreamCommand}"
|
Height="32" Margin="10,0,0,0" Command="{Binding PrimaryStartCommand}"
|
||||||
Visibility="{Binding ShowLogInButton, Converter={StaticResource BoolToVis}}"/>
|
Visibility="{Binding ShowPrimaryStartButton, Converter={StaticResource BoolToVis}}"/>
|
||||||
<!-- Primary Start button (offline): dynamic label from the pills -->
|
<!-- No separate TEST button (creator ruling 2026-10-30): EDIT decides whether
|
||||||
<Button Content="Start" Style="{StaticResource YtButton}"
|
the ON-AIR start is the real livestream or the test one. -->
|
||||||
Command="{Binding StartStreamCommand}"
|
</StackPanel>
|
||||||
Visibility="{Binding ShowPrimaryStartButton, Converter={StaticResource BoolToVis}}">
|
|
||||||
|
<!-- RUNNING: one reality line (dot + word + elapsed) and the stop -->
|
||||||
|
<StackPanel Orientation="Horizontal"
|
||||||
|
Visibility="{Binding RunningVisible, Converter={StaticResource BoolToVis}}">
|
||||||
|
<Ellipse Width="12" Height="12" VerticalAlignment="Center"
|
||||||
|
Fill="{Binding RunningDotBrush}"/>
|
||||||
|
<TextBlock Text="{Binding RunningText}" FontSize="16" FontWeight="Bold"
|
||||||
|
Foreground="White" Margin="8,0,0,0" VerticalAlignment="Center"/>
|
||||||
|
<TextBlock Text="{Binding LiveElapsedText}" Foreground="White" FontSize="14"
|
||||||
|
FontFamily="Consolas" VerticalAlignment="Center" Margin="8,0,0,0"/>
|
||||||
|
<Button Content="{Binding EndButtonText}" Style="{StaticResource YtButton}"
|
||||||
|
Background="{StaticResource Brush.Primary}" Margin="14,0,0,0"
|
||||||
|
Command="{Binding EndStreamCommand}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<!-- Account zone: lives only in the Stream world. Signed out → Sign In;
|
||||||
|
signed in → a big avatar of the streaming account (build 77 feedback:
|
||||||
|
"make the user icon much bigger"). Record world has no YouTube
|
||||||
|
identity at all. -->
|
||||||
|
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
|
||||||
|
<Button Content="Sign In" Style="{StaticResource YtButtonSecondary}"
|
||||||
|
Margin="0,0,8,0" Command="{Binding SignInCommand}"
|
||||||
|
ToolTip="Sign in to YouTube to go live."
|
||||||
|
Visibility="{Binding ShowSignInButton, Converter={StaticResource BoolToVis}}"/>
|
||||||
|
<Button Style="{StaticResource IconButton}" Margin="0,0,0,0"
|
||||||
|
ToolTip="{Binding AccountDisplayName}"
|
||||||
|
Visibility="{Binding ShowAvatarButton, Converter={StaticResource BoolToVis}}">
|
||||||
<Button.ContextMenu>
|
<Button.ContextMenu>
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<MenuItem Header="Choose Record Folder" Command="{Binding ChooseRecordFolderCommand}"/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="Change Account" Command="{Binding ChangeAccountCommand}"/>
|
<MenuItem Header="Change Account" Command="{Binding ChangeAccountCommand}"/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<MenuItem Header="Logout" Command="{Binding LogoutCommand}"/>
|
<MenuItem Header="Logout" Command="{Binding LogoutCommand}"/>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
</Button.ContextMenu>
|
</Button.ContextMenu>
|
||||||
|
<Border Width="40" Height="40" CornerRadius="20" Background="{StaticResource Brush.SurfaceContainer}"
|
||||||
|
ClipToBounds="True" BorderBrush="{StaticResource Brush.Outline}" BorderThickness="1">
|
||||||
|
<Grid>
|
||||||
|
<Image x:Name="AvatarImage" Stretch="UniformToFill"/>
|
||||||
|
<TextBlock x:Name="AvatarInitial" Foreground="{StaticResource Brush.OnSurface}" FontSize="20"
|
||||||
|
FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||||
|
Visibility="Collapsed"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
</Button>
|
</Button>
|
||||||
<!-- End button (live OR recording) — the only button whose
|
|
||||||
label changes; "Stop Recording" while recording -->
|
|
||||||
<Button Content="{Binding EndButtonText}" Style="{StaticResource YtButton}"
|
|
||||||
Background="#333" Command="{Binding EndStreamCommand}"
|
|
||||||
Visibility="{Binding ShowEndStreamButton, Converter={StaticResource BoolToVis}}"/>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Media.Imaging;
|
using System.Windows.Media.Imaging;
|
||||||
using ytLive.Helpers;
|
using ytLive.Helpers;
|
||||||
@@ -25,6 +26,26 @@ public partial class TopBar : UserControl
|
|||||||
_ = LoadAvatarImageAsync();
|
_ = LoadAvatarImageAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void GearButton_PreviewMouseRightButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
|
||||||
|
{
|
||||||
|
// Right-click goes straight to App Settings; the menu stays on left-click.
|
||||||
|
e.Handled = true;
|
||||||
|
if (DataContext is MainViewModel { OpenSettingsCommand: { } open } && open.CanExecute(null))
|
||||||
|
open.Execute(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void GearButton_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
// One menu (Settings / Bug / Feature / About), opened on click — moved up
|
||||||
|
// from the bottom bar so app-level actions live next to the brand.
|
||||||
|
if (sender is Button { ContextMenu: { } menu } button)
|
||||||
|
{
|
||||||
|
menu.PlacementTarget = button;
|
||||||
|
menu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
|
||||||
|
menu.IsOpen = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private async System.Threading.Tasks.Task LoadAvatarImageAsync()
|
private async System.Threading.Tasks.Task LoadAvatarImageAsync()
|
||||||
{
|
{
|
||||||
var vm = DataContext as MainViewModel;
|
var vm = DataContext as MainViewModel;
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
# Controls — index
|
||||||
|
|
||||||
|
The phase-2 carved pieces of what used to be one monolithic `MainWindow.xaml`
|
||||||
|
(1,681 lines → a 123-line shell). Each is a `UserControl` in the `ytLive.Controls`
|
||||||
|
namespace, extracted one roll-back commit at a time (refactor-commit-12..18).
|
||||||
|
See [`schema.md`](../schema.md) for the memory-map conventions.
|
||||||
|
|
||||||
|
| File | Purpose |
|
||||||
|
|------|---------|
|
||||||
|
| `BottomBar.xaml(.cs)` | Footer (Row 3): intentionally empty, height-preserving spacer; stream readouts and resolution picker moved to the top-left cell in the 2026-10-26 surface redesign |
|
||||||
|
| `HealthBanner.xaml(.cs)` | Row 1 status banner + the 7 value→visibility converters live in the app theme, not here |
|
||||||
|
| `TopBar.xaml(.cs)` | Row 0 session surface: brand + gear menu (left), explicit `EDIT` toggle beside the REC|ON-AIR mode switch and world actions (Record: Start Recording · Stream: Go Live + Test), running-state reality line + End (center), account zone (right). Left-click gear opens the menu; right-click opens App Settings directly. `RefreshAvatar()`, `GearButton_Click` |
|
||||||
|
| `PreviewPane.xaml(.cs)` | Row 2 Col 1 center: 1920×1080 `OverlayCanvas`/`SelectionOverlay`/`BrandFlashLayer`/`SocialBarElement`, text drawer, outgoing-picture transition overlay, right-edge Stream Info/YPP/Socials/TEST tabs and drawers, and live controls (TRAX / game / mic meters + sliders + speakers). The list-selected draggable layer is temporarily raised in preview z-order and custom hit-testing; deselection restores the scene's unchanged order (`SelectedLayerPreviewHitTestingTests`). **TASK 57:** dragging/resizing a webcam in the vertical tier routes through `MainViewModel.MoveWebcamInVerticalTier` / `ResizeWebcamInVerticalTier` for the six-spot snap or Chat camera's two sizes. |
|
||||||
|
| `SceneThumbnailStrip.xaml(.cs)` | Top row over the preview column: five fixed-size scene cards with scene name, hotkey, staged `PROGRAM` badge, orange staged/live border |
|
||||||
|
| `LeftPanel.xaml(.cs)` | Row 2 Col 0 left panel: explicit EditingActive toggle on → Scene Layers+properties; off → YouTube chat, independent of stream status. Source add/edit/remove, list drag-to-reorder, snapshot revert-accept. **TASK 51:** the webcam properties carry the Background section — `RemoveBackgroundPill` / `BlurBackgroundPill` (`PillToggle`, radio-exclusive via `WebcamSceneConfig.RemoveBackground`/`BlurBackground`) + `BackgroundStrengthSlider` (0..1, 5% snaps, shown only while an effect is on). **TASK 57:** the webcam properties carry a Geometry section (X/Y/W/H) — manual placement of the camera, bound to the **live** placement (the one the current tier shows), gated on `IsWebcamSelected` (not `SelectedElement.IsWebcam` — the TASK 51 test finds that panel by binding text and would match twice); the Shape button's `Visibility` is bound to `CanToggleClipShape`, so the circle option is NOT OFFERED in the vertical Chat layout. **TASK 58:** every drop-down, check box and field in the properties panel carries the theme's style (`YtComboBox`/`YtCheckBox`/`YtTextBoxCompact`) and paints no colour of its own — the guard is `ytLive.Tests/PropertiesStyleTests.cs`. **TASK 59:** the webcam's properties are a HIERARCHY — a `Shape` title owns the mirror switch and the shape choice (`Rect` | `Circle` as two `SegmentToggle` options, Rect selected by default, the circle option hidden where `CanToggleClipShape` is false), and every titled block (Geometry, Border Color, Border Thickness, Background) owns its content one indent deeper (Strength sits under Blur). **TASK 60:** the border-colour drop-down builds its menu from `Models/BorderColorPalette.cs` — each row is the hex plus the colour's NAME (`#e94560 Crimson`, tooltip "Crimson (#e94560)"); the swatch icon is unchanged. **TASK 61:** the four geometry fields (X/Y/W/H) share one fixed width (44px — the largest value, 1920, plus a sign) and their rows set `LastChildFill="False"`, so Y/H no longer stretch to fill the row. **TASK 62:** the border-colour field shows the palette's name beside the hex (`SelectedElement.BorderColorName`, empty for a custom hex) and keeps a fixed width so the name stays next to the hex. **TASK 63:** the border colour is picked with the **app's own drop-down** (`YtComboBox`) — the `...` button and its code-built `ContextMenu` are gone; the closed box shows the swatch + the colour's NAME, the rows show swatch + hex + name (the panel's own `DataTemplate`s + `Helpers/ClosedBoxTemplateSelector.cs`), and the hex field stays for a custom colour; `IsDescendantOf` falls back to `LogicalTreeHelper.GetParent` / `TemplatedParent` when `VisualTreeHelper.GetParent` returns `null` (at `PopupRoot`) so clicking a popup row does not trigger `MainWindow`'s deselection guard |
|
||||||
|
| `OverlayHost.xaml(.cs)` | Root-grid overlays: App Settings / Report Bug / Feature Request / About; App Settings now groups recording, brand-logo, preview, and transition controls. `BackToAbout_Click` lives here |
|
||||||
|
| `SceneThumbnailStrip.xaml.cs` | Code-behind for the strip above |
|
||||||
|
| `LeftPanel.xaml.cs` | Code-behind for the panel above |
|
||||||
|
|
||||||
|
## Window ↔ control contract
|
||||||
|
|
||||||
|
The shell (`MainWindow.xaml(.cs)`) wires up each control and routes the few
|
||||||
|
cross-cutting calls through it:
|
||||||
|
|
||||||
|
- Ctor finds each control by `x:Name` (`TopBar`, `PreviewPane`, `LeftPanel`)
|
||||||
|
AFTER `InitializeComponent`, **before** any method touches it (null-ref guard).
|
||||||
|
- `_previewPane.IsClickInsidePreview/Drawer` + `_leftPanel.IsClickInside` →
|
||||||
|
deselection guard in `Window_PreviewMouseLeftButtonDown`.
|
||||||
|
- `_previewPane.UpdateSelectionOverlay(bool)` + `_leftPanel.OnSelectionChanged(vm)`
|
||||||
|
→ selection/edit-mode routing from the VM's `SelectedElement` change.
|
||||||
|
- `_topBar.RefreshAvatar()` on `IsConnected`/`AccountAvatarUrl` change.
|
||||||
|
- Handlers in moved controls cast `(DataContext as MainViewModel)` — controls
|
||||||
|
inherit the window's DataContext; never pass the VM through a property.
|
||||||
|
|
||||||
|
## Gotchas learned the hard way
|
||||||
|
|
||||||
|
- **A UserControl cannot see `Window.Resources`** (StaticResource resolves by
|
||||||
|
element lookup, so it stops at the control boundary). The 7 converters
|
||||||
|
(`BoolToVis`, `InverseBoolToVis`, `NotNullToVis`, `NullToVis`, `HiddenBoolToVis`,
|
||||||
|
`EnumToBool`, `AllTrueToVis`) were promoted from `MainWindow.Resources` into
|
||||||
|
`Themes/Controls.xaml` (see [`Themes/index.md`](../Themes/index.md)).
|
||||||
|
- **Moved XAML can lose its namespace**: a block cut from MainWindow carries no
|
||||||
|
root xmlns, so any `models:`/`Helpers:` ref in it breaks the build with
|
||||||
|
`MC2000: Value cannot be null (key)`. Declare `xmlns:models` / `xmlns:Helpers`
|
||||||
|
on each control's root (LeftPanel hit this).
|
||||||
|
- **Name-looked-up host stubs must stay in the window**, not a control:
|
||||||
|
`WebViewHostPanel` (ctor `InitWebView2(WebViewHostPanel)`) and `ToastArea`
|
||||||
|
(`NotificationService.InArea("ToastArea")`) are resolved by name from the
|
||||||
|
window root — so `OverlayHost` deliberately leaves them as thin window-root
|
||||||
|
children (Commit 18). Since the 2026-09-14 composition-capture redesign only
|
||||||
|
`ToastArea` remains — `WebViewHostPanel` is deleted (web sources no longer
|
||||||
|
host a multiline XAML control; `InitWebView2()` runs from `MainWindow_Loaded`
|
||||||
|
with no panel argument).
|
||||||
|
- When cutting visual wrappers, don't drop the outer `Border`'s
|
||||||
|
background/glow/margin — Commit 15 initially lost the preview's outer border
|
||||||
|
and had to restore it same-commit.
|
||||||
|
|
||||||
|
Related: [`ViewModels/index.md`](../ViewModels/index.md) (MainViewModel the
|
||||||
|
controls bind to), [`Themes/index.md`](../Themes/index.md) (styles/converters),
|
||||||
|
[`Helpers/index.md`](../Helpers/index.md) (ViewModelBase, converters), the
|
||||||
|
`MainWindow.xaml` shell at repo root that hosts these.
|
||||||
@@ -0,0 +1,192 @@
|
|||||||
|
# DESIGN.md — LlamaCasty visual design standard
|
||||||
|
|
||||||
|
> **Status: the standard** (decided 2026-10-30). Token values here are normative;
|
||||||
|
> `Themes/Tokens.xaml` is the implementation, and no other file may hardcode a hex once the sweep
|
||||||
|
> lands. Two Google Stitch exports feed it (2026-10-26 edit screen, 2026-10-29 audio dock).
|
||||||
|
>
|
||||||
|
> **The exports' layouts and control drawings are exploratory, not spec.** The dock, the four
|
||||||
|
> bays, the page-nav sidebar and the skeuomorphic faders are *not* adopted — the product's design
|
||||||
|
> principle is a surface so obvious that a right-brained person can use it without a manual, and
|
||||||
|
> hardware cosplay is the opposite of that. Only the colour, type, spacing, radius and elevation
|
||||||
|
> system is adopted.
|
||||||
|
|
||||||
|
## Colour
|
||||||
|
|
||||||
|
### Surfaces (dark navy scale, darkest to lightest)
|
||||||
|
|
||||||
|
| Token | Hex | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `background` | `#0b1326` | App window background |
|
||||||
|
| `surface-container-lowest` | `#060e20` | Deepest recess (scene strip background, canvas housing) |
|
||||||
|
| `surface-container-low` | `#131b2e` | Panel background (sidebars, headers) |
|
||||||
|
| `surface-container` | `#171f33` | Card / grouped-section background |
|
||||||
|
| `surface-container-high` | `#222a3d` | Hover state, input fields |
|
||||||
|
| `surface-container-highest` | `#2d3449` | Selected/active row background |
|
||||||
|
| `surface-bright` | `#31394d` | Lightest surface, rare use (strong hover) |
|
||||||
|
| `outline` | `#334155` | Borders, dividers |
|
||||||
|
| `outline-variant` | `#1e293b` | Subtle dividers, inactive meter segments |
|
||||||
|
| `scrim-soft` | `#22FFFFFF` | Hover/press wash over a surface (13% white) |
|
||||||
|
| `scrim-strong` | `#26FFFFFF` | Stronger wash — selected icon, dimmed image (15% white) |
|
||||||
|
| `scrim-dark` | `#26000000` | Dim strip / shading over the preview (15% black) |
|
||||||
|
| `scrim-dark-strong` | `#00000080` | Heavy overlay — modal veil, poster frame (50% black) |
|
||||||
|
|
||||||
|
### Text
|
||||||
|
|
||||||
|
| Token | Hex | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `on-surface` | `#dae2fd` | Primary text |
|
||||||
|
| `on-surface-variant` | `#94a3b8` | Secondary / label text |
|
||||||
|
| `on-surface-disabled` | `#5b6478` | Disabled text and icons |
|
||||||
|
|
||||||
|
### Accent — one role each, never mixed
|
||||||
|
|
||||||
|
| Token | Hex | Role |
|
||||||
|
|---|---|---|
|
||||||
|
| `tertiary` (electric blue) | `#38bdf8` | **The** interactive accent: selection, focus, sliders, primary buttons, transform handles |
|
||||||
|
| `on-tertiary` | `#0b1326` | Dark ink, for large blue **surfaces** only |
|
||||||
|
| `on-accent` | `#ffffff` | Text/icon on any saturated accent fill — the blue EDIT button, the armed REC/ON-AIR pills. One rule: a coloured fill carries white ink |
|
||||||
|
| `primary` (red) | `#ff5451` | **On-air / recording only** — LIVE badge, program border, End/Go Live |
|
||||||
|
| `primary-container` | `#b91a24` | Red pressed/hover state |
|
||||||
|
| `secondary` (amber) | `#ffb95f` | Game audio channel, Super Chat highlight |
|
||||||
|
| `secondary-container` | `#ee9800` | Amber pressed/hover state |
|
||||||
|
| `attention` (orange) | `#ff8c3a` | Dropped frames, the live-screen indicator, blinking warnings |
|
||||||
|
| `positive` | `#22c55e` | **Status only** — connected, applied, healthy. Never an accent, never a button fill |
|
||||||
|
| `error` | `#ef4444` | Error text and icons |
|
||||||
|
| `error-container` | `#93000a` | Error surface (health banner, toast) — keeps error visually distinct from on-air red |
|
||||||
|
| `on-error` | `#ffdad6` | Text on an error surface |
|
||||||
|
| `info-container` | `#3a3b52` | Neutral notice surface (info toast) |
|
||||||
|
| `success-container` | `#1d5c38` | Success notice surface (success toast) |
|
||||||
|
| `warning-container` | `#b8860b` | Warning surface — health banner, warning toast |
|
||||||
|
| `test-container` | `#9c6f1c` | Test-stream chrome: the gold top bar and glow |
|
||||||
|
| `youtube` | `#ff0000` | **YouTube-branded surfaces only** — Stream Info / YPP rails, the YouTube account row, and the wordmark's "ty" (creator ruling: never re-colour it) | — the Stream Info and YPP rails, the YouTube account row. Not for state: live stays `primary` |
|
||||||
|
|
||||||
|
**The rule:** red means "live or recording" and nothing else. Never a Send button, a delete action,
|
||||||
|
a brand flourish, or a general accent — that was the defect in the first Stitch draft.
|
||||||
|
|
||||||
|
**`#e94560` is retired** as the app's general accent (it was in 15 files). Blue takes over every
|
||||||
|
interactive role; red keeps only live/record. The brand/wordmark *artwork* is unchanged — those
|
||||||
|
assets are the creator's art, not a theme value.
|
||||||
|
|
||||||
|
### Meter thresholds (both meters, all bays)
|
||||||
|
|
||||||
|
| Band | Range | Brush |
|
||||||
|
|---|---|---|
|
||||||
|
| Nominal | −∞ … −12 dB | `#38bdf8` |
|
||||||
|
| Caution | −12 … −3 dB | `#ffb95f` |
|
||||||
|
| Peak / clip | −3 … 0 dB+ | `#ff5451` |
|
||||||
|
|
||||||
|
Meters are **measured, never decorative** (see `docs/ai/output.md`): the ladder shows the live
|
||||||
|
level scaled by the current gain, not the gain setting.
|
||||||
|
|
||||||
|
## Typography
|
||||||
|
|
||||||
|
| Token | Family | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `sans` | Inter (400/500/600/700) | All UI text — labels, buttons, panel titles |
|
||||||
|
| `mono` | JetBrains Mono (500/600) | Numeric/telemetry values — bitrate, FPS, dB, coordinates, timers. Tabular figures stop digits shifting width as values change |
|
||||||
|
|
||||||
|
Icons: Material Symbols Outlined (bundled, not fetched).
|
||||||
|
|
||||||
|
### Scale
|
||||||
|
|
||||||
|
| Token | Size / line | Weight | Tracking | Use |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| `headline-lg` | 32 / 40 | 700 | −0.02em | Landing/empty-state titles only |
|
||||||
|
| `headline-md` | 24 / 32 | 600 | −0.015em | Dialog titles |
|
||||||
|
| `headline-sm` | 18 / 24 | 600 | −0.01em | Panel and section headers |
|
||||||
|
| `body-lg` | 15 / 22 | 400 | — | Default body, chat |
|
||||||
|
| `body-md` | 13 / 18 | 400 | — | Panel rows, form text |
|
||||||
|
| `body-sm` | 12 / 16 | 400 | — | Secondary text, hints |
|
||||||
|
| `label-lg` | 13 / 16 | 600 | 0.02em | `mono` — primary telemetry values |
|
||||||
|
| `label-md` | 11 / 14 | 500 | 0.04em | `mono` — labels, hotkey chips |
|
||||||
|
| `label-sm` | 10 / 12 | 500 | 0.05em | `mono` — dense telemetry only |
|
||||||
|
|
||||||
|
**Floors and implementation notes**
|
||||||
|
|
||||||
|
- **11px is the default label size; 10px is the absolute floor** and only for dense readouts that
|
||||||
|
sit beside a larger value. Nothing readable at 100% zoom may be smaller than 10px.
|
||||||
|
- **WPF has no letter-spacing.** Tracking values above are design intent, not a property; implement
|
||||||
|
as-is (no tracking) rather than faking it with padded strings.
|
||||||
|
- Mono numerics use `Typography.NumeralAlignment="Tabular"` so widths stay stable.
|
||||||
|
|
||||||
|
## Spacing
|
||||||
|
|
||||||
|
| Token | px | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `space-xs` | 4 | Inside a chip, icon-to-text |
|
||||||
|
| `space-sm` | 8 | Between related controls |
|
||||||
|
| `space-md` | 12 | Default gap inside a panel |
|
||||||
|
| `space-lg` | 16 | Panel padding, section separation |
|
||||||
|
| `space-xl` | 24 | Dialog padding, major separation |
|
||||||
|
| `gutter` | 12 | Between page columns |
|
||||||
|
| `margin` | 16 | Window edge to content |
|
||||||
|
| `margin-docked` | 8 | Edge to content when a rail/drawer is docked |
|
||||||
|
|
||||||
|
## Shape
|
||||||
|
|
||||||
|
| Token | px | Use |
|
||||||
|
|---|---|---|
|
||||||
|
| `radius-sm` | 4 | Chips, badges, keycap tags |
|
||||||
|
| `radius-md` | 8 | Buttons, inputs, cards, scene tiles |
|
||||||
|
| `radius-lg` | 16 | Preview viewport, drawers, dialogs |
|
||||||
|
| `radius-full` | pill | Status chips (LIVE, EDIT), toggles |
|
||||||
|
|
||||||
|
Recessed controls (fader wells, inputs) use the same outer radius as their housing so the seams
|
||||||
|
line up — do not mix a 4px well inside an 8px card.
|
||||||
|
|
||||||
|
## Elevation
|
||||||
|
|
||||||
|
| Level | Use | Implementation |
|
||||||
|
|---|---|---|
|
||||||
|
| −1 recessed | Fader wells, input fields, table headers | inset top shadow + `surface-container-lowest` |
|
||||||
|
| 0 panel | The default chassis | `surface-container*` + **1px `outline` border**, no shadow |
|
||||||
|
| 1 raised | Scene tiles, floating chips, action buttons | subtle drop shadow, 0 1px 2px |
|
||||||
|
| 2 floating | Drawers, popups, dialogs | larger spread + 1px top highlight |
|
||||||
|
|
||||||
|
**Budget rule:** `DropShadowEffect` is software-rendered in WPF. Shadows on small controls only —
|
||||||
|
**never** on the preview viewport, the scene strip, or either wing. Depth on large surfaces comes
|
||||||
|
from the surface scale and the 1px border, not from effects.
|
||||||
|
|
||||||
|
## Interaction
|
||||||
|
|
||||||
|
- Focus ring: 1px `#38bdf8` outside a 1px gap — visible against every surface level.
|
||||||
|
- Hover: step one surface level up; active: step two. No colour change on hover except for
|
||||||
|
destructive actions.
|
||||||
|
- Motion: 150ms `CubicEase(EaseOut)` for drawers/popovers; 90ms for hover/press. No springs —
|
||||||
|
WPF has no spring easing and hand-rolled overshoot reads as jank at 60Hz.
|
||||||
|
- Every action produces a visible outcome. No dead ends, no silent failures.
|
||||||
|
|
||||||
|
## Not in this standard
|
||||||
|
|
||||||
|
- The audio dock, its four bays, per-bay faders, 24-segment ladders, transport controls, lip-sync
|
||||||
|
slider and master telemetry strip — **exploratory**. The controls they re-house already exist in
|
||||||
|
the app; whether any of them gets a dock is a separate product decision.
|
||||||
|
- The page-nav sidebar (Broadcast Studio / Audio Mixer / Scene Matrix / Telemetry / Hotkeys) — the
|
||||||
|
app is one surface with an EDIT toggle and drawers, not a page router.
|
||||||
|
- CPU / GPU / NVENC readouts — no telemetry exists, and none of it changes a live decision.
|
||||||
|
- Acrylic/backdrop blur — WPF has no sub-region backdrop blur; panels are solid.
|
||||||
|
- **On-stream output** (chat box, social bar, alerts, brand flash) is styled by its own renderers,
|
||||||
|
not by this theme. Do not apply UI tokens to the broadcast picture.
|
||||||
|
|
||||||
|
## Rejected from the 2026-10-29 export
|
||||||
|
|
||||||
|
The export is a Material-3 dump from a warm seed; four tokens came out tinted by that seed and are
|
||||||
|
rejected in favour of the values above.
|
||||||
|
|
||||||
|
| Export value | Token | Why rejected |
|
||||||
|
|---|---|---|
|
||||||
|
| `#4cd7f6` | `tertiary` | Neon cyan beside the amber reads "toy"; `#38bdf8` is calmer and already used in-app |
|
||||||
|
| `#ab8986` | `outline` | Warm pink borders from the seed — wrong for a navy chassis |
|
||||||
|
| `#5b403e` | `outline-variant` | Same seed artifact |
|
||||||
|
| `#e4beba` | `on-surface-variant` | Pink secondary text; slate `#94a3b8` is legible and neutral |
|
||||||
|
|
||||||
|
## Implementation status
|
||||||
|
|
||||||
|
- **`Themes/Tokens.xaml` exists and is merged first in `App.xaml`** (2026-10-30). Guard:
|
||||||
|
`ytLive.Tests/DesignTokensTests.cs` — it parses this document and fails if a documented token has
|
||||||
|
no brush, if a value disagrees, or if the retired `#e94560` returns as a token.
|
||||||
|
- **Still to sweep:** `Themes/Controls.xaml` and the dozens of hardcoded hexes in XAML/C# still use
|
||||||
|
the legacy palette. Surfaces convert one at a time; the end state is that every colour, radius and
|
||||||
|
spacing value resolves from `Tokens.xaml` and a guard fails on any raw `#hex` outside it.
|
||||||
|
- **Fonts ship with the app** (`Assets/Fonts/*.ttf`, OFL-1.1) — no installation, no network, no
|
||||||
|
dependence on what the machine happens to have. Notice and license text travel with them (`THIRD-PARTY-NOTICES.txt` items 13-14).
|
||||||
@@ -1,12 +1,42 @@
|
|||||||
# Distribution & IP Protection Plan
|
# Distribution & IP Protection Plan
|
||||||
|
|
||||||
> 360-degree protection strategy for LlamaCasty (.NET 8 / WPF), built around Polar.sh.
|
> 360-degree protection strategy for LlamaCasty (.NET 8 / WPF).
|
||||||
|
|
||||||
|
> ## ⛔ SUPERSEDED IN PART — 2026-09-27
|
||||||
|
>
|
||||||
|
> **Distribution is now the Microsoft Store: MSIX package + Store IAP.** The creator's criteria
|
||||||
|
> were *"zero headaches, minimal maintenance (for me) while still providing accountability and
|
||||||
|
> a reasonably easy upgrade flow"*, and that ruling deleted this document's central premise.
|
||||||
|
>
|
||||||
|
> **What still stands below:** §1 (code architecture / IP protection), §5 (obfuscation posture),
|
||||||
|
> §6 (legal), §7 (hardening) — those are about protecting the *binary*, and an MSIX package is
|
||||||
|
> still a binary. **§1.2's build-posture ceiling (HARDENED + MOCK_REWARDS, additive-only)
|
||||||
|
> remains the agreed ceiling.**
|
||||||
|
>
|
||||||
|
> **What is dead:**
|
||||||
|
> - **Polar as the distribution backbone** — the entire section below. Store IAP handles
|
||||||
|
> checkout, entitlements, refunds, tax, and the customer portal. So does **file hosting**:
|
||||||
|
> the Store is the delivery mechanism, so "upload `LlamaCasty.exe` to Polar as a File
|
||||||
|
> Download benefit" (§2) no longer exists as a step.
|
||||||
|
> - **Code signing as our problem** — MSIX is signed by **Microsoft**. There is no certificate
|
||||||
|
> to buy, no HSM, no annual renewal. See §4.3, which was already corrected to say this, and
|
||||||
|
> `TASKS/research-store-certification.md` §2–3.
|
||||||
|
> - **Velopack / the update URL / the DO droplet** — Store auto-update.
|
||||||
|
>
|
||||||
|
> **The authoritative plan is now [`TASKS/task-48-distribution-msix.md`](TASKS/task-48-distribution-msix.md).**
|
||||||
|
> Keep this file for the protection sections; do not re-derive a delivery strategy from it.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Polar.sh as the Distribution Backbone
|
## Polar.sh as the Distribution Backbone — ⛔ OBSOLETE (2026-09-27)
|
||||||
|
|
||||||
Polar handles everything between "customer wants to pay" and "customer has a working license key." We don't build any of that. What Polar gives us:
|
> **Historical record only.** Retained because the fee tables and the reasoning about *why*
|
||||||
|
> one-time beat subscription were worth working out. **None of the "How We Use It" rows are
|
||||||
|
> current**, with one exception worth keeping: the Merchant-of-Record point — *someone else
|
||||||
|
> collects and remits VAT/GST* — is still true under Store IAP, because **Microsoft** is now
|
||||||
|
> that someone. That fact alone was the strongest argument for the ruling.
|
||||||
|
|
||||||
|
Polar handled everything between "customer wants to pay" and "customer has a working license key." We didn't build any of that. What Polar *was* going to give us:
|
||||||
|
|
||||||
| Capability | How We Use It |
|
| Capability | How We Use It |
|
||||||
|------------|---------------|
|
|------------|---------------|
|
||||||
@@ -14,13 +44,15 @@ Polar handles everything between "customer wants to pay" and "customer has a wor
|
|||||||
| **File hosting** (up to 10GB) | Upload `LlamaCasty.exe` (self-contained, ~80-120MB) as a "File Download" benefit. Customers get signed, personal download URLs. SHA-256 checksums included. |
|
| **File hosting** (up to 10GB) | Upload `LlamaCasty.exe` (self-contained, ~80-120MB) as a "File Download" benefit. Customers get signed, personal download URLs. SHA-256 checksums included. |
|
||||||
| **Checkout** | Polar's hosted checkout page handles payment. No Stripe integration, no PCI scope, no custom checkout UI. |
|
| **Checkout** | Polar's hosted checkout page handles payment. No Stripe integration, no PCI scope, no custom checkout UI. |
|
||||||
| **Customer portal** | Customers self-serve: view/copy license keys, see expiry, deactivate devices, rotate compromised keys. We don't build a portal. |
|
| **Customer portal** | Customers self-serve: view/copy license keys, see expiry, deactivate devices, rotate compromised keys. We don't build a portal. |
|
||||||
| **Subscriptions** | If we go subscription model (deferred), Polar handles recurring billing, dunning, cancellation. |
|
| **One-time orders** | **Chosen model (2026-09-21):** perpetual license via a one-time Polar order — no subscription. Polar also supports recurring billing if ever needed, but we do not use it. |
|
||||||
| **Merchant of Record** | Polar collects and remits VAT/GST/sales tax globally. We never touch tax compliance. |
|
| **Merchant of Record** | Polar collects and remits VAT/GST/sales tax globally. We never touch tax compliance. |
|
||||||
| **Webhooks** | Polar notifies our backend on purchase, cancellation, key rotation. Used for optional telemetry (section 6.3). |
|
| **Webhooks** | Polar notifies our backend on purchase, cancellation, key rotation. Used for optional telemetry (section 6.3). |
|
||||||
|
|
||||||
**Polar pricing (2026):** 5% + $0.50 per transaction (Starter plan). No monthly fee.
|
**Polar pricing (2026):** 5% + $0.50 per transaction (Starter plan). No monthly fee. ⛔ *No
|
||||||
|
longer paid to anyone — the equivalent cost is now inside the Store revenue share, whose rate
|
||||||
|
is unverified (see `TASKS/research-store-certification.md` §11).*
|
||||||
|
|
||||||
**What Polar does NOT handle:** Obfuscation, code signing, anti-tamper, runtime protection, EULA, DMCA. That's all us — sections 1-3, 5-7 below.
|
**What Polar did NOT handle:** Obfuscation, code signing, anti-tamper, runtime protection, EULA, DMCA. That's all us — sections 1-3, 5-7 below.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -273,24 +305,34 @@ steps:
|
|||||||
### 4.1 Files to Ship
|
### 4.1 Files to Ship
|
||||||
|
|
||||||
```
|
```
|
||||||
LlamaCasty.exe (single-file, self-contained, ~80-120MB)
|
LlamaCasty.msix (full-trust x64 package, self-contained, ~159MB)
|
||||||
```
|
```
|
||||||
|
|
||||||
Single-file means everything is inside the `.exe`. No DLLs, no runtime dependency.
|
Built by **`scripts/package-msix.sh`** (TASK 48 item 2, shipped 2026-10-22): it publishes
|
||||||
|
`Release -r win-x64 --self-contained` into `artifacts/msix-stage`, stages
|
||||||
|
`Packaging/Package.appxmanifest` (as `AppxManifest.xml`) + `Packaging/Assets/`, and packs with
|
||||||
|
the Windows SDK's `makeappx` → `artifacts/LlamaCasty.msix` (gitignored). Unsigned by default —
|
||||||
|
**the Store signs submissions**; set `MSIX_PFX`/`MSIX_PFX_PASSWORD` to sign a package for a
|
||||||
|
local test install. The manifest is a full-trust `packagedClassicApp` at `mediumIL` with
|
||||||
|
`runFullTrust` + webcam + microphone (see `TASKS/task-48-distribution-msix.md` item 2).
|
||||||
|
|
||||||
**Why not an installer?**
|
A single-file `.exe` is **no longer the artifact**: the Store needs a package, and the package
|
||||||
- Single `.exe` is simpler to distribute and update.
|
carries the runtime (~80-120MB of it) plus the bundled ffmpeg (~135MB of DLLs). No installer
|
||||||
- No admin rights required (installs to `%LOCALAPPDATA%`).
|
framework and no admin rights — the Store handles install, update and uninstall.
|
||||||
- No installer framework to maintain (WiX, Inno Setup, etc.).
|
|
||||||
- User drops it anywhere and runs it.
|
|
||||||
|
|
||||||
**Caveat:** Self-contained single-file means ~80-120MB due to bundled .NET runtime. For smaller size, use framework-dependent publishing (requires .NET 8 runtime on user machines) — drops to ~5-10MB.
|
### 4.2 Distribution via Polar — ⛔ OBSOLETE (2026-09-27)
|
||||||
|
|
||||||
### 4.2 Distribution via Polar
|
> **Superseded by Microsoft Store MSIX + Store IAP** (ruling in
|
||||||
|
> `TASKS/task-48-distribution-msix.md` item 0). The Store re-signs, hosts, updates, and takes
|
||||||
|
> payment — so file hosting, license keys, checkout, the customer portal, device deactivation and
|
||||||
|
> key rotation are **all** handled by Microsoft and none of it needs building. Retained below as a
|
||||||
|
> record of the model that was designed and abandoned. ⚠️ **The `$29`/`$49` one-time prices in this
|
||||||
|
> section are dead** — the settled pricing is **`$10/mo` or `$400` lifetime**, net of a verified
|
||||||
|
> 15% Store share.
|
||||||
|
|
||||||
**Product setup on Polar:**
|
**Product setup on Polar (as designed, never shipped):**
|
||||||
|
|
||||||
1. Create a product: "LlamaCasty" — one-time purchase (or subscription if deferred).
|
1. Create a product: "LlamaCasty" — **one-time purchase** (perpetual license; $29 founder / $49 list).
|
||||||
2. Add two benefits:
|
2. Add two benefits:
|
||||||
- **License Key** — brandable prefix `LLAMA-****`, activation limit (e.g., 3 devices), optional expiry.
|
- **License Key** — brandable prefix `LLAMA-****`, activation limit (e.g., 3 devices), optional expiry.
|
||||||
- **File Download** — upload the signed `LlamaCasty.exe` (~80-120MB). Polar generates signed, personal download URLs. SHA-256 checksum included.
|
- **File Download** — upload the signed `LlamaCasty.exe` (~80-120MB). Polar generates signed, personal download URLs. SHA-256 checksum included.
|
||||||
@@ -313,9 +355,43 @@ Single-file means everything is inside the `.exe`. No DLLs, no runtime dependenc
|
|||||||
- If a key is compromised, customer or merchant can rotate it via Polar.
|
- If a key is compromised, customer or merchant can rotate it via Polar.
|
||||||
- Previous key stops validating immediately. Status, usage, limits, expiry preserved.
|
- Previous key stops validating immediately. Status, usage, limits, expiry preserved.
|
||||||
|
|
||||||
|
**What the Store does instead:** the customer installs from the Store listing, pays through Store
|
||||||
|
checkout, and the app reads the entitlement the OS already holds. There is no key to enter, no
|
||||||
|
activation call, no portal to visit, and no offline-grace period to maintain — which also retires
|
||||||
|
the whole "network flaky → app thinks I'm expired" bug class in §4.5.
|
||||||
|
|
||||||
### 4.3 Code Signing
|
### 4.3 Code Signing
|
||||||
|
|
||||||
**Certificate:** Buy an EV (Extended Validation) code-signing certificate from DigiCert or Sectigo ($200-400/year). EV certificates get instant SmartScreen reputation; DV/OV certs trigger SmartScreen warnings for months.
|
> ⚠️ **The cert choice below is a live decision, and the old plan's EV recommendation is
|
||||||
|
> dead.** Microsoft **removed the SmartScreen instant-bypass for EV certificates in March
|
||||||
|
> 2024** — an EV-signed file now accrues reputation exactly like an OV-signed one, so paying
|
||||||
|
> $400+/yr buys precisely what paying ~$150 buys. **Do not buy EV.**
|
||||||
|
>
|
||||||
|
> **But the more interesting finding is that you may not need a certificate at all.** Three
|
||||||
|
> costs, current as of 2026-09-27:
|
||||||
|
>
|
||||||
|
> | Route | Cert/yr | SmartScreen | Note |
|
||||||
|
> |---|---|---|---|
|
||||||
|
> | **Microsoft Store (MSIX)** | **$0** — Microsoft re-signs | **No warning** | Requires MSIX packaging; Store review; public listing |
|
||||||
|
> | **Microsoft Store (EXE/MSI)** | $120–300 — *your* cert | Warning ramp | Store does **not** re-sign; silent install mandatory. Strictly dominated — cert required anyway |
|
||||||
|
> | **Direct + OV cert** | $150–300 | Warning ramp | Worldwide availability |
|
||||||
|
> | **Direct + Azure Artifact Signing** | ~$9.99/mo ≈ $120 | Warning ramp | **Individuals: USA/Canada only.** Identity validation required |
|
||||||
|
>
|
||||||
|
> Signing does **not** clear the warning on day one either way: a valid cert stops the
|
||||||
|
> *malware* warning immediately, but "unrecognized publisher" clears as SmartScreen accrues
|
||||||
|
> reputation from real download volume. Budget cert validity at **460 days** (CA/B Forum
|
||||||
|
> CSC-31) — this is a recurring line item, not a one-time purchase — and note that private
|
||||||
|
> keys must sit on an **HSM or hardware token**.
|
||||||
|
>
|
||||||
|
> **The full comparison, the four real combinations, and the policy analysis live in
|
||||||
|
> [`TASKS/research-store-certification.md`](TASKS/research-store-certification.md) §2–3.
|
||||||
|
> The executable checklist is [`TASKS/task-48-distribution-msix.md`](TASKS/task-48-distribution-msix.md),
|
||||||
|
> and the route decision is the creator's.**
|
||||||
|
|
||||||
|
**Certificate:** Buy an **OV (Organization Validation)** code-signing certificate from DigiCert
|
||||||
|
or Sectigo (~$150–300/year), or an **Azure Artifact Signing** profile (~$9.99/month,
|
||||||
|
USA/Canada individuals only) if the geography allows. ⛔ **Not EV** — no SmartScreen benefit
|
||||||
|
since March 2024. **Or buy nothing at all** if the route is the Microsoft Store.
|
||||||
|
|
||||||
**Signing process:**
|
**Signing process:**
|
||||||
```powershell
|
```powershell
|
||||||
@@ -332,7 +408,15 @@ Set-AuthenticodeSignature -FilePath "LlamaCasty.exe" `
|
|||||||
|
|
||||||
**Storage:** Certificate `.pfx` file stored in GitHub Secrets (or Azure DevOps secure files). Never committed to the repo.
|
**Storage:** Certificate `.pfx` file stored in GitHub Secrets (or Azure DevOps secure files). Never committed to the repo.
|
||||||
|
|
||||||
### 4.4 Update Mechanism
|
### 4.4 Update Mechanism — ⛔ OBSOLETE (2026-09-27)
|
||||||
|
|
||||||
|
> **Superseded by Store updates.** Microsoft delivers and updates the app from the listing, so
|
||||||
|
> there is nothing to check and no manifest to host. The Velopack updater that used to sit in
|
||||||
|
> `App.xaml.cs` **downloaded *and executed***, which Store policy **10.2.2** does not permit — its
|
||||||
|
> removal was a **compliance action**, not optional cleanup, and it is **done** (TASK 48 slice 3,
|
||||||
|
> 2026-10-22: the package reference and the bootstrap are gone; `ytLive.Tests/StorePackagingTests.cs`
|
||||||
|
> guards it). The Polar-native design below is retained as a record of the approach that was
|
||||||
|
> rejected; it is not an option.
|
||||||
|
|
||||||
**Polar-native approach (no custom infrastructure):**
|
**Polar-native approach (no custom infrastructure):**
|
||||||
|
|
||||||
@@ -367,10 +451,18 @@ public class UpdateCheckService
|
|||||||
- Download link points to Polar's customer portal (not direct download).
|
- Download link points to Polar's customer portal (not direct download).
|
||||||
- This adds one external dependency (GitHub) but keeps Polar as the source of truth.
|
- This adds one external dependency (GitHub) but keeps Polar as the source of truth.
|
||||||
|
|
||||||
### 4.5 Licensing Logic (already implemented)
|
### 4.5 Licensing Logic — ⛔ BEING DELETED (2026-09-27)
|
||||||
|
|
||||||
|
> ⚠️ **"Already implemented" was true as of 2026-09-21 and is no longer.** `PolarLicenseService`
|
||||||
|
> and `Helpers/PolarLicense.cs` are being **removed** as part of the TASK 10 teardown (TASK 48 item 0).
|
||||||
|
> Store IAP replaces the whole validation hop: `IsPremium` is derived from the **OS-supplied Store
|
||||||
|
> entitlement**, so there is no network call, no key, and — importantly — **no 14-day offline-grace
|
||||||
|
> machine to protect**, which retires the entire "network flaky → app thinks I'm expired" bug class.
|
||||||
|
> What survives is only `IsPremium` → `BrandFlashEnabled = !value`. Retained below as the record of
|
||||||
|
> what shipped and why it no longer applies.
|
||||||
|
|
||||||
```csharp
|
```csharp
|
||||||
// Services/PolarLicenseService.cs — already ships
|
// Services/PolarLicenseService.cs — shipped under Polar; being deleted
|
||||||
// Calls Polar's customer-portal validation endpoint (no auth required)
|
// Calls Polar's customer-portal validation endpoint (no auth required)
|
||||||
// Survives obfuscation — property names excluded via [Obfuscation(Exclude = true)]
|
// Survives obfuscation — property names excluded via [Obfuscation(Exclude = true)]
|
||||||
[Obfuscation(Exclude = true)]
|
[Obfuscation(Exclude = true)]
|
||||||
@@ -383,11 +475,11 @@ public class LicenseValidationResult
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
**What's already done:**
|
**What shipped under Polar (now being deleted):**
|
||||||
- `PolarLicenseService` validates keys against Polar API.
|
- `PolarLicenseService` validated keys against the Polar API.
|
||||||
- `OrganizationId` is hardcoded (safe — it's public knowledge, tied to our Polar account).
|
- `OrganizationId` was hardcoded.
|
||||||
- License state persists in `LayoutStore.Settings` (SQLite) with offline grace period.
|
- License state persisted in `LayoutStore.Settings` (SQLite) with an offline grace period.
|
||||||
- `PremiumUrl` points to Polar checkout.
|
- `PremiumUrl` pointed to Polar checkout.
|
||||||
|
|
||||||
**What survives obfuscation:** The validation logic in `Services.dll` is obfuscated. An attacker who decompiles the exe sees only the UI calling an interface — the actual Polar API call is in the obfuscated DLL.
|
**What survives obfuscation:** The validation logic in `Services.dll` is obfuscated. An attacker who decompiles the exe sees only the UI calling an interface — the actual Polar API call is in the obfuscated DLL.
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.GoLiveWindow"
|
<Window x:Class="ytLive.GoLiveWindow"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Start Stream" Height="480" Width="520"
|
Title="Start Stream" Height="480" Width="520"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
@@ -22,12 +22,12 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Start Stream" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Start Stream" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,16"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,16"/>
|
||||||
|
|
||||||
<!-- ACCOUNT -->
|
<!-- ACCOUNT -->
|
||||||
<StackPanel Grid.Row="1" Margin="0,0,0,16">
|
<StackPanel Grid.Row="1" Margin="0,0,0,16">
|
||||||
<TextBlock Text="ACCOUNT" FontSize="12" FontWeight="SemiBold"
|
<TextBlock Text="ACCOUNT" FontSize="12" FontWeight="SemiBold"
|
||||||
Foreground="#a0a0b0" Margin="0,0,0,8"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" Margin="0,0,0,8"/>
|
||||||
|
|
||||||
<!-- signed in -->
|
<!-- signed in -->
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -41,11 +41,11 @@
|
|||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
</StackPanel.Style>
|
</StackPanel.Style>
|
||||||
<Border Width="34" Height="34" CornerRadius="17" Background="#16213e" ClipToBounds="True"
|
<Border Width="34" Height="34" CornerRadius="17" Background="{StaticResource Brush.SurfaceContainer}" ClipToBounds="True"
|
||||||
VerticalAlignment="Center" Margin="0,0,10,0">
|
VerticalAlignment="Center" Margin="0,0,10,0">
|
||||||
<Image Source="{Binding AccountAvatarUrl}" Stretch="UniformToFill"/>
|
<Image Source="{Binding AccountAvatarUrl}" Stretch="UniformToFill"/>
|
||||||
</Border>
|
</Border>
|
||||||
<TextBlock Text="{Binding AccountDisplayName}" Foreground="#e0e0e0" FontSize="14"
|
<TextBlock Text="{Binding AccountDisplayName}" Foreground="{StaticResource Brush.OnSurface}" FontSize="14"
|
||||||
VerticalAlignment="Center" Margin="0,0,12,0"/>
|
VerticalAlignment="Center" Margin="0,0,12,0"/>
|
||||||
<Button Content="Change Account" Command="{Binding SignInCommand}"
|
<Button Content="Change Account" Command="{Binding SignInCommand}"
|
||||||
Style="{StaticResource YtButtonSecondary}" VerticalAlignment="Center"/>
|
Style="{StaticResource YtButtonSecondary}" VerticalAlignment="Center"/>
|
||||||
@@ -65,12 +65,12 @@
|
|||||||
</StackPanel.Style>
|
</StackPanel.Style>
|
||||||
<Button Content="Sign in to YouTube" Command="{Binding SignInCommand}"
|
<Button Content="Sign in to YouTube" Command="{Binding SignInCommand}"
|
||||||
Style="{StaticResource YtButtonSecondary}" Margin="0,0,10,0"/>
|
Style="{StaticResource YtButtonSecondary}" Margin="0,0,10,0"/>
|
||||||
<TextBlock Text="Going live requires a YouTube account." Foreground="#a0a0b0" FontSize="12"
|
<TextBlock Text="Going live requires a YouTube account." Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<TextBlock Text="Signing in… open the browser to authorize, then come back here."
|
<TextBlock Text="Signing in… open the browser to authorize, then come back here."
|
||||||
Foreground="#e94560" FontSize="12" Margin="0,8,0,0">
|
Foreground="{StaticResource Brush.Error}" FontSize="12" Margin="0,8,0,0">
|
||||||
<TextBlock.Style>
|
<TextBlock.Style>
|
||||||
<Style TargetType="TextBlock">
|
<Style TargetType="TextBlock">
|
||||||
<Setter Property="Visibility" Value="Collapsed"/>
|
<Setter Property="Visibility" Value="Collapsed"/>
|
||||||
@@ -87,7 +87,7 @@
|
|||||||
<!-- STREAM METADATA -->
|
<!-- STREAM METADATA -->
|
||||||
<StackPanel Grid.Row="2">
|
<StackPanel Grid.Row="2">
|
||||||
<TextBlock Text="STREAM DETAILS" FontSize="12" FontWeight="SemiBold"
|
<TextBlock Text="STREAM DETAILS" FontSize="12" FontWeight="SemiBold"
|
||||||
Foreground="#a0a0b0" Margin="0,0,0,8"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" Margin="0,0,0,8"/>
|
||||||
|
|
||||||
<TextBlock Text="Title" Style="{StaticResource YtLabel}"/>
|
<TextBlock Text="Title" Style="{StaticResource YtLabel}"/>
|
||||||
<TextBox Style="{StaticResource YtTextBox}" Margin="0,0,0,12"
|
<TextBox Style="{StaticResource YtTextBox}" Margin="0,0,0,12"
|
||||||
@@ -100,10 +100,10 @@
|
|||||||
|
|
||||||
<TextBlock Text="Visibility" Style="{StaticResource YtLabel}"/>
|
<TextBlock Text="Visibility" Style="{StaticResource YtLabel}"/>
|
||||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,12">
|
<StackPanel Orientation="Horizontal" Margin="0,0,0,12">
|
||||||
<TextBlock Text="Private" Foreground="#e0e0e0" FontSize="14"
|
<TextBlock Text="Private" Foreground="{StaticResource Brush.OnSurface}" FontSize="14"
|
||||||
VerticalAlignment="Center"/>
|
VerticalAlignment="Center"/>
|
||||||
<TextBlock Text="Streams always start Private — change it on YouTube after going live."
|
<TextBlock Text="Streams always start Private — change it on YouTube after going live."
|
||||||
Foreground="#a0a0b0" FontSize="12" TextWrapping="Wrap"
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" TextWrapping="Wrap"
|
||||||
Margin="10,0,0,0" VerticalAlignment="Center"/>
|
Margin="10,0,0,0" VerticalAlignment="Center"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|||||||
@@ -1,88 +1,37 @@
|
|||||||
# HANDOFF — Session State
|
# HANDOFF — 2026-10-30 (design conversion complete; spacing is a layout pass, not a sweep)
|
||||||
|
|
||||||
## Branch / Commit State
|
## State
|
||||||
|
|
||||||
**`main`**, working tree is **CLEAN**.
|
- Branch `main`, worktree clean. **~20 commits, unpushed** (push at your checkpoint).
|
||||||
|
- **The design conversion is done**: `DESIGN.md` is the contract, `Themes/Tokens.xaml` implements
|
||||||
|
it, and every surface consumes it — UI chrome, all dialogs (typeface included), the VM's state
|
||||||
|
colours via `Helpers/ThemeBrush`, and the on-stream graphics via `Services/Compositor/OutputPalette`
|
||||||
|
(which mirrors the tokens and is checked against them, because the pump thread cannot read app
|
||||||
|
resources). Blue `#38bdf8` is the only interactive accent; red `#ff5451` is live/record;
|
||||||
|
`#e94560` is gone from the product.
|
||||||
|
- Four guards hold it: `DesignTokensTests` (doc ↔ brushes; converted files may not regress to a
|
||||||
|
literal), `ThemeResourceTests` (no dangling `StaticResource` — the class of crash that killed the
|
||||||
|
app on a slider), `OutputPaletteTests` (on-stream ↔ theme), `SocialsPreviewTests` (a real
|
||||||
|
MainWindow, real preview elements) and `DialogTypographyTests` (dialogs inherit Inter).
|
||||||
|
|
||||||
Commits `46978b8` (AGENTS push policy), `fc33022` (HANDOFF), and refactor
|
## Next action
|
||||||
commits `0–5` through `e286719` are **pushed** (incl. `refactor-commit-0..5`).
|
|
||||||
Refactor commits **6–11 are LOCAL ONLY** (policy 2026-08-30: no per-commit
|
|
||||||
push; `git push --tags` only at a user-agreed milestone / "push it"):
|
|
||||||
|
|
||||||
| Commit | Hash | Tag | Partial | Lines |
|
Nothing queued for the design. The **one** item deliberately not swept: the spacing scale. Margins
|
||||||
|--------|------|-----|---------|-------|
|
and paddings are per-side `Thickness`, not the single values `DESIGN.md` defines, so converting
|
||||||
| 6 Audio | `c1126a5` | `refactor-commit-6` | `MainViewModel.Audio.cs` | 408 |
|
them mechanically would change layout without a rationale — that is a layout pass (a designer's
|
||||||
| 7 Trax | `535a501` | `refactor-commit-7` | `MainViewModel.Trax.cs` | 132 |
|
job), not a colour-style sweep. Radii are tokenised where a token was honest; component geometry
|
||||||
| 8 Socials | `c41ff7f` | `refactor-commit-8` | `MainViewModel.Socials.cs` | 161 |
|
(pill halves, 2.5px hairlines) stays literal on purpose.
|
||||||
| 9 Streaming | `e1006a0` | `refactor-commit-9` | `MainViewModel.Streaming.cs` | 787 |
|
|
||||||
| 10 Chat | `3b77a13` | `refactor-commit-10` | `MainViewModel.Chat.cs` | 194 |
|
|
||||||
| 11 Overlays | `1efde5a` | `refactor-commit-11` | `MainViewModel.Overlays.cs` | 194 |
|
|
||||||
|
|
||||||
Nightly summary: **Phase 1 complete.** The plan was 11 partials + scaffold;
|
|
||||||
all live in `ViewModels/`. Core `MainViewModel.cs` shrank 1,890 → **758
|
|
||||||
lines**. Every change: clean build (0 warnings), `scripts/verify.sh` (246
|
|
||||||
passed + 2 known failures only), `scripts/scope-check.sh` with explicit file
|
|
||||||
args, `ViewModels/index.md` updated in the SAME commit, tagged
|
|
||||||
`refactor-commit-N`, no per-commit push.
|
|
||||||
|
|
||||||
## What's In Flight
|
|
||||||
|
|
||||||
Nothing code-in-flight — working tree clean, Phase 1 done.
|
|
||||||
|
|
||||||
**Next (queued, not started): Phase 2 — split `MainWindow.xaml` (1,681 lines)
|
|
||||||
into UserControls.** Same rules: one work unit per control, docs in the same
|
|
||||||
commit, verify + scope-check, commit locally, `git push` only on user go.
|
|
||||||
|
|
||||||
**Push pending:** refactor commits 6–11 + their tags are local. The Session-1
|
|
||||||
push checkpoint was never reached because the user directive was to run the
|
|
||||||
series to completion; Phase 1 completion is the natural milestone to push on
|
|
||||||
explicit user confirmation.
|
|
||||||
|
|
||||||
## Landmines
|
## Landmines
|
||||||
|
|
||||||
- **Pre-existing test failures (do not chase):**
|
- **Not every hex is a theme colour.** `BorderColorPalette` and the chat/socials config defaults
|
||||||
`AudioPipelineTests.Mix_HonorsProviderGains_AndGameMute_KillsTheLoopback` +
|
are USER DATA — they keep their literals. On-stream graphics now come from `OutputPalette`,
|
||||||
`RoundClipInteractionTests.Round_Clip_Corner_Is_Grabbable_And_Shape_Is_Circle`.
|
never from a literal or from app resources (the pump thread must not touch them).
|
||||||
- **Tests occasionally abort early (236/237)** — known flake, accepted by `verify.sh`.
|
- A red settings control is a bug now — red means live/record.
|
||||||
- **App running locks `ytLive.exe`** → build fails MSB3027. Kill PID before building.
|
- Pre-existing: the **full test suite hangs** (WASAPI teardown). Per-class runs are the way.
|
||||||
- **Implicit usings are SDK-default but partials must still carry their own
|
|
||||||
domain usings** (they do not inherit core's): `ICommand`/`ObservableCollection`/
|
|
||||||
`WriteableBitmap`/`DispatcherTimer` etc. are NOT implicit. Grep-verified usings:
|
|
||||||
- Audio: Input, Media, Threading, `NAudio.CoreAudioApi`, `ytLive`, Helpers, Models, Services, Services.Audio
|
|
||||||
- Trax: IO, Media, `Microsoft.Win32`, Helpers, Models, Services.Audio
|
|
||||||
- Socials: Windows, Input, Media, `ytLive`, Helpers, Models, Services, Services.Compositor
|
|
||||||
- Streaming: ObjectModel, IO, Windows, Input, Threading, `Microsoft.Win32`, Helpers, Models, Services, Services.Encoder
|
|
||||||
- Chat: ObjectModel, Media, Media.Imaging, Threading, Helpers, Models, Services
|
|
||||||
- Overlays: Diagnostics, IO, Input, Helpers
|
|
||||||
- **Pre-commit gate:** `scripts/verify.sh` (0-warning build + full tests) and
|
|
||||||
`scripts/scope-check.sh "file1" …` — scope-check REQUIRES explicit file args.
|
|
||||||
- Build from WSL with the Windows dotnet host only (see `AGENTS.md`).
|
|
||||||
|
|
||||||
## Todo state
|
## Pending
|
||||||
|
|
||||||
- MainViewModel refactor: **Phase 1 complete (11/11 partials + scaffold).**
|
- **Launch and eyeball**: fonts render (pack-URI resolution cannot be proven in the test host),
|
||||||
`ViewModels/index.md` has a per-partial table row (code↔commit map in the
|
the blue accent, blue-staged / red-live tiles, and mono telemetry.
|
||||||
tracker section). Core row now describes only what remains (ctor wiring,
|
- Vertical-tier camera check; webcam-cadence take in the failing geometry.
|
||||||
lifecycle, source commands, WebView2 hosting, frame-pump seam,
|
|
||||||
`SelectedElement`, `BrandFlash*`, `BuildCompositorOptions`/`ResolveOutputFrame`).
|
|
||||||
- TASK 3: 27/30 (preview compositor 16, text source 17, alerts 20 still open).
|
|
||||||
- TASK 4: ✅ shipped. TASK 9: items 1–3 shipped; 4–7 open. TASK 10: steps 1–7; Velopack pending.
|
|
||||||
- TASK 18: shipped, creator verification pending. TASK 19/23, 20, 21-A: shipped.
|
|
||||||
- TASK 22 (audio sync offset): not started — required for v1.
|
|
||||||
- Monitoring: cross-partial private access is the point of partial classes —
|
|
||||||
no moved member re-declared anywhere; moved setters reference other partials
|
|
||||||
purely by name.
|
|
||||||
|
|
||||||
## Session summary (2026-08-30)
|
|
||||||
|
|
||||||
- Ran the MainViewModel split to completion under the standing directive
|
|
||||||
("continue until you can continue no longer" — no interruption prompts).
|
|
||||||
- Commits 9 (Streaming), 10 (Chat), 11 (Overlays) landed locally, each ~8:40
|
|
||||||
back-to-back: cut → 0-warning build → verify (246 pass + 2 known) →
|
|
||||||
scope-check → index.md in-commit → `git tag refactor-commit-N`. No push.
|
|
||||||
- Streaming was the hardest cut (interleaved props, master-frame consts,
|
|
||||||
session timer, health pipeline, record rename-on-stop); Chat and Overlays
|
|
||||||
were clean contiguous cuts. One build fix each: Streaming needed
|
|
||||||
`ObjectModel`/`Input`, Chat needed `Media.Imaging` for `WriteableBitmap`.
|
|
||||||
- Docs kept honest throughout: `index.md` rows for Streaming/Chat/Overlays,
|
|
||||||
About-hub row re-pointed to the Overlays partial, core row trimmed each time.
|
|
||||||
|
|||||||
@@ -5,26 +5,40 @@ namespace ytLive.Helpers;
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Minimal file logger used to diagnose startup/shutdown crashes on Windows,
|
/// Minimal file logger used to diagnose startup/shutdown crashes on Windows,
|
||||||
/// where the WPF app has no visible console. Writes to
|
/// where the WPF app has no visible console. Writes to
|
||||||
/// %APPDATA%\ytLlive\startup.log, appending synchronously so entries survive
|
/// %APPDATA%\ytLlive\startup.log (or a per-instance subfolder in DEBUG — see
|
||||||
/// a hard crash.
|
/// InstanceProfile), appending synchronously so entries survive a hard crash.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static class AppLog
|
public static class AppLog
|
||||||
{
|
{
|
||||||
private static readonly string LogPath = Path.Combine(
|
/// <summary>The cap for the live log file. Past this, it rolls to <c>startup.1.log</c>.</summary>
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
private const long DefaultMaxBytes = 5 * 1024 * 1024;
|
||||||
"ytLlive",
|
|
||||||
"startup.log");
|
/// <summary>How many rolled copies to keep (startup.1.log, startup.2.log, …).</summary>
|
||||||
|
private const int RetainedFiles = 1;
|
||||||
|
|
||||||
|
private static readonly string DefaultLogPath = Path.Combine(
|
||||||
|
InstanceProfile.DataRoot, "startup.log");
|
||||||
|
|
||||||
private static readonly object Gate = new();
|
private static readonly object Gate = new();
|
||||||
|
|
||||||
|
/// <summary>Test seam: point the log somewhere else. Null = the real profile's log.</summary>
|
||||||
|
internal static string? PathOverride { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Test seam: the cap that triggers a roll.</summary>
|
||||||
|
internal static long MaxBytes { get; set; } = DefaultMaxBytes;
|
||||||
|
|
||||||
|
private static string LogPath => PathOverride ?? DefaultLogPath;
|
||||||
|
|
||||||
public static void Write(string message)
|
public static void Write(string message)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
lock (Gate)
|
lock (Gate)
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(LogPath)!);
|
var path = LogPath;
|
||||||
File.AppendAllText(LogPath, $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} {message}{Environment.NewLine}");
|
Directory.CreateDirectory(Path.GetDirectoryName(path)!);
|
||||||
|
LogRotation.RollIfNeeded(path, MaxBytes, RetainedFiles);
|
||||||
|
File.AppendAllText(path, $"{DateTime.Now:yyyy-MM-dd HH:mm:ss.fff} {message}{Environment.NewLine}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Data;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>Gives a ComboBox's CLOSED box a different template from its drop-down
|
||||||
|
/// rows (TASK 63).
|
||||||
|
///
|
||||||
|
/// <para>WPF asks an <see cref="ItemTemplateSelector"/> with the ContentPresenter's
|
||||||
|
/// templated parent: the <see cref="ComboBox"/> itself when it renders the closed
|
||||||
|
/// selection box, the <see cref="ComboBoxItem"/> when it renders a row. That is the
|
||||||
|
/// only way to tell the two apart — <c>ComboBox.SelectionBoxItemTemplate</c> is
|
||||||
|
/// read-only, and WPF copies <c>ItemTemplate</c> into it, so a ComboBox otherwise
|
||||||
|
/// cannot show one thing when shut and another when open.</para>
|
||||||
|
///
|
||||||
|
/// <para>Verified against WPF on .NET 8 (2026-10-21): with the rows' presenter the
|
||||||
|
/// templated parent is the ComboBoxItem, with the closed box's it is the ComboBox.</para>
|
||||||
|
/// </summary>
|
||||||
|
public sealed class ClosedBoxTemplateSelector : DataTemplateSelector
|
||||||
|
{
|
||||||
|
/// <summary>The template for the closed box — what the creator reads while the
|
||||||
|
/// drop-down is shut.</summary>
|
||||||
|
public DataTemplate? ClosedTemplate { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The template for the drop-down rows.</summary>
|
||||||
|
public DataTemplate? RowTemplate { get; set; }
|
||||||
|
|
||||||
|
public override DataTemplate? SelectTemplate(object item, DependencyObject container)
|
||||||
|
=> container is FrameworkElement { TemplatedParent: ComboBox }
|
||||||
|
? ClosedTemplate
|
||||||
|
: RowTemplate;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
public class DroppedFramesToBrushConverter : IValueConverter
|
||||||
|
{
|
||||||
|
private static readonly SolidColorBrush Attention = new(Color.FromRgb(0xff, 0x8c, 0x3a));
|
||||||
|
private static readonly SolidColorBrush Clean = new(Colors.White);
|
||||||
|
|
||||||
|
static DroppedFramesToBrushConverter()
|
||||||
|
{
|
||||||
|
Attention.Freeze();
|
||||||
|
Clean.Freeze();
|
||||||
|
}
|
||||||
|
|
||||||
|
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||||
|
=> value is int dropped && dropped > 0 ? Attention : Clean;
|
||||||
|
|
||||||
|
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||||
|
=> throw new NotSupportedException();
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Windows.Data;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
public class DroppedPercentConverter : IMultiValueConverter
|
||||||
|
{
|
||||||
|
public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
|
||||||
|
{
|
||||||
|
var dropped = values.Length > 0 && values[0] is int d ? d : 0;
|
||||||
|
var fps = values.Length > 1 && values[1] is double f ? f : 0;
|
||||||
|
var duration = values.Length > 2 && values[2] is TimeSpan t ? t : TimeSpan.Zero;
|
||||||
|
var total = fps * duration.TotalSeconds;
|
||||||
|
var percent = total > 0 ? dropped / total * 100 : 0;
|
||||||
|
return $"{dropped} ({percent.ToString("0.0", CultureInfo.InvariantCulture)}%)";
|
||||||
|
}
|
||||||
|
|
||||||
|
public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
|
||||||
|
=> throw new NotSupportedException();
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Arrival cadence for one window of a timestamped frame stream: how many frames
|
||||||
|
/// arrived, how far apart they were, and how many gaps were long enough to read
|
||||||
|
/// as a hitch. Fed any shared monotonic clock (<see cref="Stopwatch.GetTimestamp"/>
|
||||||
|
/// values, or a device's system-relative stamps on the same clock) and read through
|
||||||
|
/// <see cref="Summarize"/>.
|
||||||
|
///
|
||||||
|
/// Why it exists: a 60fps container makes a missing camera frame indistinguishable
|
||||||
|
/// from a padded repeat. rawvideo carries no per-frame timestamps — ffmpeg stamps
|
||||||
|
/// frames by ARRIVAL at the declared rate — so the OBS "duplicate on lag" loop
|
||||||
|
/// (FramePump) emits 300 authored frames per 5s whether the renderer managed 300
|
||||||
|
/// composites or 84. The recorded file therefore cannot name the stage that lost
|
||||||
|
/// the frames; only these counters can. The same counter run twice tells the two
|
||||||
|
/// apart: the camera's OWN timestamps vs our ARRIVAL timestamps. Steady camera
|
||||||
|
/// stamps with ragged arrivals means WE dropped it (compositor/reader); ragged in
|
||||||
|
/// both means the camera, USB link, or driver did.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class FrameCadence
|
||||||
|
{
|
||||||
|
/// <summary>Default hitch threshold in ms. 50ms is ~1.5x a 30fps period — a
|
||||||
|
/// missed 30fps frame arrives as ~66ms — so this counts dropped frames without
|
||||||
|
/// flagging ordinary jitter (a 33ms frame can legitimately measure 35ms).</summary>
|
||||||
|
public const double DefaultHitchThresholdMs = 50;
|
||||||
|
|
||||||
|
private readonly double _hitchThresholdMs;
|
||||||
|
private long _firstTicks;
|
||||||
|
private long _previousTicks;
|
||||||
|
private double _gapTicksTotal;
|
||||||
|
private int _frames;
|
||||||
|
private int _gaps;
|
||||||
|
private int _hitches;
|
||||||
|
private double _longestGapMs;
|
||||||
|
|
||||||
|
public FrameCadence(double hitchThresholdMs = DefaultHitchThresholdMs)
|
||||||
|
{
|
||||||
|
if (hitchThresholdMs <= 0)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(hitchThresholdMs), hitchThresholdMs,
|
||||||
|
"Hitch threshold must be positive.");
|
||||||
|
_hitchThresholdMs = hitchThresholdMs;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Frames => _frames;
|
||||||
|
public int Gaps => _gaps;
|
||||||
|
public int Hitches => _hitches;
|
||||||
|
public double HitchThresholdMs => _hitchThresholdMs;
|
||||||
|
|
||||||
|
/// <summary>Records one frame at <paramref name="timestampTicks"/> on the shared
|
||||||
|
/// monotonic clock. Monotonicity is asserted, not trusted: an out-of-order stamp
|
||||||
|
/// (a device whose clock domain differs from ours, a wrapped counter, a dropped
|
||||||
|
/// timestamp) is counted as a frame but produces no gap AND does not become the
|
||||||
|
/// reference for the next one — otherwise a single bad stamp would poison both
|
||||||
|
/// its own interval and the one after it, inventing a multi-second "hitch".</summary>
|
||||||
|
public void Add(long timestampTicks)
|
||||||
|
{
|
||||||
|
if (_frames == 0)
|
||||||
|
{
|
||||||
|
_firstTicks = timestampTicks;
|
||||||
|
_previousTicks = timestampTicks;
|
||||||
|
_frames++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var delta = timestampTicks - _previousTicks;
|
||||||
|
_frames++;
|
||||||
|
if (delta <= 0) return;
|
||||||
|
var gapMs = delta * 1000d / Stopwatch.Frequency;
|
||||||
|
_gaps++;
|
||||||
|
_gapTicksTotal += gapMs;
|
||||||
|
if (gapMs > _longestGapMs) _longestGapMs = gapMs;
|
||||||
|
if (gapMs >= _hitchThresholdMs) _hitches++;
|
||||||
|
_previousTicks = timestampTicks;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FrameCadenceSummary Summarize()
|
||||||
|
{
|
||||||
|
var spanMs = _frames >= 2
|
||||||
|
? (_previousTicks - _firstTicks) * 1000d / Stopwatch.Frequency
|
||||||
|
: 0d;
|
||||||
|
// Rate is gaps-per-span, not frames-per-span: N frames span N-1 periods, and
|
||||||
|
// counting the extra interval would report one extra frame per window.
|
||||||
|
var rate = _gaps > 0 && spanMs > 0 ? _gaps / (spanMs / 1000d) : 0d;
|
||||||
|
return new FrameCadenceSummary(
|
||||||
|
_frames, rate, spanMs, _gaps, _hitches, _longestGapMs,
|
||||||
|
_gaps > 0 ? _gapTicksTotal / _gaps : 0d, _hitchThresholdMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Starts a fresh window, keeping the configured threshold.</summary>
|
||||||
|
public void Reset()
|
||||||
|
{
|
||||||
|
_firstTicks = 0;
|
||||||
|
_previousTicks = 0;
|
||||||
|
_gapTicksTotal = 0;
|
||||||
|
_frames = 0;
|
||||||
|
_gaps = 0;
|
||||||
|
_hitches = 0;
|
||||||
|
_longestGapMs = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>One measured cadence window — see <see cref="FrameCadence"/>.</summary>
|
||||||
|
public readonly record struct FrameCadenceSummary(
|
||||||
|
int Frames,
|
||||||
|
double RatePerSecond,
|
||||||
|
double SpanMs,
|
||||||
|
int Gaps,
|
||||||
|
int Hitches,
|
||||||
|
double LongestGapMs,
|
||||||
|
double AverageGapMs,
|
||||||
|
double HitchThresholdMs)
|
||||||
|
{
|
||||||
|
/// <summary>One-line log form. Identical in shape from every producer (camera
|
||||||
|
/// source, frame pump) so two lines can be read against each other: same window
|
||||||
|
/// length, same fields, same order.</summary>
|
||||||
|
public string Describe(string label) => Frames == 0
|
||||||
|
? $"{label} no frames"
|
||||||
|
: $"{label} {Frames}f/{SpanMs / 1000d:F1}s {RatePerSecond:F1}/s, {Gaps} gaps, " +
|
||||||
|
$"{Hitches} >= {HitchThresholdMs:F0}ms, avg {AverageGapMs:F1}ms, longest {LongestGapMs:F1}ms";
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using System;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Windows.Data;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>Turns a "#RRGGBB" hex string into a brush, so a template can paint a colour
|
||||||
|
/// swatch straight from the palette (TASK 63).
|
||||||
|
///
|
||||||
|
/// <para>Without it the UI would have to hand-build a brush in code — the hand-painted
|
||||||
|
/// approach the theme forbids. A colour is data; the theme paints it.</para></summary>
|
||||||
|
public class HexToBrushConverter : IValueConverter
|
||||||
|
{
|
||||||
|
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
|
||||||
|
{
|
||||||
|
if (value is not string hex || string.IsNullOrWhiteSpace(hex))
|
||||||
|
return Brushes.Transparent;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var colour = (Color)ColorConverter.ConvertFromString(hex.Trim());
|
||||||
|
return new SolidColorBrush(colour);
|
||||||
|
}
|
||||||
|
catch (FormatException)
|
||||||
|
{
|
||||||
|
return Brushes.Transparent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
|
||||||
|
=> throw new NotSupportedException("A brush is not a hex value.");
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Which run of LlamaCasty this process is, and where its private state lives.
|
||||||
|
/// <para><b>Dev-only affordance (creator directive, 2026-09-26).</b> Pre-1.0 the creator
|
||||||
|
/// needs two instances side by side: one streaming, one screen-capturing the other.
|
||||||
|
/// Two instances on one Windows profile collide on state, and two of those collisions
|
||||||
|
/// are hard failures rather than annoyances:
|
||||||
|
/// <list type="bullet">
|
||||||
|
/// <item><b>The SQLite layout DB.</b> The app's model is read-whole-scene / write-whole-scene,
|
||||||
|
/// so two instances saving different layouts clobber each other.</item>
|
||||||
|
/// <item><b>The WebView2 user data folder.</b> Chromium takes an exclusive lock on it; the
|
||||||
|
/// second instance of the same exe simply fails to start.</item>
|
||||||
|
/// <item><b>The auth token store.</b> A test instance would overwrite the real YouTube
|
||||||
|
/// sign-in.</item>
|
||||||
|
/// <item><b>startup.log.</b> Two appenders interleave into one file, so a crash in either
|
||||||
|
/// instance is ambiguous.</item>
|
||||||
|
/// </list>
|
||||||
|
/// So in <c>DEBUG</c> a process can claim an identity and gets its own private root
|
||||||
|
/// under <c>instances\<id></c>: <c>$env:YTLIVE_INSTANCE=2; dotnet run</c>.
|
||||||
|
/// Recording, screen capture and the ffmpeg <c>tools\</c> cache are deliberately LEFT
|
||||||
|
/// shared — the cache should be shared, and the creator chooses the record folder.
|
||||||
|
/// Global hotkeys are also left alone: if both instances register the same one, Windows
|
||||||
|
/// refuses the second, which is the correct answer.</para>
|
||||||
|
/// <para><b>At 1.0 this disappears.</b> The whole implementation is inside
|
||||||
|
/// <c>#if DEBUG</c>; a Release build compiles to the two pass-throughs at the bottom —
|
||||||
|
/// no environment variable, no alternate folder, not even the variable's NAME in the
|
||||||
|
/// binary. Call sites are unconditional, so Release cannot accidentally diverge: it
|
||||||
|
/// always resolves the one real user profile.</para>
|
||||||
|
/// </summary>
|
||||||
|
public static class InstanceProfile
|
||||||
|
{
|
||||||
|
#if DEBUG
|
||||||
|
/// <summary>Environment variable naming this instance. Absent or blank = the primary
|
||||||
|
/// instance on the real user profile.</summary>
|
||||||
|
public const string InstanceVariable = "YTLIVE_INSTANCE";
|
||||||
|
|
||||||
|
/// <summary>This instance's id, or null for the primary instance.</summary>
|
||||||
|
public static string? Id => Sanitize(Environment.GetEnvironmentVariable(InstanceVariable));
|
||||||
|
|
||||||
|
/// <summary>Private state root: the real profile normally, a per-instance subfolder
|
||||||
|
/// when an id is claimed.</summary>
|
||||||
|
public static string DataRoot => Id is { } id
|
||||||
|
? Path.Combine(DefaultRoot, "instances", id)
|
||||||
|
: DefaultRoot;
|
||||||
|
|
||||||
|
/// <summary>Chromium's user data folder, or null to let WebView2 pick its default
|
||||||
|
/// (which is what Release always does). Must be per-instance or the second
|
||||||
|
/// instance dies on Chromium's exclusive lock.</summary>
|
||||||
|
public static string? WebViewDataFolder => Id is null ? null : Path.Combine(DataRoot, "webview2");
|
||||||
|
|
||||||
|
/// <summary>Reject anything that is not a plain path segment, so the variable can
|
||||||
|
/// never be used to walk out of the profile directory or name a UNC path.</summary>
|
||||||
|
private static string? Sanitize(string? raw)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(raw)) return null;
|
||||||
|
var trimmed = raw.Trim();
|
||||||
|
foreach (var c in trimmed)
|
||||||
|
if (!char.IsLetterOrDigit(c) && c != '-' && c != '_') return null;
|
||||||
|
return trimmed;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
// Release: one profile, no alternate paths, no environment variable. Multi-instance
|
||||||
|
// is a development affordance, not a shipping feature.
|
||||||
|
public static string DataRoot => DefaultRoot;
|
||||||
|
public static string? WebViewDataFolder => null;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/// <summary>The one real user profile: <c>%APPDATA%\ytLlive</c>. Note the historical
|
||||||
|
/// double-L — do not "fix" it, users already have their layouts there.</summary>
|
||||||
|
public static string DefaultRoot => Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"ytLlive");
|
||||||
|
}
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Size-capped log rotation.
|
||||||
|
/// <para>When a log file grows past a cap, it is rolled to <c><name>.1.log</c> and a
|
||||||
|
/// fresh one is started, keeping a bounded number of rolled files. The pattern is the
|
||||||
|
/// one every sized logger uses — Serilog's file sink pairs <c>fileSizeLimitBytes</c>
|
||||||
|
/// (the cap) with <c>retainedFileCountLimit</c> (how many rolled files to keep):
|
||||||
|
/// https://github.com/serilog/serilog-sinks-file</para>
|
||||||
|
/// <para><b>Why it lives here and not in the logger:</b> <see cref="AppLog"/>'s call surface
|
||||||
|
/// (156 call sites) must not change, and the rotation rule is worth testing on its own —
|
||||||
|
/// so the policy is a pure function over a path, and <see cref="AppLog"/> just calls it.</para>
|
||||||
|
/// </summary>
|
||||||
|
public static class LogRotation
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Rolls <paramref name="logPath"/> if it has reached <paramref name="maxBytes"/>,
|
||||||
|
/// keeping <paramref name="retainedFiles"/> rolled copies
|
||||||
|
/// (<c>name.1.log</c>, <c>name.2.log</c>, …). Does nothing when the file is missing
|
||||||
|
/// or still under the cap.
|
||||||
|
/// <para>Never throws: a failed rotation must not take the app down — the log just
|
||||||
|
/// keeps growing, which is the old behaviour.</para>
|
||||||
|
/// </summary>
|
||||||
|
public static void RollIfNeeded(string logPath, long maxBytes, int retainedFiles)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var info = new FileInfo(logPath);
|
||||||
|
if (!info.Exists || info.Length < maxBytes)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Oldest first: name.1 → name.2 → … → name.N, then the live file → name.1.
|
||||||
|
for (var i = retainedFiles; i >= 1; i--)
|
||||||
|
{
|
||||||
|
var source = i == 1 ? logPath : RolledPath(logPath, i - 1);
|
||||||
|
var target = RolledPath(logPath, i);
|
||||||
|
if (!File.Exists(source))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
File.Move(source, target, overwrite: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Never let logging itself crash the app.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The rolled path for a given index: <c>startup.log</c> → <c>startup.1.log</c>.</summary>
|
||||||
|
public static string RolledPath(string logPath, int index)
|
||||||
|
{
|
||||||
|
var directory = Path.GetDirectoryName(logPath) ?? string.Empty;
|
||||||
|
var name = Path.GetFileNameWithoutExtension(logPath);
|
||||||
|
var extension = Path.GetExtension(logPath);
|
||||||
|
return Path.Combine(directory, $"{name}.{index}{extension}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
using System;
|
||||||
|
using System.Windows.Input;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
public class RelayCommand<T> : ICommand
|
||||||
|
{
|
||||||
|
private readonly Action<T?> _execute;
|
||||||
|
private readonly Predicate<T?>? _canExecute;
|
||||||
|
|
||||||
|
public RelayCommand(Action<T?> execute, Predicate<T?>? canExecute = null)
|
||||||
|
{
|
||||||
|
_execute = execute;
|
||||||
|
_canExecute = canExecute;
|
||||||
|
}
|
||||||
|
|
||||||
|
public event EventHandler? CanExecuteChanged
|
||||||
|
{
|
||||||
|
add => CommandManager.RequerySuggested += value;
|
||||||
|
remove => CommandManager.RequerySuggested -= value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool CanExecute(object? parameter)
|
||||||
|
{
|
||||||
|
if (parameter is T t) return _canExecute?.Invoke(t) ?? true;
|
||||||
|
return _canExecute?.Invoke(default) ?? true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Execute(object? parameter)
|
||||||
|
{
|
||||||
|
if (parameter is T t) _execute(t);
|
||||||
|
else _execute(default);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A fixed pool of four DEDICATED background threads at <see cref="ThreadPriority.BelowNormal"/>
|
||||||
|
/// that split one composite into horizontal row strips. The compositor needs the split to get
|
||||||
|
/// render inside a 16.67ms slot, but it must not compete with the encoder, the WGC capture
|
||||||
|
/// callbacks, the WebView2 chat or the game the user is playing — hence the hard cap of four
|
||||||
|
/// and the demotion.
|
||||||
|
///
|
||||||
|
/// Research (2026-10-05, Unit 5): the demotion must NOT be done by poking
|
||||||
|
/// <c>Thread.CurrentThread.Priority</c> inside <c>Parallel.For</c> — the pool is shared, so the
|
||||||
|
/// demotion leaks into every unrelated work item that thread later runs
|
||||||
|
/// (https://stackoverflow.com/questions/524483/net-backgroundworker-objects-thread-priority:
|
||||||
|
/// "you have next to no control of which thread pool thread will actually run your task");
|
||||||
|
/// https://stackoverflow.com/questions/1578599/c-sharp-lower-thread-priority-in-thread-pool:
|
||||||
|
/// "You shouldn't mess with the priority of the regular ThreadPool, since you aren't the only
|
||||||
|
/// consumer ... write your own producer/consumer queue, using your own Thread(s) as the
|
||||||
|
/// consumer(s) — setting the thread priority yourself"). A real failed attempt confirmed it: a
|
||||||
|
/// full test run after demoting the pool threads broke an unrelated audio-mix timing test.
|
||||||
|
/// This class IS that producer/consumer queue; the caller thread is the producer and also runs
|
||||||
|
/// one strip itself, so four workers never means five-way oversubscription.
|
||||||
|
///
|
||||||
|
/// Contract: <see cref="For"/> blocks until every strip has run, each strip must write only its
|
||||||
|
/// own rows (the compositor's blits already partition by row), and it must not be called from
|
||||||
|
/// inside a strip (the blits never nest).
|
||||||
|
/// </summary>
|
||||||
|
internal static class StripPool
|
||||||
|
{
|
||||||
|
/// <summary>Four workers: the measured sweet spot on this box. Fewer leaves render over
|
||||||
|
/// budget; more steals cycles from the game and the encoder and made render worse, not better.</summary>
|
||||||
|
public const int Workers = 4;
|
||||||
|
|
||||||
|
/// <summary>Below this many rows the fan-out costs more than it saves — run it inline.</summary>
|
||||||
|
private const int MinRowsForFanOut = 64;
|
||||||
|
|
||||||
|
private static readonly object[] _queueLocks = CreateLocks();
|
||||||
|
private static readonly Queue<Strip>[] _queues = CreateQueues();
|
||||||
|
private static readonly Queue<Strip>[] _free = CreateQueues();
|
||||||
|
private static readonly SemaphoreSlim[] _signals = CreateSignals();
|
||||||
|
private static Thread[]? _threads;
|
||||||
|
private static int _roundRobin = -1;
|
||||||
|
|
||||||
|
private sealed class Strip
|
||||||
|
{
|
||||||
|
public int From;
|
||||||
|
public int To; // exclusive
|
||||||
|
public Action<int>? Body;
|
||||||
|
public Batch? Owner;
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class Batch
|
||||||
|
{
|
||||||
|
public int Remaining;
|
||||||
|
public Exception? Error;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Run <paramref name="body"/> for every row in [from, to), split across the pool.</summary>
|
||||||
|
public static void For(int from, int to, Action<int> body)
|
||||||
|
{
|
||||||
|
if (from >= to) return;
|
||||||
|
|
||||||
|
var rows = to - from;
|
||||||
|
if (rows < MinRowsForFanOut || !EnsureStarted())
|
||||||
|
{
|
||||||
|
for (var y = from; y < to; y++) body(y);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Strips are handed to whole workers (not per-row tasks) so the strip boundaries —
|
||||||
|
// and therefore the destination row each strip owns — are fixed before any of them run.
|
||||||
|
var strips = Math.Min(Workers, rows);
|
||||||
|
var chunk = (rows + strips - 1) / strips;
|
||||||
|
var batch = new Batch { Remaining = strips - 1 }; // the caller runs the last one
|
||||||
|
|
||||||
|
var first = from;
|
||||||
|
for (var k = 0; k < strips - 1; k++)
|
||||||
|
{
|
||||||
|
var end = Math.Min(first + chunk, to);
|
||||||
|
var w = NextWorker();
|
||||||
|
var strip = Rent(w);
|
||||||
|
strip.From = first;
|
||||||
|
strip.To = end;
|
||||||
|
strip.Body = body;
|
||||||
|
strip.Owner = batch;
|
||||||
|
lock (_queueLocks[w]) _queues[w].Enqueue(strip);
|
||||||
|
_signals[w].Release();
|
||||||
|
first = end;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
for (var y = first; y < to; y++) body(y);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
batch.Error ??= ex;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (batch.Remaining > 0)
|
||||||
|
{
|
||||||
|
lock (batch)
|
||||||
|
{
|
||||||
|
while (batch.Remaining > 0) Monitor.Wait(batch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (batch.Error != null) throw new InvalidOperationException("A compositor strip failed.", batch.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void Worker(int index)
|
||||||
|
{
|
||||||
|
var signal = _signals[index];
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
signal.Wait();
|
||||||
|
Strip? strip = null;
|
||||||
|
lock (_queueLocks[index])
|
||||||
|
{
|
||||||
|
if (_queues[index].Count > 0) strip = _queues[index].Dequeue();
|
||||||
|
}
|
||||||
|
if (strip == null) continue; // released for an already-drained queue
|
||||||
|
var batch = strip.Owner!;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
for (var y = strip.From; y < strip.To; y++) strip.Body!(y);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
batch.Error ??= ex;
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
strip.Body = null;
|
||||||
|
strip.Owner = null;
|
||||||
|
lock (_queueLocks[index]) _free[index].Enqueue(strip);
|
||||||
|
lock (batch)
|
||||||
|
{
|
||||||
|
if (--batch.Remaining == 0) Monitor.PulseAll(batch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Strip Rent(int worker)
|
||||||
|
{
|
||||||
|
lock (_queueLocks[worker])
|
||||||
|
return _free[worker].Count > 0 ? _free[worker].Dequeue() : new Strip();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static int NextWorker()
|
||||||
|
{
|
||||||
|
var w = Interlocked.Increment(ref _roundRobin) % Workers;
|
||||||
|
return w < 0 ? w + Workers : w;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Start the workers on first use, so a WPF cold start pays nothing for them.</summary>
|
||||||
|
private static bool EnsureStarted()
|
||||||
|
{
|
||||||
|
if (_threads != null) return true;
|
||||||
|
lock (_signals)
|
||||||
|
{
|
||||||
|
if (_threads != null) return true;
|
||||||
|
var threads = new Thread[Workers];
|
||||||
|
for (var i = 0; i < Workers; i++)
|
||||||
|
{
|
||||||
|
var index = i; // capture per-iteration: the loop variable would be Workers by the time the thread runs
|
||||||
|
var t = new Thread(() => Worker(index), 256 * 1024)
|
||||||
|
{
|
||||||
|
IsBackground = true,
|
||||||
|
Name = $"compositor-strip-{i}",
|
||||||
|
Priority = ThreadPriority.BelowNormal,
|
||||||
|
};
|
||||||
|
threads[i] = t;
|
||||||
|
t.Start();
|
||||||
|
}
|
||||||
|
_threads = threads;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static object[] CreateLocks()
|
||||||
|
{
|
||||||
|
var l = new object[Workers];
|
||||||
|
for (var i = 0; i < Workers; i++) l[i] = new object();
|
||||||
|
return l;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Queue<Strip>[] CreateQueues()
|
||||||
|
{
|
||||||
|
var q = new Queue<Strip>[Workers];
|
||||||
|
for (var i = 0; i < Workers; i++) q[i] = new Queue<Strip>();
|
||||||
|
return q;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SemaphoreSlim[] CreateSignals()
|
||||||
|
{
|
||||||
|
var s = new SemaphoreSlim[Workers];
|
||||||
|
for (var i = 0; i < Workers; i++) s[i] = new SemaphoreSlim(0, int.MaxValue);
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
/// <summary>Resolves a design token for code that cannot bind — view-model state colours (the
|
||||||
|
/// top bar, the health banner, the meters, toast tints). The values live once, in
|
||||||
|
/// <c>Themes/Tokens.xaml</c>; this reads them from the application resources.
|
||||||
|
///
|
||||||
|
/// <para>Why not a Brush field per colour: a second list in C# would drift from the theme. Why not
|
||||||
|
/// OutputPalette: that one exists for the frame-pump thread, which must not touch resources; these
|
||||||
|
/// properties are read by bindings on the UI thread.</para>
|
||||||
|
///
|
||||||
|
/// <para>Without an Application (unit tests, design-time) a neutral grey comes back: visibly wrong
|
||||||
|
/// rather than silently plausible, and never a crash.</para></summary>
|
||||||
|
internal static class ThemeBrush
|
||||||
|
{
|
||||||
|
private static readonly SolidColorBrush Missing = Frozen(Color.FromRgb(0x80, 0x80, 0x80));
|
||||||
|
|
||||||
|
/// <summary>The brush for a token key, e.g. <c>ThemeBrush.Get("Brush.Primary")</c>.</summary>
|
||||||
|
public static SolidColorBrush Get(string key)
|
||||||
|
=> Application.Current?.TryFindResource(key) as SolidColorBrush ?? Missing;
|
||||||
|
|
||||||
|
/// <summary>The token's colour as a browser-style hex string, for APIs that take one
|
||||||
|
/// (Notification.Wpf's <c>NotificationColor.FromHex</c>, for instance).</summary>
|
||||||
|
public static string Hex(string key)
|
||||||
|
{
|
||||||
|
var c = Get(key).Color;
|
||||||
|
return c.A == 255
|
||||||
|
? $"#{c.R:x2}{c.G:x2}{c.B:x2}"
|
||||||
|
: $"#{c.A:x2}{c.R:x2}{c.G:x2}{c.B:x2}";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SolidColorBrush Frozen(Color colour)
|
||||||
|
{
|
||||||
|
var brush = new SolidColorBrush(colour);
|
||||||
|
brush.Freeze();
|
||||||
|
return brush;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,9 +14,7 @@ namespace ytLive.Helpers;
|
|||||||
public static class TokenStore
|
public static class TokenStore
|
||||||
{
|
{
|
||||||
public static string DefaultPath => Path.Combine(
|
public static string DefaultPath => Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
InstanceProfile.DataRoot, "ytLlive.auth");
|
||||||
"ytLlive",
|
|
||||||
"ytLlive.auth");
|
|
||||||
|
|
||||||
public static void Save(YouTubeChannel channel, string? path = null)
|
public static void Save(YouTubeChannel channel, string? path = null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ Cross-cutting utilities. See [`schema.md`](../schema.md) for the memory-map conv
|
|||||||
|------|---------|
|
|------|---------|
|
||||||
| `ViewModelBase.cs` | `INotifyPropertyChanged` + `SetProperty<T>()` — base for all ViewModels |
|
| `ViewModelBase.cs` | `INotifyPropertyChanged` + `SetProperty<T>()` — base for all ViewModels |
|
||||||
| `RelayCommand.cs` | `ICommand` implementation for all button actions |
|
| `RelayCommand.cs` | `ICommand` implementation for all button actions |
|
||||||
| `AppLog.cs` | File logger to `%APPDATA%\ytLlive\startup.log`; startup checkpoints + unhandled-exception capture (the crash this map is named for) |
|
| `AppLog.cs` | File logger to `%APPDATA%\ytLlive\startup.log`; startup checkpoints + unhandled-exception capture (the crash this map is named for). Size-capped: rolls to `startup.1.log` at 5 MB (TASK 55) |
|
||||||
|
| `LogRotation.cs` | The size-capped-rotation policy as a pure function over a path: roll `startup.log` → `startup.1.log` when it passes the cap, keeping N rolled copies. Separate from `AppLog` so the logger's 156-call-site surface never changes and the rule is testable alone (TASK 55) |
|
||||||
| `FocusPreservingListBox.cs` | `ListBox` subclass that keeps selection/focus coherent when the selected item is deleted; `IsSelectable` predicate skips hidden scenes; drag-reorder guard |
|
| `FocusPreservingListBox.cs` | `ListBox` subclass that keeps selection/focus coherent when the selected item is deleted; `IsSelectable` predicate skips hidden scenes; drag-reorder guard |
|
||||||
| `OAuthCredentials.cs` | Baked-in Google OAuth client ID/secret (desktop app; loopback callback) |
|
| `OAuthCredentials.cs` | Baked-in Google OAuth client ID/secret (desktop app; loopback callback) |
|
||||||
| `TokenStore.cs` | DPAPI-protected OAuth session persistence (`%APPDATA%\ytLlive\ytLlive.auth`, CurrentUser scope); `Save`/`Load`/`Clear` — sign-in survives restarts |
|
| `TokenStore.cs` | DPAPI-protected OAuth session persistence (`%APPDATA%\ytLlive\ytLlive.auth`, CurrentUser scope); `Save`/`Load`/`Clear` — sign-in survives restarts |
|
||||||
@@ -14,6 +15,10 @@ Cross-cutting utilities. See [`schema.md`](../schema.md) for the memory-map conv
|
|||||||
| `InverseBoolToVisibilityConverter.cs` / `NotNullToVisibilityConverter.cs` | XAML value converters for visibility bindings |
|
| `InverseBoolToVisibilityConverter.cs` / `NotNullToVisibilityConverter.cs` | XAML value converters for visibility bindings |
|
||||||
| `AllTrueToVisibilityConverter.cs` | Multi-value AND-gate → Visible; gates the layer-row capture menu items on row-IsBackground + staged-scene-is-Live (TASK 25) |
|
| `AllTrueToVisibilityConverter.cs` | Multi-value AND-gate → Visible; gates the layer-row capture menu items on row-IsBackground + staged-scene-is-Live (TASK 25) |
|
||||||
| `CameraConflictProbe.cs` | Best-effort diagnostic: when a camera won't start, enumerates running processes known to hold cameras (OBS, Zoom, Teams, NVIDIA Broadcast, browsers, etc.) — Windows doesn't expose "which process has this device" via any public API, so this is a suspect list, not a verdict |
|
| `CameraConflictProbe.cs` | Best-effort diagnostic: when a camera won't start, enumerates running processes known to hold cameras (OBS, Zoom, Teams, NVIDIA Broadcast, browsers, etc.) — Windows doesn't expose "which process has this device" via any public API, so this is a suspect list, not a verdict |
|
||||||
|
| `StripPool.cs` | Four DEDICATED background threads at `BelowNormal` priority that split one composite into horizontal row strips (the caller runs a strip too); started lazily, runs inline below 64 rows. UNIT 5 — do NOT demote the ThreadPool from `Parallel.For`, it leaks into unrelated work (see [`docs/ai/frame-pipeline.md`](../docs/ai/frame-pipeline.md) → "Render budget") |
|
||||||
|
| `FrameCadence.cs` | Pure arrival-cadence counter (`FrameCadence` + `FrameCadenceSummary.Describe`): frames, gaps, hitches, longest/avg gap for a window of a timestamped stream. Fed by `MediaCaptureFrameSource` (camera stamps vs our arrivals) and `FramePump` (distinct webcam Epochs that reached the output) — UNIT 0, see [`docs/ai/frame-pipeline.md`](../docs/ai/frame-pipeline.md) → "Frame cadence" |
|
||||||
|
| `HexToBrushConverter.cs` | A "#RRGGBB" hex string → `SolidColorBrush` (transparent on bad input), so a template can paint a colour swatch straight from the palette. Registered in the theme as `HexToBrush` — the theme paints the colour, never the UI code (TASK 63) |
|
||||||
|
| `ClosedBoxTemplateSelector.cs` | An `ItemTemplateSelector` that gives a ComboBox's CLOSED box a different template from its drop-down rows: WPF calls it with the `ContentPresenter`'s templated parent — the `ComboBox` for the closed box, the `ComboBoxItem` for a row. The only way to tell them apart (`SelectionBoxItemTemplate` is read-only and mirrors `ItemTemplate`) — TASK 63 |
|
||||||
|
|
||||||
Related: [`Themes/Controls.xaml`](../Themes/Controls.xaml) styles the lists this
|
Related: [`Themes/Controls.xaml`](../Themes/Controls.xaml) styles the lists this
|
||||||
class backs; [`Models/index.md`](../Models/index.md) and
|
class backs; [`Models/index.md`](../Models/index.md) and
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.HotkeyConfigDialog"
|
<Window x:Class="ytLive.HotkeyConfigDialog"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Global Hotkey Bindings" Height="520" Width="480"
|
Title="Global Hotkey Bindings" Height="520" Width="480"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
<BooleanToVisibilityConverter x:Key="BoolToVis"/>
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Global Hotkey Bindings" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Global Hotkey Bindings" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
|
||||||
<ItemsControl ItemsSource="{Binding Rows}">
|
<ItemsControl ItemsSource="{Binding Rows}">
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Column="0" Text="{Binding ActionName}"
|
<TextBlock Grid.Column="0" Text="{Binding ActionName}"
|
||||||
Foreground="#e0e0e0" FontSize="13"
|
Foreground="{StaticResource Brush.OnSurface}" FontSize="13"
|
||||||
VerticalAlignment="Center" Margin="0,0,12,0"/>
|
VerticalAlignment="Center" Margin="0,0,12,0"/>
|
||||||
|
|
||||||
<Button Grid.Column="1" Click="ChordButton_Click"
|
<Button Grid.Column="1" Click="ChordButton_Click"
|
||||||
@@ -42,8 +42,8 @@
|
|||||||
HorizontalAlignment="Left" MinWidth="140"
|
HorizontalAlignment="Left" MinWidth="140"
|
||||||
Padding="10,5" FontSize="13"
|
Padding="10,5" FontSize="13"
|
||||||
VerticalAlignment="Center">
|
VerticalAlignment="Center">
|
||||||
<Border Background="#16213e" CornerRadius="4" Padding="10,5">
|
<Border Background="{StaticResource Brush.SurfaceContainer}" CornerRadius="4" Padding="10,5">
|
||||||
<TextBlock Text="{Binding DisplayText}" Foreground="#e0e0e0"
|
<TextBlock Text="{Binding DisplayText}" Foreground="{StaticResource Brush.OnSurface}"
|
||||||
FontSize="13"/>
|
FontSize="13"/>
|
||||||
</Border>
|
</Border>
|
||||||
</Button>
|
</Button>
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
<Button Grid.Column="2" Content="✕" Click="UnbindButton_Click"
|
<Button Grid.Column="2" Content="✕" Click="UnbindButton_Click"
|
||||||
Tag="{Binding}" Cursor="Hand"
|
Tag="{Binding}" Cursor="Hand"
|
||||||
ToolTip="Remove binding"
|
ToolTip="Remove binding"
|
||||||
FontSize="12" Foreground="#8a93a8"
|
FontSize="12" Foreground="{StaticResource Brush.OnSurfaceVariant}"
|
||||||
Background="Transparent" BorderThickness="0"
|
Background="Transparent" BorderThickness="0"
|
||||||
Padding="6,4" VerticalAlignment="Center">
|
Padding="6,4" VerticalAlignment="Center">
|
||||||
<Button.Style>
|
<Button.Style>
|
||||||
@@ -71,8 +71,8 @@
|
|||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|
||||||
<!-- Conflict warning: hidden when no message -->
|
<!-- Conflict warning: hidden when no message -->
|
||||||
<Border Grid.Row="2" Background="#3d1a1a" CornerRadius="4" Padding="10,8"
|
<Border Grid.Row="2" Background="{StaticResource Brush.ErrorContainer}" CornerRadius="4" Padding="10,8"
|
||||||
Margin="0,8,0,0" BorderBrush="#e94560" BorderThickness="1">
|
Margin="0,8,0,0" BorderBrush="{StaticResource Brush.Error}" BorderThickness="1">
|
||||||
<Border.Style>
|
<Border.Style>
|
||||||
<Style TargetType="Border">
|
<Style TargetType="Border">
|
||||||
<Style.Triggers>
|
<Style.Triggers>
|
||||||
@@ -82,7 +82,7 @@
|
|||||||
</Style.Triggers>
|
</Style.Triggers>
|
||||||
</Style>
|
</Style>
|
||||||
</Border.Style>
|
</Border.Style>
|
||||||
<TextBlock Text="{Binding ConflictMessage}" Foreground="#e94560"
|
<TextBlock Text="{Binding ConflictMessage}" Foreground="{StaticResource Brush.Error}"
|
||||||
FontSize="12" TextWrapping="Wrap"/>
|
FontSize="12" TextWrapping="Wrap"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<Window x:Class="ytLive.KeepBroadcastDialog"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
Title="Keep this broadcast?" Height="240" Width="460"
|
||||||
|
Icon="/ytLive;component/Assets/llamacasty-icon.png"
|
||||||
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
|
<Grid Margin="24">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="0" Text="Keep this broadcast?" FontSize="18" FontWeight="Bold"
|
||||||
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="1" x:Name="MessageText" TextWrapping="Wrap" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13"
|
||||||
|
Margin="0,0,0,16"/>
|
||||||
|
|
||||||
|
<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
|
||||||
|
<Button x:Name="DeleteBroadcastButton" Content="Delete" IsCancel="True" Click="Delete_Click"
|
||||||
|
Style="{StaticResource YtButtonSecondary}" Margin="0,0,8,0"
|
||||||
|
ToolTip="Esc — delete the recording from YouTube"/>
|
||||||
|
<Button x:Name="KeepBroadcastButton" Content="Keep" IsDefault="True" Click="Keep_Click"
|
||||||
|
Style="{StaticResource YtButton}" MinWidth="90"
|
||||||
|
ToolTip="Enter — keep it on YouTube as a private video"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
using System.Windows;
|
||||||
|
|
||||||
|
namespace ytLive;
|
||||||
|
|
||||||
|
/// <summary>Asked when a PRIVATE broadcast ends — the same contract as the recording's save
|
||||||
|
/// dialog (creator ruling 2026-10-09): <b>Enter keeps</b> it on YouTube as a private video,
|
||||||
|
/// <b>Escape deletes</b> it. <c>DialogResult == true</c> = keep; false (Delete, Escape, the X)
|
||||||
|
/// = delete.</summary>
|
||||||
|
public partial class KeepBroadcastDialog : Window
|
||||||
|
{
|
||||||
|
public KeepBroadcastDialog(string title)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
MessageText.Text = string.IsNullOrWhiteSpace(title)
|
||||||
|
? "Your private broadcast is on YouTube as a private video. Keep it, or delete it?"
|
||||||
|
: $"\u201c{title}\u201d is on YouTube as a private video. Keep it, or delete it?";
|
||||||
|
Loaded += (_, _) => KeepBroadcastButton.Focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Keep_Click(object sender, RoutedEventArgs e) => DialogResult = true;
|
||||||
|
|
||||||
|
private void Delete_Click(object sender, RoutedEventArgs e) => DialogResult = false;
|
||||||
|
}
|
||||||
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -12,7 +12,8 @@
|
|||||||
Title="{Binding WindowTitle}" Height="1040" Width="1920"
|
Title="{Binding WindowTitle}" Height="1040" Width="1920"
|
||||||
MinWidth="1366" MinHeight="768"
|
MinWidth="1366" MinHeight="768"
|
||||||
Icon="/ytLive;component/Assets/llamacasty-icon.png"
|
Icon="/ytLive;component/Assets/llamacasty-icon.png"
|
||||||
Background="#1a1a2e"
|
Background="{StaticResource Brush.Background}"
|
||||||
|
FontFamily="{StaticResource FontFamily.Sans}"
|
||||||
WindowStartupLocation="Manual"
|
WindowStartupLocation="Manual"
|
||||||
Closing="MainWindow_Closing"
|
Closing="MainWindow_Closing"
|
||||||
Loaded="MainWindow_Loaded"
|
Loaded="MainWindow_Loaded"
|
||||||
@@ -31,12 +32,14 @@
|
|||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
|
<Helpers:DroppedFramesToBrushConverter x:Key="DroppedToBrush"/>
|
||||||
|
<Helpers:DroppedPercentConverter x:Key="DroppedPercent"/>
|
||||||
|
|
||||||
<!-- Red dot shown in the taskbar icon while live -->
|
<!-- Red dot shown in the taskbar icon while live -->
|
||||||
<DrawingImage x:Key="LiveOverlay">
|
<DrawingImage x:Key="LiveOverlay">
|
||||||
<DrawingImage.Drawing>
|
<DrawingImage.Drawing>
|
||||||
<DrawingGroup>
|
<DrawingGroup>
|
||||||
<GeometryDrawing Brush="#e94560">
|
<GeometryDrawing Brush="{StaticResource Brush.Tertiary}">
|
||||||
<GeometryDrawing.Geometry>
|
<GeometryDrawing.Geometry>
|
||||||
<EllipseGeometry Center="8,8" RadiusX="8" RadiusY="8"/>
|
<EllipseGeometry Center="8,8" RadiusX="8" RadiusY="8"/>
|
||||||
</GeometryDrawing.Geometry>
|
</GeometryDrawing.Geometry>
|
||||||
@@ -45,24 +48,10 @@
|
|||||||
</DrawingImage.Drawing>
|
</DrawingImage.Drawing>
|
||||||
</DrawingImage>
|
</DrawingImage>
|
||||||
|
|
||||||
<!-- Eye icon: open when visible, slashed when hidden (source rows) -->
|
<!-- EyeButton/EyeIconStyle MOVED to Themes/Controls.xaml (2026-09-01): Controls/
|
||||||
<Style x:Key="EyeIconStyle" TargetType="Path">
|
LeftPanel.xaml consumes them via StaticResource, and window-scope resources
|
||||||
<Setter Property="Data" Value="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
|
are invisible to a UserControl at parse time — the "known test failure" that
|
||||||
<Style.Triggers>
|
was actually an app-crash regression from the LeftPanel extraction. -->
|
||||||
<DataTrigger Binding="{Binding IsVisible}" Value="False">
|
|
||||||
<Setter Property="Data" Value="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
|
|
||||||
</DataTrigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style x:Key="EyeButton" TargetType="Button" BasedOn="{StaticResource IconButton}">
|
|
||||||
<Setter Property="ToolTip" Value="Hide Layer"/>
|
|
||||||
<Style.Triggers>
|
|
||||||
<DataTrigger Binding="{Binding IsVisible}" Value="False">
|
|
||||||
<Setter Property="ToolTip" Value="Show Layer"/>
|
|
||||||
</DataTrigger>
|
|
||||||
</Style.Triggers>
|
|
||||||
</Style>
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Window.Resources>
|
</Window.Resources>
|
||||||
|
|
||||||
@@ -88,12 +77,65 @@
|
|||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="1*" MinWidth="220" MaxWidth="360"/>
|
<ColumnDefinition Width="360"/>
|
||||||
<ColumnDefinition Width="3*"/>
|
<ColumnDefinition Width="3*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<!-- ═══ THUMBNAIL STRIP ═══ -->
|
<!-- STREAM READOUTS (top-left cell, above the layers) + resolution -->
|
||||||
<controls:SceneThumbnailStrip Grid.Row="0" Grid.ColumnSpan="2"/>
|
<Border Grid.Row="0" Grid.Column="0" Background="{StaticResource Brush.SurfaceContainerLowest}" CornerRadius="4" Padding="10,8" Margin="0,0,8,0">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition Width="Auto"/>
|
||||||
|
<ColumnDefinition Width="*"/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="0" Grid.Column="0" Text="Bitrate" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" Margin="0,0,12,2"/>
|
||||||
|
<TextBlock Grid.Row="0" Grid.Column="1" Foreground="{StaticResource Brush.OnSurface}" FontSize="13" FontFamily="{StaticResource FontFamily.Mono}" HorizontalAlignment="Right" Margin="0,0,0,2">
|
||||||
|
<Run Text="{Binding CurrentHealth.CurrentBitrate, Mode=OneWay, StringFormat={}{0:0.0}}"/><Run Text=" Mbps"/>
|
||||||
|
</TextBlock>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="1" Grid.Column="0" Text="FPS" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" Margin="0,0,12,2"/>
|
||||||
|
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding CurrentHealth.FPS, Mode=OneWay, StringFormat={}{0:0}}"
|
||||||
|
Foreground="{StaticResource Brush.OnSurface}" FontSize="13" FontFamily="{StaticResource FontFamily.Mono}" HorizontalAlignment="Right" Margin="0,0,0,2"/>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="2" Grid.Column="0" Text="Dropped" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" Margin="0,0,12,2"/>
|
||||||
|
<TextBlock Grid.Row="2" Grid.Column="1" FontSize="13" FontFamily="{StaticResource FontFamily.Mono}" HorizontalAlignment="Right" Margin="0,0,0,2"
|
||||||
|
Foreground="{Binding CurrentHealth.DroppedFrames, Converter={StaticResource DroppedToBrush}}">
|
||||||
|
<TextBlock.Text>
|
||||||
|
<MultiBinding Converter="{StaticResource DroppedPercent}">
|
||||||
|
<Binding Path="CurrentHealth.DroppedFrames" Mode="OneWay"/>
|
||||||
|
<Binding Path="CurrentHealth.FPS" Mode="OneWay"/>
|
||||||
|
<Binding Path="CurrentHealth.StreamDuration" Mode="OneWay"/>
|
||||||
|
</MultiBinding>
|
||||||
|
</TextBlock.Text>
|
||||||
|
</TextBlock>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="3" Grid.Column="0" Text="Live:" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="12" Margin="0,0,12,2"/>
|
||||||
|
<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding CurrentHealth.StreamDuration, Mode=OneWay, StringFormat={}{0:hh\:mm\:ss}}"
|
||||||
|
Foreground="{StaticResource Brush.Attention}" FontSize="13" FontFamily="{StaticResource FontFamily.Mono}" FontWeight="SemiBold" HorizontalAlignment="Right" Margin="0,0,0,2"/>
|
||||||
|
|
||||||
|
<TextBlock Grid.Row="4" Grid.ColumnSpan="2" Text="{Binding CurrentHealth.HealthMessage}"
|
||||||
|
Foreground="{StaticResource Brush.Attention}" FontSize="12" TextWrapping="Wrap" Margin="0,0,0,6"/>
|
||||||
|
|
||||||
|
<ComboBox Grid.Row="5" Grid.ColumnSpan="2" VerticalAlignment="Bottom" Style="{StaticResource YtComboBox}"
|
||||||
|
ItemsSource="{Binding QualityOptions}"
|
||||||
|
SelectedItem="{Binding SelectedQuality}"
|
||||||
|
DisplayMemberPath="Label"
|
||||||
|
ToolTip="{Binding ResolutionHelp}"
|
||||||
|
IsEnabled="{Binding IsOffline}"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<!-- ═══ THUMBNAIL STRIP (over the preview column; left column stays empty) ═══ -->
|
||||||
|
<controls:SceneThumbnailStrip x:Name="SceneStrip" Grid.Row="0" Grid.Column="1" Margin="8,0" Height="154"/>
|
||||||
|
|
||||||
<!-- LEFT PANEL: one panel, two states.
|
<!-- LEFT PANEL: one panel, two states.
|
||||||
Offline (edit mode): LAYERS + PROPERTIES
|
Offline (edit mode): LAYERS + PROPERTIES
|
||||||
@@ -110,10 +152,6 @@
|
|||||||
<!-- ═══ OVERLAY: Settings / Bug / Feature / About ═══ -->
|
<!-- ═══ OVERLAY: Settings / Bug / Feature / About ═══ -->
|
||||||
<controls:OverlayHost Grid.RowSpan="3"/>
|
<controls:OverlayHost Grid.RowSpan="3"/>
|
||||||
|
|
||||||
<!-- ═══ WEB SOURCE HOST: hidden panel for WebView2 controls ═══ -->
|
|
||||||
<Canvas x:Name="WebViewHostPanel" Grid.RowSpan="4"
|
|
||||||
Opacity="0" IsHitTestVisible="False" Background="Transparent"/>
|
|
||||||
|
|
||||||
<!-- ═══ TOASTS: non-blocking notifications (bottom-right, above footer) ═══ -->
|
<!-- ═══ TOASTS: non-blocking notifications (bottom-right, above footer) ═══ -->
|
||||||
<notifications:NotificationArea x:Name="ToastArea"
|
<notifications:NotificationArea x:Name="ToastArea"
|
||||||
Grid.RowSpan="4"
|
Grid.RowSpan="4"
|
||||||
|
|||||||
@@ -20,10 +20,15 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
AppLog.Write("MainWindow ctor: before InitializeComponent");
|
AppLog.Write("MainWindow ctor: before InitializeComponent");
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
SizeChanged += (_, e) => Helpers.AppLog.Write($"WIDTHS window={e.NewSize.Width:F0} "
|
||||||
|
+ $"layers={LeftPanel.ActualWidth:F0} strip={SceneStrip.ActualWidth:F0} preview={PreviewPane.ActualWidth:F0}");
|
||||||
AppLog.Write("MainWindow ctor: after InitializeComponent");
|
AppLog.Write("MainWindow ctor: after InitializeComponent");
|
||||||
_viewModel = (MainViewModel)DataContext;
|
_viewModel = (MainViewModel)DataContext;
|
||||||
_viewModel.InitWebView2(WebViewHostPanel);
|
|
||||||
_viewModel.PropertyChanged += OnViewModelPropertyChanged;
|
_viewModel.PropertyChanged += OnViewModelPropertyChanged;
|
||||||
|
// Don't steal focus from an exclusive-fullscreen game the creator is already
|
||||||
|
// playing (e.g. while starting a gameplay stream): activating our window would
|
||||||
|
// drop that game to the taskbar and make the desktop look "locked".
|
||||||
|
ShowActivated = !_viewModel.FullscreenGameRunningNow;
|
||||||
_topBar = (Controls.TopBar)FindName("TopBar")!;
|
_topBar = (Controls.TopBar)FindName("TopBar")!;
|
||||||
_previewPane = (Controls.PreviewPane)FindName("PreviewPane")!;
|
_previewPane = (Controls.PreviewPane)FindName("PreviewPane")!;
|
||||||
_leftPanel = (Controls.LeftPanel)FindName("LeftPanel")!;
|
_leftPanel = (Controls.LeftPanel)FindName("LeftPanel")!;
|
||||||
@@ -37,33 +42,62 @@ public partial class MainWindow : Window
|
|||||||
private void MainWindow_Loaded(object sender, RoutedEventArgs e)
|
private void MainWindow_Loaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
AppLog.Write("MainWindow loaded");
|
AppLog.Write("MainWindow loaded");
|
||||||
|
// Web sources need the window HWND as the composition controller's parent,
|
||||||
|
// which does not exist in the ctor — InitWebView2 runs here (Loaded), after
|
||||||
|
// SourceInitialized. Nothing renders from web frames before this.
|
||||||
|
_viewModel.InitWebView2();
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── Window geometry persistence (launch size/position) ───
|
// ─── Window geometry (launch position/size) ───
|
||||||
// Saved on close (RestoreBounds so a maximized window remembers its
|
// Launch POSITION is derived, never restored: upper-left of the work area plus
|
||||||
// un-maximize rect); restored in the ctor before the window is shown.
|
// padding (creator ruling 2026-10-04). The old restore clamped the saved position
|
||||||
// Values clamp to the minimums and to the primary work area — a position
|
// to [work.Left - width + 120, work.Right - 120] horizontally and
|
||||||
// saved on a since-disconnected secondary monitor falls back on-screen.
|
// [work.Top, work.Bottom - 80] vertically — ranges wide enough to leave the window
|
||||||
|
// almost entirely off-screen, which is what the creator was seeing ("below the
|
||||||
|
// fold"). Size and maximized state are still persisted. Placement math is pure and
|
||||||
|
// tested (WindowPlacementTests); changing it back to restore position is reverting
|
||||||
|
// this block only, since the saved values are still written.
|
||||||
|
|
||||||
|
/// <summary>Launch inset from the work-area corner, in device-independent units —
|
||||||
|
/// so it scales with DPI rather than being a fixed physical pixel count.</summary>
|
||||||
|
internal const double LaunchPadding = 75;
|
||||||
|
|
||||||
|
/// <summary>Upper-left of <paramref name="workArea"/> plus padding, clamped so the
|
||||||
|
/// window is never pushed off-screen. The clamp is the point: a window that fits
|
||||||
|
/// stays wholly visible, and one too big to fit falls back to the work-area origin
|
||||||
|
/// rather than hanging off an edge.</summary>
|
||||||
|
internal static Point TopLeftPlacement(Rect workArea, double width, double height, double padding)
|
||||||
|
{
|
||||||
|
var left = workArea.Left + padding;
|
||||||
|
var top = workArea.Top + padding;
|
||||||
|
|
||||||
|
if (width <= workArea.Width) left = Math.Min(left, workArea.Right - width);
|
||||||
|
else left = workArea.Left;
|
||||||
|
|
||||||
|
if (height <= workArea.Height) top = Math.Min(top, workArea.Bottom - height);
|
||||||
|
else top = workArea.Top;
|
||||||
|
|
||||||
|
return new Point(left, top);
|
||||||
|
}
|
||||||
|
|
||||||
private void RestoreWindowGeometry()
|
private void RestoreWindowGeometry()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var saved = _viewModel.RestoreWindowState();
|
|
||||||
if (saved == null) return;
|
|
||||||
var (left, top, width, height, state) = saved.Value;
|
|
||||||
|
|
||||||
var work = SystemParameters.WorkArea;
|
var work = SystemParameters.WorkArea;
|
||||||
width = Math.Clamp(width, MinWidth, work.Width);
|
var saved = _viewModel.RestoreWindowState();
|
||||||
height = Math.Clamp(height, MinHeight, work.Height);
|
|
||||||
left = Math.Clamp(left, work.Left - width + 120, work.Right - 120);
|
|
||||||
top = Math.Clamp(top, work.Top, work.Bottom - 80);
|
|
||||||
|
|
||||||
Left = left;
|
// No saved state: keep the XAML-declared size rather than collapsing to Min*.
|
||||||
Top = top;
|
var width = Math.Clamp(saved?.Width ?? Width, MinWidth, work.Width);
|
||||||
|
var height = Math.Clamp(saved?.Height ?? Height, MinHeight, work.Height);
|
||||||
Width = width;
|
Width = width;
|
||||||
Height = height;
|
Height = height;
|
||||||
if (state == "Maximized") WindowState = WindowState.Maximized;
|
|
||||||
|
var place = TopLeftPlacement(work, width, height, LaunchPadding);
|
||||||
|
Left = place.X;
|
||||||
|
Top = place.Y;
|
||||||
|
|
||||||
|
if (saved?.State == "Maximized") WindowState = WindowState.Maximized;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -139,8 +173,14 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (e.OriginalSource is not DependencyObject original) return;
|
if (e.OriginalSource is not DependencyObject original) return;
|
||||||
var form = _viewModel.BroadcastForm;
|
var form = _viewModel.BroadcastForm;
|
||||||
if (form.IsDrawerOpen && !_previewPane.IsClickInsideDrawer(original))
|
var ypp = _viewModel.Ypp;
|
||||||
form.CloseDrawerCommand.Execute(null);
|
var test = _viewModel.TestSession;
|
||||||
|
if (!_previewPane.IsClickInsideDrawer(original))
|
||||||
|
{
|
||||||
|
if (form.IsDrawerOpen) form.CloseDrawerCommand.Execute(null);
|
||||||
|
if (ypp.IsDrawerOpen) ypp.CloseDrawerCommand.Execute(null);
|
||||||
|
if (test.IsDrawerOpen) test.CloseDrawerCommand.Execute(null);
|
||||||
|
}
|
||||||
if (_previewPane.IsClickInsidePreview(original)) return;
|
if (_previewPane.IsClickInsidePreview(original)) return;
|
||||||
if (_leftPanel.IsClickInside(original)) return;
|
if (_leftPanel.IsClickInside(original)) return;
|
||||||
_viewModel.SelectedElement = null;
|
_viewModel.SelectedElement = null;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.MicPickerDialog"
|
<Window x:Class="ytLive.MicPickerDialog"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Select Microphone" Height="340" Width="460"
|
Title="Select Microphone" Height="340" Width="460"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
@@ -21,10 +21,10 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#1c2a52"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsSelected" Value="True">
|
<Trigger Property="IsSelected" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#2a2450"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Select Microphone" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Select Microphone" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,14"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,14"/>
|
||||||
|
|
||||||
<TextBlock Grid.Row="1" Text="Pick the microphone to use as your voice source."
|
<TextBlock Grid.Row="1" Text="Pick the microphone to use as your voice source."
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
<Grid Grid.Row="2">
|
<Grid Grid.Row="2">
|
||||||
<ListBox Background="Transparent" BorderThickness="0"
|
<ListBox Background="Transparent" BorderThickness="0"
|
||||||
@@ -58,7 +58,7 @@
|
|||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<TextBlock Text="🎙️" FontSize="15" VerticalAlignment="Center" Margin="0,0,10,0"/>
|
<TextBlock Text="🎙️" FontSize="15" VerticalAlignment="Center" Margin="0,0,10,0"/>
|
||||||
<TextBlock Text="{Binding Name}" Foreground="#e0e0e0" FontSize="13"
|
<TextBlock Text="{Binding Name}" Foreground="{StaticResource Brush.OnSurface}" FontSize="13"
|
||||||
VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
|
VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
@@ -67,15 +67,15 @@
|
|||||||
|
|
||||||
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
|
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
|
||||||
Visibility="{Binding IsLoading, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding IsLoading, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="Searching for microphones…" Foreground="#a0a0b0" FontSize="13"/>
|
<TextBlock Text="Searching for microphones…" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel VerticalAlignment="Center"
|
<StackPanel VerticalAlignment="Center"
|
||||||
Visibility="{Binding NoMicrophones, Converter={StaticResource BoolToVis}}">
|
Visibility="{Binding NoMicrophones, Converter={StaticResource BoolToVis}}">
|
||||||
<TextBlock Text="No microphones found" Foreground="#e0e0e0" FontSize="15"
|
<TextBlock Text="No microphones found" Foreground="{StaticResource Brush.OnSurface}" FontSize="15"
|
||||||
FontWeight="SemiBold" HorizontalAlignment="Center"/>
|
FontWeight="SemiBold" HorizontalAlignment="Center"/>
|
||||||
<TextBlock Text="Check that a microphone is connected and that Windows microphone access is enabled."
|
<TextBlock Text="Check that a microphone is connected and that Windows microphone access is enabled."
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" MaxWidth="360"
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" MaxWidth="360"
|
||||||
TextAlignment="Center" HorizontalAlignment="Center" Margin="0,8,0,0"/>
|
TextAlignment="Center" HorizontalAlignment="Center" Margin="0,8,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>Per-webcam background effect (TASK 51). <see cref="Remove"/> makes everything
|
||||||
|
/// outside the person transparent so the layers below show through; <see cref="Blur"/>
|
||||||
|
/// blurs the background behind the person.</summary>
|
||||||
|
public enum BackgroundEffect
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
Remove,
|
||||||
|
Blur,
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>A colour the border picker offers: its hex value and the plain-English
|
||||||
|
/// name shown next to it (TASK 60).</summary>
|
||||||
|
/// <param name="Hex">The hex value, e.g. <c>#e94560</c>.</param>
|
||||||
|
/// <param name="Name">The name the creator reads, e.g. <c>Crimson</c>.</param>
|
||||||
|
public readonly record struct NamedColor(string Hex, string Name)
|
||||||
|
{
|
||||||
|
/// <summary>"Crimson (#e94560)" — the tooltip the border drop-down shows.</summary>
|
||||||
|
public override string ToString()
|
||||||
|
=> string.IsNullOrEmpty(Name) ? Hex : $"{Name} ({Hex})";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The colours the webcam's border-colour drop-down offers — the SINGLE
|
||||||
|
/// source of truth for the list and for the names.
|
||||||
|
///
|
||||||
|
/// <para>TASK 60 (the creator, 2026-10-21): *"in the drop down box, the #hex values are
|
||||||
|
/// good, but add a corresponding color name/label next to the value."* The list used to
|
||||||
|
/// be a hard-coded array in the click handler, which is why a name could not be added
|
||||||
|
/// to it without touching the UI code.</para>
|
||||||
|
/// </summary>
|
||||||
|
public static class BorderColorPalette
|
||||||
|
{
|
||||||
|
/// <summary>The offered colours, in menu order.</summary>
|
||||||
|
public static IReadOnlyList<NamedColor> All { get; } = new NamedColor[]
|
||||||
|
{
|
||||||
|
new("#FFFFFF", "White"),
|
||||||
|
new("#000000", "Black"),
|
||||||
|
new("#FF0000", "Red"),
|
||||||
|
new("#00FF00", "Lime"),
|
||||||
|
new("#0000FF", "Blue"),
|
||||||
|
new("#FFFF00", "Yellow"),
|
||||||
|
new("#FF00FF", "Magenta"),
|
||||||
|
new("#00FFFF", "Cyan"),
|
||||||
|
new("#FF8800", "Orange"),
|
||||||
|
new("#8800FF", "Violet"),
|
||||||
|
new("#e94560", "Crimson"),
|
||||||
|
new("#22c55e", "Emerald"),
|
||||||
|
new("#3b82f6", "Azure"),
|
||||||
|
new("#f59e0b", "Amber"),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// <summary>The colour's name, or an **empty string** when the palette has no name
|
||||||
|
/// for that hex (a custom hex the creator typed) — the caller decides what to show
|
||||||
|
/// then, and the border field shows the hex alone.</summary>
|
||||||
|
public static string NameOf(string hex) => EntryFor(hex).Name;
|
||||||
|
|
||||||
|
/// <summary>The palette entry for a hex value — the palette's OWN entry (so a
|
||||||
|
/// drop-down bound to it matches by value), or a nameless entry for a custom hex
|
||||||
|
/// the creator typed, so the drop-down always has a selection (TASK 63).</summary>
|
||||||
|
public static NamedColor EntryFor(string hex)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(hex)) return new NamedColor(string.Empty, string.Empty);
|
||||||
|
var trimmed = hex.Trim();
|
||||||
|
foreach (var colour in All)
|
||||||
|
if (string.Equals(colour.Hex, trimmed, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return colour;
|
||||||
|
return new NamedColor(trimmed, string.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The colours a border drop-down offers for a given hex — the palette, plus
|
||||||
|
/// the custom colour the creator typed when it is not one of the palette's, so the
|
||||||
|
/// drop-down always has a selection (TASK 63).</summary>
|
||||||
|
public static IReadOnlyList<NamedColor> OptionsFor(string hex)
|
||||||
|
{
|
||||||
|
var entry = EntryFor(hex);
|
||||||
|
var options = new List<NamedColor>(All);
|
||||||
|
if (!string.IsNullOrEmpty(entry.Hex) && !All.Contains(entry))
|
||||||
|
options.Add(entry);
|
||||||
|
return options;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -72,6 +72,14 @@ public class Scene : INotifyPropertyChanged
|
|||||||
|
|
||||||
public bool IsChatScene { get; init; }
|
public bool IsChatScene { get; init; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Asset-table id of this scene's top-strip tile artwork. The tile is a
|
||||||
|
/// separate image from the scene's background: the preview pane keeps
|
||||||
|
/// rendering the scene's original background, the strip shows this instead.
|
||||||
|
/// Null = the strip falls back to the background art (creator ruling 2026-10-10).
|
||||||
|
/// </summary>
|
||||||
|
public string? ThumbnailAssetId { get; set; }
|
||||||
|
|
||||||
private BitmapSource? _snapshot;
|
private BitmapSource? _snapshot;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -19,6 +19,17 @@ public enum BorderAnimation
|
|||||||
Sparkles
|
Sparkles
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Whether an element's pixel content is fixed (bake once into the
|
||||||
|
/// compositor's cached base) or changes every frame (composite each tick).
|
||||||
|
/// See ai.md "SceneGraph component + baked-crust compositor" (TASK 31).</summary>
|
||||||
|
public enum ElementKind
|
||||||
|
{
|
||||||
|
/// <summary>Pixels never change at runtime (images, background art).</summary>
|
||||||
|
Static,
|
||||||
|
/// <summary>Pixels change every frame (webcam, live capture, chat, web source).</summary>
|
||||||
|
Dynamic
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A thing rendered in a scene: a multi-instance Source (image/background/text)
|
/// A thing rendered in a scene: a multi-instance Source (image/background/text)
|
||||||
/// or a singleton resource's per-scene config (webcam). Carries the shared
|
/// or a singleton resource's per-scene config (webcam). Carries the shared
|
||||||
@@ -44,6 +55,15 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
private string _name = string.Empty;
|
private string _name = string.Empty;
|
||||||
public string Name { get => _name; set => Set(ref _name, value); }
|
public string Name { get => _name; set => Set(ref _name, value); }
|
||||||
|
|
||||||
|
/// <summary>Whether this element's pixels are fixed (Static) or change every
|
||||||
|
/// frame (Dynamic). The compositor bakes all Static layers below the first
|
||||||
|
/// Dynamic layer once (see <c>SceneGraph.GetSplitPoint</c>).</summary>
|
||||||
|
public virtual ElementKind Kind => ElementKind.Static;
|
||||||
|
|
||||||
|
/// <summary>True only for the transient zoom layer. Gates zoom-only UI:
|
||||||
|
/// hidden from the layers list, never selectable/draggable in the preview.</summary>
|
||||||
|
public virtual bool IsZoomLayer => false;
|
||||||
|
|
||||||
/// <summary>True only for singleton resources (webcam). Gates webcam-only UI.</summary>
|
/// <summary>True only for singleton resources (webcam). Gates webcam-only UI.</summary>
|
||||||
public virtual bool IsWebcam => false;
|
public virtual bool IsWebcam => false;
|
||||||
|
|
||||||
@@ -61,6 +81,12 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
|
|
||||||
/// <summary>True only for Countdown-type sources. Gates timer properties panel.</summary>
|
/// <summary>True only for Countdown-type sources. Gates timer properties panel.</summary>
|
||||||
public virtual bool IsCountdown => false;
|
public virtual bool IsCountdown => false;
|
||||||
|
|
||||||
|
/// <summary>True only for AlertBox-type sources. Gates stream alerts properties panel.</summary>
|
||||||
|
public virtual bool IsAlertBox => false;
|
||||||
|
public virtual bool IsTextOverlay => false;
|
||||||
|
public virtual bool IsMediaSource => false;
|
||||||
|
public virtual bool IsLiveCapture => false;
|
||||||
public virtual bool IsBackground { get; set; }
|
public virtual bool IsBackground { get; set; }
|
||||||
|
|
||||||
private bool _useDefaultBackground = true;
|
private bool _useDefaultBackground = true;
|
||||||
@@ -88,13 +114,45 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
public bool IsEditing { get => _isEditing; set => Set(ref _isEditing, value); }
|
public bool IsEditing { get => _isEditing; set => Set(ref _isEditing, value); }
|
||||||
|
|
||||||
private ClipShape _clipShape = ClipShape.Traditional;
|
private ClipShape _clipShape = ClipShape.Traditional;
|
||||||
public ClipShape ClipShape
|
// Virtual so a derived element can CONSTRAIN the shape (the webcam is
|
||||||
|
// rect-only in the vertical tier's Chat layout — TASK 57) instead of every
|
||||||
|
// writer re-implementing the rule.
|
||||||
|
public virtual ClipShape ClipShape
|
||||||
{
|
{
|
||||||
get => _clipShape;
|
get => _clipShape;
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
if (Set(ref _clipShape, value))
|
if (Set(ref _clipShape, value))
|
||||||
Raise(nameof(ShapeButtonText));
|
{
|
||||||
|
Raise(nameof(IsRectShape));
|
||||||
|
Raise(nameof(IsRoundShape));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>True when the element's clip is the plain rectangle — the shape a
|
||||||
|
/// camera has when none was ever picked (TASK 59: the properties panel shows
|
||||||
|
/// the shape as a CHOICE, and Rect is the selected default).</summary>
|
||||||
|
public bool IsRectShape
|
||||||
|
{
|
||||||
|
get => ClipShape != ClipShape.Round;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
// Round -> rect (restores the pre-round rect, like the toggle does).
|
||||||
|
if (value && ClipShape == ClipShape.Round) ToggleClipShape();
|
||||||
|
Raise(nameof(IsRectShape));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>True when the element's clip is a circle (TASK 59).</summary>
|
||||||
|
public bool IsRoundShape
|
||||||
|
{
|
||||||
|
get => ClipShape == ClipShape.Round;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
// Rect -> round (stores the pre-round rect, like the toggle does).
|
||||||
|
if (value && ClipShape != ClipShape.Round) ToggleClipShape();
|
||||||
|
Raise(nameof(IsRoundShape));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +165,7 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
public double? RectWidth { get => _rectWidth; set => Set(ref _rectWidth, value); }
|
public double? RectWidth { get => _rectWidth; set => Set(ref _rectWidth, value); }
|
||||||
public double? RectHeight { get => _rectHeight; set => Set(ref _rectHeight, value); }
|
public double? RectHeight { get => _rectHeight; set => Set(ref _rectHeight, value); }
|
||||||
|
|
||||||
public void ToggleClipShape()
|
public virtual void ToggleClipShape()
|
||||||
{
|
{
|
||||||
if (ClipShape == ClipShape.Traditional)
|
if (ClipShape == ClipShape.Traditional)
|
||||||
{
|
{
|
||||||
@@ -144,7 +202,6 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
|
|
||||||
public double MirrorScale => IsMirrored ? -1 : 1;
|
public double MirrorScale => IsMirrored ? -1 : 1;
|
||||||
public string MirrorButtonText => IsMirrored ? "Unmirror" : "Mirror";
|
public string MirrorButtonText => IsMirrored ? "Unmirror" : "Mirror";
|
||||||
public string ShapeButtonText => ClipShape == ClipShape.Round ? "Rect" : "Round";
|
|
||||||
|
|
||||||
// Live camera frames: the shared WriteableBitmap owned by CameraManager.
|
// Live camera frames: the shared WriteableBitmap owned by CameraManager.
|
||||||
private WriteableBitmap? _videoImageSource;
|
private WriteableBitmap? _videoImageSource;
|
||||||
@@ -161,15 +218,18 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
/// <summary>What the preview shows: live frames (webcam) or a static image (sources).</summary>
|
/// <summary>What the preview shows: live frames (webcam) or a static image (sources).</summary>
|
||||||
public abstract ImageSource? DisplaySource { get; }
|
public abstract ImageSource? DisplaySource { get; }
|
||||||
|
|
||||||
// Position/transform (per-scene usage)
|
// Position/transform (per-scene usage). The geometry setters are virtual so
|
||||||
|
// a derived element can CONSTRAIN them (the webcam clamps itself into the
|
||||||
|
// vertical tier's band — TASK 57) instead of every writer re-implementing
|
||||||
|
// the rule.
|
||||||
private double _x;
|
private double _x;
|
||||||
public double X { get => _x; set => Set(ref _x, value); }
|
public virtual double X { get => _x; set => Set(ref _x, value); }
|
||||||
|
|
||||||
private double _y;
|
private double _y;
|
||||||
public double Y { get => _y; set => Set(ref _y, value); }
|
public virtual double Y { get => _y; set => Set(ref _y, value); }
|
||||||
|
|
||||||
private double _width;
|
private double _width;
|
||||||
public double Width
|
public virtual double Width
|
||||||
{
|
{
|
||||||
get => _width;
|
get => _width;
|
||||||
set
|
set
|
||||||
@@ -180,7 +240,7 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
}
|
}
|
||||||
|
|
||||||
private double _height;
|
private double _height;
|
||||||
public double Height
|
public virtual double Height
|
||||||
{
|
{
|
||||||
get => _height;
|
get => _height;
|
||||||
set
|
set
|
||||||
@@ -207,10 +267,26 @@ public abstract class SceneElement : INotifyPropertyChanged
|
|||||||
{
|
{
|
||||||
Raise(nameof(HasBorder));
|
Raise(nameof(HasBorder));
|
||||||
Raise(nameof(BorderBrush));
|
Raise(nameof(BorderBrush));
|
||||||
|
Raise(nameof(BorderColorEntry));
|
||||||
|
Raise(nameof(BorderColorOptions));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>The border colour as the drop-down sees it: the palette's entry for the
|
||||||
|
/// current hex — with its NAME — or a nameless entry for a custom hex the creator
|
||||||
|
/// typed. Setting it writes the hex back (TASK 63).</summary>
|
||||||
|
public NamedColor BorderColorEntry
|
||||||
|
{
|
||||||
|
get => BorderColorPalette.EntryFor(BorderColor);
|
||||||
|
set => BorderColor = value.Hex;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The colours the border drop-down offers — the palette, plus the custom
|
||||||
|
/// colour the creator typed (so the drop-down always has a selection) (TASK 63).</summary>
|
||||||
|
public IReadOnlyList<NamedColor> BorderColorOptions
|
||||||
|
=> BorderColorPalette.OptionsFor(BorderColor);
|
||||||
|
|
||||||
private double _borderOpacity = 1.0;
|
private double _borderOpacity = 1.0;
|
||||||
public double BorderOpacity
|
public double BorderOpacity
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>What the top bar's primary action button will do.</summary>
|
||||||
|
public enum SessionStartKind
|
||||||
|
{
|
||||||
|
Record,
|
||||||
|
Live,
|
||||||
|
Test,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Creator ruling (2026-10-30): the primary button is context-sensitive, so the separate
|
||||||
|
/// TEST button is gone.
|
||||||
|
///
|
||||||
|
/// <list type="bullet">
|
||||||
|
/// <item>EDIT off + ON-AIR armed → Go Live (the livestream message)</item>
|
||||||
|
/// <item>EDIT on + ON-AIR armed → Test Stream (the test-livestream message) — a dry run you
|
||||||
|
/// cannot leak, because every broadcast is private pre-v1 anyway</item>
|
||||||
|
/// <item>REC armed → Start Recording, whatever EDIT says (there is no test recording)</item>
|
||||||
|
/// </list>
|
||||||
|
///
|
||||||
|
/// <para>Pure so the whole matrix is testable without a window.</para></summary>
|
||||||
|
public static class SessionStartDecision
|
||||||
|
{
|
||||||
|
public static SessionStartKind For(bool recordArmed, bool onAirArmed, bool editing)
|
||||||
|
{
|
||||||
|
// Neither pill armed still starts something: local recording needs no account, and the
|
||||||
|
// no-dead-ends rule forbids an inert primary button.
|
||||||
|
if (recordArmed || !onAirArmed) return SessionStartKind.Record;
|
||||||
|
return editing ? SessionStartKind.Test : SessionStartKind.Live;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>What pressing the button actually does, given whether YouTube is connected.
|
||||||
|
/// A signed-out ON-AIR press must start the SIGN-IN flow, not sit there disabled — a dead
|
||||||
|
/// primary button is the dead end the design principle forbids (creator, 2026-10-30).</summary>
|
||||||
|
public enum Route
|
||||||
|
{
|
||||||
|
SignIn,
|
||||||
|
Record,
|
||||||
|
Live,
|
||||||
|
Test,
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Route RouteFor(SessionStartKind kind, bool connected) => kind switch
|
||||||
|
{
|
||||||
|
SessionStartKind.Record => Route.Record,
|
||||||
|
SessionStartKind.Test => connected ? Route.Test : Route.SignIn,
|
||||||
|
_ => connected ? Route.Live : Route.SignIn,
|
||||||
|
};
|
||||||
|
|
||||||
|
public static string LabelFor(SessionStartKind kind) => kind switch
|
||||||
|
{
|
||||||
|
SessionStartKind.Record => "Start Recording",
|
||||||
|
SessionStartKind.Test => "Test Stream",
|
||||||
|
_ => "Go Live",
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -70,6 +70,50 @@ public sealed class SocialsConfig : INotifyPropertyChanged
|
|||||||
set => Set(ref _barPosition, value);
|
set => Set(ref _barPosition, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ─── Bar appearance (creator request 2026-10-30) ───────────────────────────
|
||||||
|
// The bar used to be hard-wired white-on-transparent. These five knobs are the whole
|
||||||
|
// appearance surface: text colour, an optional plate behind it, and a text shadow.
|
||||||
|
|
||||||
|
private string _barTextColor = "#FFFFFF";
|
||||||
|
/// <summary>Text and logo colour of the bar (hex, straight alpha).</summary>
|
||||||
|
public string BarTextColor
|
||||||
|
{
|
||||||
|
get => _barTextColor;
|
||||||
|
set => Set(ref _barTextColor, string.IsNullOrWhiteSpace(value) ? "#FFFFFF" : value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _barBackgroundEnabled;
|
||||||
|
/// <summary>Draw a rounded plate behind the entries. Off by default — the bar shipped
|
||||||
|
/// transparent and most creators keep it that way.</summary>
|
||||||
|
public bool BarBackgroundEnabled
|
||||||
|
{
|
||||||
|
get => _barBackgroundEnabled;
|
||||||
|
set => Set(ref _barBackgroundEnabled, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string _barBackgroundColor = "#000000";
|
||||||
|
public string BarBackgroundColor
|
||||||
|
{
|
||||||
|
get => _barBackgroundColor;
|
||||||
|
set => Set(ref _barBackgroundColor, string.IsNullOrWhiteSpace(value) ? "#000000" : value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double _barBackgroundOpacity = 0.55;
|
||||||
|
/// <summary>0 = invisible plate, 1 = solid. Only meaningful when the plate is on.</summary>
|
||||||
|
public double BarBackgroundOpacity
|
||||||
|
{
|
||||||
|
get => _barBackgroundOpacity;
|
||||||
|
set => Set(ref _barBackgroundOpacity, Math.Clamp(value, 0, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _barTextShadow;
|
||||||
|
/// <summary>A soft black drop shadow behind the glyphs, for a bright or busy scene.</summary>
|
||||||
|
public bool BarTextShadow
|
||||||
|
{
|
||||||
|
get => _barTextShadow;
|
||||||
|
set => Set(ref _barTextShadow, value);
|
||||||
|
}
|
||||||
|
|
||||||
public event PropertyChangedEventHandler? PropertyChanged;
|
public event PropertyChangedEventHandler? PropertyChanged;
|
||||||
private bool Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
|
private bool Set<T>(ref T field, T value, [CallerMemberName] string? name = null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -13,7 +13,10 @@ public enum SourceType
|
|||||||
Countdown,
|
Countdown,
|
||||||
WebSource,
|
WebSource,
|
||||||
ChatBox,
|
ChatBox,
|
||||||
MediaSource
|
MediaSource,
|
||||||
|
/// <summary>The designated alert zone: the six monetization events play their
|
||||||
|
/// unique celebration animations here (OBS alert-box equivalent, native).</summary>
|
||||||
|
AlertBox
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Distinguishes how a media source presents its content (TASK 21).</summary>
|
/// <summary>Distinguishes how a media source presents its content (TASK 21).</summary>
|
||||||
@@ -37,6 +40,19 @@ public enum ClipShape
|
|||||||
Round
|
Round
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>How an alert box presents its announcement strip (TASK 47). The strip is
|
||||||
|
/// the full-width pill naming the event ("Viewer — Super Chat · $12.34").</summary>
|
||||||
|
public enum AlertDisplayMethod
|
||||||
|
{
|
||||||
|
/// <summary>Marquee: the pill scrolls across the top edge, paced so the text is
|
||||||
|
/// read <see cref="AlertOverlayLayer.TickerReadsPerAlert"/> times per alert.</summary>
|
||||||
|
TickerScroll,
|
||||||
|
/// <summary>Pulse: the static pill blinks on and off for the whole alert.</summary>
|
||||||
|
Flash,
|
||||||
|
/// <summary>Static: the pill sits centred and still for the whole alert.</summary>
|
||||||
|
Solid
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// A multi-instance scene object: image/background/text (screen/window later).
|
/// A multi-instance scene object: image/background/text (screen/window later).
|
||||||
/// The webcam is NOT a Source — it's a singleton resource whose per-scene usage
|
/// The webcam is NOT a Source — it's a singleton resource whose per-scene usage
|
||||||
@@ -57,13 +73,24 @@ public class Source : SceneElement
|
|||||||
Raise(nameof(IsLiveCapture));
|
Raise(nameof(IsLiveCapture));
|
||||||
Raise(nameof(DisplaySource));
|
Raise(nameof(DisplaySource));
|
||||||
Raise(nameof(IsWebSource));
|
Raise(nameof(IsWebSource));
|
||||||
|
Raise(nameof(IsTextOverlay));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool IsDraggable => Type is SourceType.Image or SourceType.WebSource or SourceType.ChatBox;
|
public override bool IsDraggable => Type is SourceType.Image or SourceType.WebSource or SourceType.ChatBox or SourceType.AlertBox;
|
||||||
|
|
||||||
|
/// <summary>Live captures, chat, web sources and media are dynamic; static art is fixed.</summary>
|
||||||
|
public override ElementKind Kind => Type is SourceType.DisplayCapture or SourceType.WindowCapture
|
||||||
|
or SourceType.ChatBox or SourceType.WebSource or SourceType.MediaSource or SourceType.AlertBox
|
||||||
|
? ElementKind.Dynamic : ElementKind.Static;
|
||||||
|
|
||||||
public override bool IsWebSource => Type == SourceType.WebSource;
|
public override bool IsWebSource => Type == SourceType.WebSource;
|
||||||
|
public override bool IsTextOverlay => Type == SourceType.TextOverlay;
|
||||||
|
|
||||||
|
/// <summary>The permanent brand logo layer (one per scene, directly above the background).
|
||||||
|
/// Locked against removal; its image comes from the App Settings brand logo.</summary>
|
||||||
|
public bool IsBrandLogo { get; set; }
|
||||||
|
|
||||||
/// <summary>The permanent scene background (live desktop/game capture). Never removable/reorderable.</summary>
|
/// <summary>The permanent scene background (live desktop/game capture). Never removable/reorderable.</summary>
|
||||||
private bool _isBackground;
|
private bool _isBackground;
|
||||||
@@ -89,7 +116,7 @@ public class Source : SceneElement
|
|||||||
private string? _captureKey;
|
private string? _captureKey;
|
||||||
public string? CaptureKey { get => _captureKey; set => Set(ref _captureKey, value); }
|
public string? CaptureKey { get => _captureKey; set => Set(ref _captureKey, value); }
|
||||||
|
|
||||||
public bool IsLiveCapture => Type is SourceType.DisplayCapture or SourceType.WindowCapture;
|
public override bool IsLiveCapture => Type is SourceType.DisplayCapture or SourceType.WindowCapture;
|
||||||
|
|
||||||
// Image (asset stored in the layout database)
|
// Image (asset stored in the layout database)
|
||||||
private string? _assetId;
|
private string? _assetId;
|
||||||
@@ -113,7 +140,7 @@ public class Source : SceneElement
|
|||||||
|
|
||||||
public override ImageSource? DisplaySource => IsLiveCapture
|
public override ImageSource? DisplaySource => IsLiveCapture
|
||||||
? (VideoImageSource ?? _imageSource)
|
? (VideoImageSource ?? _imageSource)
|
||||||
: (Type is SourceType.ChatBox or SourceType.WebSource ? VideoImageSource : _imageSource);
|
: (Type is SourceType.ChatBox or SourceType.WebSource or SourceType.MediaSource or SourceType.AlertBox ? VideoImageSource : _imageSource);
|
||||||
|
|
||||||
public override bool IsImageSource => Type == SourceType.Image;
|
public override bool IsImageSource => Type == SourceType.Image;
|
||||||
|
|
||||||
@@ -169,7 +196,55 @@ public class Source : SceneElement
|
|||||||
set => Set(ref _mediaPlaybackState, value);
|
set => Set(ref _mediaPlaybackState, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool IsMediaSource => Type == SourceType.MediaSource;
|
public override bool IsMediaSource => Type == SourceType.MediaSource;
|
||||||
|
|
||||||
|
// Alert video config (TASK 47): the shipped default clip lives in the Asset
|
||||||
|
// table (seeded like image assets); the creator's replacement is a FILE PATH
|
||||||
|
// reference only — never into the DB (creator ruling, 2026-09-26). Runtime
|
||||||
|
// order: replacement path exists → DB default → six celebration animations.
|
||||||
|
private string? _alertVideoAssetId;
|
||||||
|
public string? AlertVideoAssetId
|
||||||
|
{
|
||||||
|
get => _alertVideoAssetId;
|
||||||
|
set => Set(ref _alertVideoAssetId, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private string? _alertVideoPath;
|
||||||
|
public string? AlertVideoPath
|
||||||
|
{
|
||||||
|
get => _alertVideoPath;
|
||||||
|
set => Set(ref _alertVideoPath, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _alertUseDefaultVideo = true;
|
||||||
|
public bool AlertUseDefaultVideo
|
||||||
|
{
|
||||||
|
get => _alertUseDefaultVideo;
|
||||||
|
set => Set(ref _alertUseDefaultVideo, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool _alertShowTicker = true;
|
||||||
|
public bool AlertShowTicker
|
||||||
|
{
|
||||||
|
get => _alertShowTicker;
|
||||||
|
set => Set(ref _alertShowTicker, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double _alertVideoVolume = 1.0;
|
||||||
|
public double AlertVideoVolume
|
||||||
|
{
|
||||||
|
get => _alertVideoVolume;
|
||||||
|
set => Set(ref _alertVideoVolume, Math.Clamp(value, 0.0, 1.0));
|
||||||
|
}
|
||||||
|
|
||||||
|
private AlertDisplayMethod _alertDisplayMethod = AlertDisplayMethod.TickerScroll;
|
||||||
|
public AlertDisplayMethod AlertDisplayMethod
|
||||||
|
{
|
||||||
|
get => _alertDisplayMethod;
|
||||||
|
set => Set(ref _alertDisplayMethod, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool IsAlertBox => Type == SourceType.AlertBox;
|
||||||
|
|
||||||
// Chat box config (TASK 3.18)
|
// Chat box config (TASK 3.18)
|
||||||
private double _chatFontSize = 16;
|
private double _chatFontSize = 16;
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
using System.Windows;
|
||||||
|
|
||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The vertical (9:16) tier's camera rules — TASK 57, the "vv" feature.
|
||||||
|
///
|
||||||
|
/// The vertical tier is a centred band crop of the SAME 1920×1080 master the
|
||||||
|
/// 16:9 tiers use, so a camera placed for 16:9 lands outside the cropped
|
||||||
|
/// window and vanishes from the vertical output. The vertical tier therefore
|
||||||
|
/// keeps its OWN placement per scene: a small tile inside the band, snapped to
|
||||||
|
/// one of six spots — the band splits into a top and a bottom half, each with
|
||||||
|
/// a left, a centre and a right slot.
|
||||||
|
///
|
||||||
|
/// Geometry only: the preview and the compositor both read the element's own
|
||||||
|
/// X/Y/W/H + ClipShape, so the placement is resolved by swapping those values
|
||||||
|
/// when the tier changes. No render-path change.
|
||||||
|
/// </summary>
|
||||||
|
public static class VerticalCameraLayout
|
||||||
|
{
|
||||||
|
/// <summary>The vertical tier's camera tile over the master frame —
|
||||||
|
/// 270×152 master px = 480×270 in the 1080×1920 output.</summary>
|
||||||
|
public const double TileWidth = 270;
|
||||||
|
public const double TileHeight = 152;
|
||||||
|
|
||||||
|
/// <summary>How far the tile keeps from the band's outer edge — the app's
|
||||||
|
/// own placement margin (32 master px) used by the default webcam spot.</summary>
|
||||||
|
public const double Inset = 32;
|
||||||
|
|
||||||
|
/// <summary>True for the portrait tier (the vertical 1080×1920 one).</summary>
|
||||||
|
public static bool IsVerticalTier(QualityOption quality) => quality.Height > quality.Width;
|
||||||
|
|
||||||
|
/// <summary>The half of the band a tile lives in — top or bottom.</summary>
|
||||||
|
public static Rect AreaFor(Rect band, bool bottom)
|
||||||
|
=> new(band.Left, bottom ? band.Top + band.Height / 2 : band.Top, band.Width, band.Height / 2);
|
||||||
|
|
||||||
|
/// <summary>The largest a camera may be inside the band: one whole area.</summary>
|
||||||
|
public static (double Width, double Height) MaxSizeFor(Rect band)
|
||||||
|
=> (band.Width, band.Height / 2);
|
||||||
|
|
||||||
|
/// <summary>True when a camera is wide enough to fill one whole area of the
|
||||||
|
/// band — the "enlarged" Chat layout (one 607×540 area).</summary>
|
||||||
|
public static bool FillsArea(Rect band, double width) => width >= band.Width - 1;
|
||||||
|
|
||||||
|
/// <summary>The two sizes a camera may take in the vertical tier's Chat
|
||||||
|
/// layout: the small tile (normal) or one whole area (enlarged). Returns
|
||||||
|
/// the one nearer the requested width, so the resize handle snaps between
|
||||||
|
/// them instead of taking any size in between.</summary>
|
||||||
|
public static (double Width, double Height) SizeFor(Rect band, double requestedWidth)
|
||||||
|
{
|
||||||
|
var (areaWidth, areaHeight) = MaxSizeFor(band);
|
||||||
|
return Math.Abs(requestedWidth - TileWidth) <= Math.Abs(requestedWidth - areaWidth)
|
||||||
|
? (TileWidth, TileHeight)
|
||||||
|
: (areaWidth, areaHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The spot a tile snaps to: the area (top/bottom) and the column
|
||||||
|
/// (left/centre/right) its centre falls in, then the tile's top-left for
|
||||||
|
/// that spot — inset from the band's outer edge, and never outside the band
|
||||||
|
/// (a tile wider than the inset eats it).
|
||||||
|
/// </summary>
|
||||||
|
public static (double X, double Y) SpotFor(Rect band, double width, double height, double centreX, double centreY)
|
||||||
|
{
|
||||||
|
var bottom = centreY >= band.Top + band.Height / 2;
|
||||||
|
var area = AreaFor(band, bottom);
|
||||||
|
var third = area.Width / 3;
|
||||||
|
|
||||||
|
double x;
|
||||||
|
if (centreX < area.Left + third) x = area.Left + Inset;
|
||||||
|
else if (centreX < area.Left + 2 * third) x = area.Left + (area.Width - width) / 2;
|
||||||
|
else x = area.Right - Inset - width;
|
||||||
|
|
||||||
|
var y = bottom ? area.Bottom - Inset - height : area.Top + Inset;
|
||||||
|
|
||||||
|
x = Math.Clamp(x, band.Left, Math.Max(band.Left, band.Right - width));
|
||||||
|
y = Math.Clamp(y, band.Top, Math.Max(band.Top, band.Bottom - height));
|
||||||
|
return (x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The default tile spot: the bottom-right corner of the band —
|
||||||
|
/// the same corner the 16:9 default webcam placement uses.</summary>
|
||||||
|
public static (double X, double Y) DefaultSpot(Rect band, double width, double height)
|
||||||
|
=> SpotFor(band, width, height, band.Right, band.Bottom);
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System.Windows;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace ytLive.Models;
|
namespace ytLive.Models;
|
||||||
@@ -13,5 +14,223 @@ public class WebcamSceneConfig : SceneElement
|
|||||||
public string WebcamId { get; init; } = string.Empty;
|
public string WebcamId { get; init; } = string.Empty;
|
||||||
public override bool IsWebcam => true;
|
public override bool IsWebcam => true;
|
||||||
public override bool IsDraggable => true;
|
public override bool IsDraggable => true;
|
||||||
|
public override ElementKind Kind => ElementKind.Dynamic;
|
||||||
public override ImageSource? DisplaySource => VideoImageSource;
|
public override ImageSource? DisplaySource => VideoImageSource;
|
||||||
|
|
||||||
|
private BackgroundEffect _backgroundEffect = BackgroundEffect.None;
|
||||||
|
/// <summary>TASK 51: this scene's background effect for the webcam (persisted).</summary>
|
||||||
|
public BackgroundEffect BackgroundEffect
|
||||||
|
{
|
||||||
|
get => _backgroundEffect;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (!Set(ref _backgroundEffect, value)) return;
|
||||||
|
Raise(nameof(RemoveBackground));
|
||||||
|
Raise(nameof(BlurBackground));
|
||||||
|
Raise(nameof(HasBackgroundEffect));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>True while Remove or Blur is on — shows the strength slider.</summary>
|
||||||
|
public bool HasBackgroundEffect => BackgroundEffect != BackgroundEffect.None;
|
||||||
|
|
||||||
|
private double _backgroundStrength = 0.5;
|
||||||
|
/// <summary>TASK 51: 0..1 — Blur amount, or Remove's edge softness (persisted).</summary>
|
||||||
|
public double BackgroundStrength
|
||||||
|
{
|
||||||
|
get => _backgroundStrength;
|
||||||
|
set => Set(ref _backgroundStrength, Math.Clamp(value, 0, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Pill-switch surface: Remove and Blur behave like radio buttons — turning one
|
||||||
|
/// on turns the other off; turning the active one off means <see cref="BackgroundEffect.None"/>.</summary>
|
||||||
|
public bool RemoveBackground
|
||||||
|
{
|
||||||
|
get => BackgroundEffect == BackgroundEffect.Remove;
|
||||||
|
set => BackgroundEffect = value ? BackgroundEffect.Remove
|
||||||
|
: BackgroundEffect == BackgroundEffect.Remove ? BackgroundEffect.None : BackgroundEffect;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="RemoveBackground"/>
|
||||||
|
public bool BlurBackground
|
||||||
|
{
|
||||||
|
get => BackgroundEffect == BackgroundEffect.Blur;
|
||||||
|
set => BackgroundEffect = value ? BackgroundEffect.Blur
|
||||||
|
: BackgroundEffect == BackgroundEffect.Blur ? BackgroundEffect.None : BackgroundEffect;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Vertical (9:16) tier placement (TASK 57, the "vv" feature) ────────
|
||||||
|
// The vertical tier is a centred band crop of the same master frame, so the
|
||||||
|
// 16:9 placement lands outside the cropped window and the camera vanishes
|
||||||
|
// from the vertical output. The vertical tier therefore keeps its OWN
|
||||||
|
// position, size and shape per scene, stored here and resolved when the
|
||||||
|
// tier changes; switching back to 16:9 restores the desktop layout exactly.
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's X (null until the scene has one).</summary>
|
||||||
|
public double? VerticalX { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's Y (null until the scene has one).</summary>
|
||||||
|
public double? VerticalY { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's width (null until the scene has one).</summary>
|
||||||
|
public double? VerticalWidth { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's height (null until the scene has one).</summary>
|
||||||
|
public double? VerticalHeight { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's clip shape (circle or rect) — the
|
||||||
|
/// creator's own choice per scene, independent of the 16:9 shape.</summary>
|
||||||
|
public ClipShape? VerticalClipShape { get; set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical placement's pre-Round rect (so a Round tile
|
||||||
|
/// restores its aspect on toggle-back, like the 16:9 one does).</summary>
|
||||||
|
public double? VerticalRectWidth { get; set; }
|
||||||
|
|
||||||
|
/// <inheritdoc cref="VerticalRectWidth"/>
|
||||||
|
public double? VerticalRectHeight { get; set; }
|
||||||
|
|
||||||
|
/// <summary>True once this scene has a vertical placement of its own.</summary>
|
||||||
|
public bool HasVerticalLayout => VerticalX is not null;
|
||||||
|
|
||||||
|
/// <summary>True while the vertical placement is the LIVE geometry (the
|
||||||
|
/// element's own X/Y/W/H). The 16:9 layout is parked in
|
||||||
|
/// <see cref="LandscapeX"/> and friends until the tier switches back.</summary>
|
||||||
|
public bool VerticalLayoutLive { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>True while the vertical placement must stay RECT — the Chat
|
||||||
|
/// scene's vertical layout (the creator's table: "vv · Chat = rect only, no
|
||||||
|
/// circle option"). The circle is not offered there, so the shape cannot
|
||||||
|
/// become Round by any writer.</summary>
|
||||||
|
public bool VerticalShapeLocked { get; internal set; }
|
||||||
|
|
||||||
|
/// <summary>The vertical tier's band over the master frame (transient — the
|
||||||
|
/// VM sets it when the tier changes). While the vertical placement is live
|
||||||
|
/// the camera's geometry is clamped to it: outside the band is invisible.</summary>
|
||||||
|
public Rect VerticalBand { get; set; } = Rect.Empty;
|
||||||
|
|
||||||
|
// The parked 16:9 layout — meaningful only while the vertical placement is
|
||||||
|
// live (it is the 16:9 geometry the tier switch restores).
|
||||||
|
public double LandscapeX { get; private set; }
|
||||||
|
public double LandscapeY { get; private set; }
|
||||||
|
public double LandscapeWidth { get; private set; }
|
||||||
|
public double LandscapeHeight { get; private set; }
|
||||||
|
public ClipShape LandscapeClipShape { get; private set; }
|
||||||
|
public double? LandscapeRectWidth { get; private set; }
|
||||||
|
public double? LandscapeRectHeight { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>Parks the live (16:9) layout and brings a vertical placement
|
||||||
|
/// in. The vertical placement becomes the live geometry from here on.</summary>
|
||||||
|
public void BeginVerticalLayout(double x, double y, double width, double height, ClipShape clipShape)
|
||||||
|
{
|
||||||
|
LandscapeX = X;
|
||||||
|
LandscapeY = Y;
|
||||||
|
LandscapeWidth = Width;
|
||||||
|
LandscapeHeight = Height;
|
||||||
|
LandscapeClipShape = ClipShape;
|
||||||
|
LandscapeRectWidth = RectWidth;
|
||||||
|
LandscapeRectHeight = RectHeight;
|
||||||
|
|
||||||
|
VerticalLayoutLive = true;
|
||||||
|
Width = width;
|
||||||
|
Height = height;
|
||||||
|
X = x;
|
||||||
|
Y = y;
|
||||||
|
ClipShape = clipShape;
|
||||||
|
RectWidth = VerticalRectWidth;
|
||||||
|
RectHeight = VerticalRectHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Restores the parked 16:9 layout — the tier switched back.</summary>
|
||||||
|
public void EndVerticalLayout()
|
||||||
|
{
|
||||||
|
if (!VerticalLayoutLive) return;
|
||||||
|
|
||||||
|
// The vertical placement is the creator's own — keep it, so switching
|
||||||
|
// back and forth does not lose where they put it.
|
||||||
|
CommitLiveLayoutToVertical();
|
||||||
|
|
||||||
|
VerticalLayoutLive = false;
|
||||||
|
Width = LandscapeWidth;
|
||||||
|
Height = LandscapeHeight;
|
||||||
|
X = LandscapeX;
|
||||||
|
Y = LandscapeY;
|
||||||
|
ClipShape = LandscapeClipShape;
|
||||||
|
RectWidth = LandscapeRectWidth;
|
||||||
|
RectHeight = LandscapeRectHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Copies the live geometry into the stored vertical placement, so
|
||||||
|
/// the stored copy never lags the live one (the save path calls this).</summary>
|
||||||
|
public void CommitLiveLayoutToVertical()
|
||||||
|
{
|
||||||
|
VerticalX = X;
|
||||||
|
VerticalY = Y;
|
||||||
|
VerticalWidth = Width;
|
||||||
|
VerticalHeight = Height;
|
||||||
|
VerticalClipShape = ClipShape;
|
||||||
|
VerticalRectWidth = RectWidth;
|
||||||
|
VerticalRectHeight = RectHeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Chat scene's vertical layout is rect-only (the creator's table, the
|
||||||
|
// circle option is not offered there). Locking the SHAPE property — not
|
||||||
|
// just the toggle — means no writer can slip a Round camera in: the
|
||||||
|
// toggle, the shape button and the placement swap all go through here.
|
||||||
|
public override ClipShape ClipShape
|
||||||
|
{
|
||||||
|
get => base.ClipShape;
|
||||||
|
set => base.ClipShape = VerticalShapeLocked ? ClipShape.Traditional : value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void ToggleClipShape()
|
||||||
|
{
|
||||||
|
if (VerticalShapeLocked)
|
||||||
|
{
|
||||||
|
ClipShape = ClipShape.Traditional;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
base.ToggleClipShape();
|
||||||
|
}
|
||||||
|
|
||||||
|
// The geometry is clamped into the band while the vertical placement is
|
||||||
|
// live — a camera outside the cropped window is a camera the viewers never
|
||||||
|
// see, and every writer (drag, resize handle, the properties fields) goes
|
||||||
|
// through these setters.
|
||||||
|
public override double X
|
||||||
|
{
|
||||||
|
get => base.X;
|
||||||
|
set => base.X = ClampToBand(value, base.Width, vertical: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override double Y
|
||||||
|
{
|
||||||
|
get => base.Y;
|
||||||
|
set => base.Y = ClampToBand(value, base.Height, vertical: false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override double Width
|
||||||
|
{
|
||||||
|
get => base.Width;
|
||||||
|
set => base.Width = VerticalLayoutLive && !VerticalBand.IsEmpty
|
||||||
|
? Math.Min(value, VerticalBand.Width)
|
||||||
|
: value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override double Height
|
||||||
|
{
|
||||||
|
get => base.Height;
|
||||||
|
set => base.Height = VerticalLayoutLive && !VerticalBand.IsEmpty
|
||||||
|
? Math.Min(value, VerticalBand.Height / 2)
|
||||||
|
: value;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double ClampToBand(double value, double size, bool vertical)
|
||||||
|
{
|
||||||
|
if (!VerticalLayoutLive || VerticalBand.IsEmpty) return value;
|
||||||
|
var band = VerticalBand;
|
||||||
|
var min = vertical ? band.Left : band.Top;
|
||||||
|
var max = vertical ? band.Right - size : band.Bottom - size;
|
||||||
|
if (max < min) return min;
|
||||||
|
return Math.Clamp(value, min, max);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>One user-visible open window offered by the "Capture Window…"
|
||||||
|
/// submenu. Carries its owning process name for disambiguation and the raw
|
||||||
|
/// HWND that becomes the "window:<hwnd>" capture key.</summary>
|
||||||
|
public sealed class WindowInfo
|
||||||
|
{
|
||||||
|
public WindowInfo(string title, string processName, long hwnd, int processId)
|
||||||
|
{
|
||||||
|
Title = title;
|
||||||
|
ProcessName = processName;
|
||||||
|
Hwnd = hwnd;
|
||||||
|
ProcessId = processId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Title { get; }
|
||||||
|
public string ProcessName { get; }
|
||||||
|
public long Hwnd { get; }
|
||||||
|
public int ProcessId { get; }
|
||||||
|
|
||||||
|
/// <summary>Menu label: "Title — ProcessName" (e.g. "bash — WindowsTerminal").</summary>
|
||||||
|
public string Label => $"{Title} — {ProcessName}";
|
||||||
|
|
||||||
|
/// <summary>The capture key fed to the screen-capture factory
|
||||||
|
/// ("window:<hwnd>").</summary>
|
||||||
|
public string CaptureKey => $"window:0x{Hwnd:X}";
|
||||||
|
}
|
||||||
@@ -18,6 +18,21 @@ public record ReusableStream(string Id, string IngestionAddress, string StreamNa
|
|||||||
public string RtmpUrl => $"{IngestionAddress}/{StreamName}";
|
public string RtmpUrl => $"{IngestionAddress}/{StreamName}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>The six monetization events YouTube's live chat feed emits (the ONLY
|
||||||
|
/// native event stream there is — free subscribers produce no event). Each kind
|
||||||
|
/// drives its own celebration animation in the AlertBox. <c>None</c> = a normal
|
||||||
|
/// chat row: it never enqueues an alert (subscriber mentions stay chat rows).</summary>
|
||||||
|
public enum ChatEventKind
|
||||||
|
{
|
||||||
|
None,
|
||||||
|
SuperChat,
|
||||||
|
SuperSticker,
|
||||||
|
NewMember,
|
||||||
|
MemberGift,
|
||||||
|
GiftReceived,
|
||||||
|
MemberMilestone,
|
||||||
|
}
|
||||||
|
|
||||||
public class ChatMessage
|
public class ChatMessage
|
||||||
{
|
{
|
||||||
public string Id { get; init; } = Guid.NewGuid().ToString();
|
public string Id { get; init; } = Guid.NewGuid().ToString();
|
||||||
@@ -29,6 +44,31 @@ public class ChatMessage
|
|||||||
public bool IsSuperChat { get; set; }
|
public bool IsSuperChat { get; set; }
|
||||||
public double SuperChatAmount { get; set; }
|
public double SuperChatAmount { get; set; }
|
||||||
public string? SuperChatCurrency { get; set; }
|
public string? SuperChatCurrency { get; set; }
|
||||||
|
|
||||||
|
/// <summary>YouTube's own pre-rendered amount ("$12.34") — preferred over
|
||||||
|
/// recomposing amount+currency ourselves, which mangles non-dollar locales.</summary>
|
||||||
|
public string? SuperChatDisplayString { get; set; }
|
||||||
|
|
||||||
public bool IsMember { get; set; }
|
public bool IsMember { get; set; }
|
||||||
public string? MembershipLevel { get; set; }
|
public string? MembershipLevel { get; set; }
|
||||||
|
|
||||||
|
public ChatEventKind Kind { get; set; }
|
||||||
|
|
||||||
|
public string? SuperStickerDescription { get; set; }
|
||||||
|
|
||||||
|
/// <summary>membershipGiftingEvent: how many memberships were bought.</summary>
|
||||||
|
public int GiftNewMembersCount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>giftMembershipReceivedEvent: who gifted this one.</summary>
|
||||||
|
public string? GifterName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>memberMilestoneChatEvent: streak months (0 = YouTube didn't
|
||||||
|
/// expose a count — the animation falls back to the message text).</summary>
|
||||||
|
public int MilestoneMonths { get; set; }
|
||||||
|
|
||||||
|
/// <summary>TASK 41: the Test Stream dock injects synthetic member / SuperChat /
|
||||||
|
/// subscriber events locally (YouTube's insert API only supports text), so the
|
||||||
|
/// buffer can label them honestly — simulated events never reach YouTube.</summary>
|
||||||
|
public bool IsSimulated { get; set; }
|
||||||
|
public bool IsPinned { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>One captured snapshot of a connected channel's YPP-relevant numbers
|
||||||
|
/// (TASK 39). Appended on every refresh and archived in SQLite so a later slice
|
||||||
|
/// can compute velocity/(de)acceleration/ETA from the history.</summary>
|
||||||
|
public sealed class YppStatSnapshot
|
||||||
|
{
|
||||||
|
public DateTime CapturedAtUtc { get; set; }
|
||||||
|
public long SubscriberCount { get; set; }
|
||||||
|
public long VideoCount { get; set; }
|
||||||
|
public long TotalViews { get; set; }
|
||||||
|
public int UploadsLast90Days { get; set; }
|
||||||
|
public bool CommunityGuidelinesGoodStanding { get; set; }
|
||||||
|
public bool CopyrightStrikesGoodStanding { get; set; }
|
||||||
|
public bool ContentIdClaimsGoodStanding { get; set; }
|
||||||
|
public bool OverallGoodStanding { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>YPP eligibility thresholds as versioned, date-aware DATA — never
|
||||||
|
/// constants (ai.md "Journey tracker"). Tier 1 (fan funding) is time-invariant;
|
||||||
|
/// Tier 2 (ad revenue) doubles its long-form-hours and Shorts-view bars for NEW
|
||||||
|
/// applicants after 2027-02-01. Hardcoding the pre-2027 numbers would show the
|
||||||
|
/// wrong ETA once the doubling lands, so callers resolve the active Tier 2
|
||||||
|
/// threshold through <see cref="Tier2For"/>.</summary>
|
||||||
|
public static class YppThresholds
|
||||||
|
{
|
||||||
|
public sealed record TierThreshold(string Name, long Subscribers, long WatchHours, long ShortsViews);
|
||||||
|
|
||||||
|
/// <summary>The date the Tier-2 ad-revenue bars double for new applicants.</summary>
|
||||||
|
public static readonly DateTime Tier2DoublingDate = new(2027, 2, 1);
|
||||||
|
|
||||||
|
/// <summary>Fan-funding tier (before the full ad/YouTube Premium revenue tier).</summary>
|
||||||
|
public static TierThreshold Tier1 { get; } = new("Fan funding", 500, 3_000, 3_000_000);
|
||||||
|
|
||||||
|
/// <summary>The Tier-2 bar for a given point in time — 4,000h / 10M Shorts
|
||||||
|
/// before the doubling date, 8,000h / 20M Shorts on or after it.</summary>
|
||||||
|
public static TierThreshold Tier2For(DateTime when) => when >= Tier2DoublingDate
|
||||||
|
? new TierThreshold("Ad revenue", 1_000, 8_000, 20_000_000)
|
||||||
|
: new TierThreshold("Ad revenue", 1_000, 4_000, 10_000_000);
|
||||||
|
|
||||||
|
/// <summary>The currently-active Tier-2 threshold (resolved against today).</summary>
|
||||||
|
public static TierThreshold Tier2Now => Tier2For(DateTime.UtcNow);
|
||||||
|
|
||||||
|
/// <summary>Valid public long-form uploads required in the trailing 90 days
|
||||||
|
/// to keep each tier route eligible.</summary>
|
||||||
|
public const int UploadsRequiredPer90Days = 3;
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The transient zoom layer. It is a real scene element, but a special one: while
|
||||||
|
/// active the SceneCompositor draws it LAST (layer n+1, above everything) as a live
|
||||||
|
/// 2x view of a FIXED capture window (the box/2 region centred on where the creator
|
||||||
|
/// clicked), sampled from the just-composited frame — so it captures ALL layers and
|
||||||
|
/// keeps showing the same content no matter where the box is dragged (creator ruling
|
||||||
|
/// 2026-10-08). Its X/Y/W/H are the movable BOX placement; CaptureX/CaptureY is the
|
||||||
|
/// anchored capture window. While inactive it is an invisible placeholder that is
|
||||||
|
/// never persisted (LayoutStore hand-rolls only Source/WebcamSceneConfig rows) — the
|
||||||
|
/// VM re-inserts it on load and on scene creation, mirroring how backgrounds heal.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class ZoomSceneElement : SceneElement
|
||||||
|
{
|
||||||
|
/// <summary>True only while a zoom box is live; flips Kind so the layer leaves
|
||||||
|
/// the baked static base and composites per-frame.</summary>
|
||||||
|
public bool IsZoomActive { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Master-space top-left of the fixed capture window. Set once by
|
||||||
|
/// <c>ActivateZoom</c>; moving the box must never touch it.</summary>
|
||||||
|
public double CaptureX { get; set; }
|
||||||
|
public double CaptureY { get; set; }
|
||||||
|
|
||||||
|
public override ElementKind Kind => IsZoomActive ? ElementKind.Dynamic : ElementKind.Static;
|
||||||
|
|
||||||
|
public override bool IsZoomLayer => true;
|
||||||
|
|
||||||
|
public override bool IsDraggable => false;
|
||||||
|
|
||||||
|
/// <summary>Never rendered by the element template or the resolver — the preview
|
||||||
|
/// magnifier (ZoomBox) and the output compositor's zoom pass own its pixels.</summary>
|
||||||
|
public override ImageSource? DisplaySource => null;
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
public enum ZoomShape
|
||||||
|
{
|
||||||
|
Circle,
|
||||||
|
VerticalRectangle,
|
||||||
|
HorizontalRectangle
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace ytLive.Models;
|
||||||
|
|
||||||
|
public class ZoomState
|
||||||
|
{
|
||||||
|
public bool IsActive { get; set; }
|
||||||
|
public double X { get; set; }
|
||||||
|
public double Y { get; set; }
|
||||||
|
public double Width { get; set; }
|
||||||
|
public double Height { get; set; }
|
||||||
|
|
||||||
|
/// <summary>Master-space top-left of the FIXED capture window (the box/2 region
|
||||||
|
/// centred on the click). The box can be dragged anywhere; this never changes —
|
||||||
|
/// the box always shows this same region magnified 2x (creator ruling 2026-10-08).</summary>
|
||||||
|
public double CaptureX { get; set; }
|
||||||
|
public double CaptureY { get; set; }
|
||||||
|
|
||||||
|
public bool IsMoving { get; set; }
|
||||||
|
public double GrabOffsetX { get; set; }
|
||||||
|
public double GrabOffsetY { get; set; }
|
||||||
|
|
||||||
|
public double Left => X;
|
||||||
|
public double Top => Y;
|
||||||
|
public double Right => X + Width;
|
||||||
|
public double Bottom => Y + Height;
|
||||||
|
}
|
||||||
@@ -7,14 +7,18 @@ Plain data types. No logic beyond what a property can carry. See
|
|||||||
|------|---------|
|
|------|---------|
|
||||||
| `Scene.cs` | A scene: `Name`, `IsHidden`, `IsChatScene`, `IsEditing`, **`HasBackdrop`** (Live-only policy flag, default off — only the canonical Live scene has one, see `SceneCatalog`), `Elements` collection (images + webcam config), `WebcamConfig` accessor |
|
| `Scene.cs` | A scene: `Name`, `IsHidden`, `IsChatScene`, `IsEditing`, **`HasBackdrop`** (Live-only policy flag, default off — only the canonical Live scene has one, see `SceneCatalog`), `Elements` collection (images + webcam config), `WebcamConfig` accessor |
|
||||||
| `SceneCatalog.cs` | The five canonical scenes (Starting/Live/BRB/Chat/Ending) — the product, by name: `All`, `IsCanonical`, `Is(name, canonical)` (case-insensitive trim), `IsChat`, `HasBackdrop(name)` (true only for Live). Drives the empty-DB seed, the "+" missing-scenes menu, and `MainViewModel.EnforceBackdropPolicy` |
|
| `SceneCatalog.cs` | The five canonical scenes (Starting/Live/BRB/Chat/Ending) — the product, by name: `All`, `IsCanonical`, `Is(name, canonical)` (case-insensitive trim), `IsChat`, `HasBackdrop(name)` (true only for Live). Drives the empty-DB seed, the "+" missing-scenes menu, and `MainViewModel.EnforceBackdropPolicy` |
|
||||||
| `Source.cs` | A source: `SourceType` enum (DisplayCapture/WindowCapture/Background/Image/TextOverlay — **Webcam removed**), `X`/`Y`/`Width`/`Height`, `Opacity`, `IsEnabled`, `ImageSource` (static) / `VideoImageSource` (live frames), `DisplaySource` (`IsLiveCapture` → video, else static), `ClipShape` enum (Traditional/Round), `IsMirrored` + `MirrorScale`, `MirrorButtonText`/`ShapeButtonText`, asset identity, `IsImageSource` (XAML binds this, never `Type`), **backdrop surface**: `IsBackdrop` (permanent bottom layer, never removable), `CaptureKey` (persisted `monitor:<n>`/`window:<hwnd>`/`picker:<name>`), `IsLiveCapture` (`Type` is Display/WindowCapture) |
|
| `Source.cs` | A source: `SourceType` enum (DisplayCapture/WindowCapture/Background/Image/TextOverlay/ChatBox/Countdown/WebSource/MediaSource/**AlertBox (TASK 43 — the celebration zone, one per layout)** — **Webcam removed**), `X`/`Y`/`Width`/`Height`, `Opacity`, `IsEnabled`, `ImageSource` (static) / `VideoImageSource` (live frames), `DisplaySource` (`IsLiveCapture` → video, else static), `ClipShape` enum (Traditional/Round), `IsMirrored` + `MirrorScale`, `MirrorButtonText`, asset identity, `IsImageSource` (XAML binds this, never `Type`), **backdrop surface**: `IsBackdrop` (permanent bottom layer, never removable), `CaptureKey` (persisted `monitor:<n>`/`window:<hwnd>`/`picker:<name>`), `IsLiveCapture` (`Type` is Display/WindowCapture) |
|
||||||
| `SceneElement.cs` | Base for anything placeable in a scene: shared layout/clip/mirror/border surface, `virtual IsWebcam`/`virtual IsImageSource`; `ToggleClipShape` + persisted `RectWidth`/`RectHeight` (pre-Round rect so round→rect restores after reload) |
|
| `SceneElement.cs` | Base for anything placeable in a scene: shared layout/clip/mirror/border surface, `virtual IsWebcam`/`virtual IsImageSource`/`virtual IsZoomLayer` (TASK 52); `ToggleClipShape` + persisted `RectWidth`/`RectHeight` (pre-Round rect so round→rect restores after reload); **TASK 57:** the geometry setters (`X`/`Y`/`Width`/`Height`) are `virtual` so a derived element can CONSTRAIN every write (the webcam clamps itself into the vertical tier's band) instead of every writer re-implementing the rule; `ClipShape` + `ToggleClipShape()` are `virtual` too, so a derived element can CONSTRAIN the shape (the Chat scene's vertical camera is rect-only); **TASK 59:** `IsRectShape`/`IsRoundShape` — the shape as a CHOICE (the properties panel shows Rect | Circle with Rect selected by default), each a settable bool whose setter flips the shape through `ToggleClipShape()` and always re-raises, so the UI snaps back when a write is refused; **TASK 63:** `BorderColorEntry` (the palette entry for the current border colour — hex + NAME, a nameless entry for a custom hex; setting it writes the hex back) and `BorderColorOptions` (the palette + that entry), both raised when `BorderColor` changes — the drop-down binds to them |
|
||||||
|
| `VerticalCameraLayout.cs` | **TASK 57 (the "vv" feature):** the vertical (9:16) tier's camera rules as pure math — `TileWidth`/`TileHeight` (270×152 master px = 480×270 in the 1080×1920 output), `Inset` (32 master px from the band's outer edge), `IsVerticalTier(QualityOption)` (portrait tier), `AreaFor(band, bottom)` (the band splits into two 607×540 areas), `MaxSizeFor(band)`, `SpotFor(band, w, h, centreX, centreY)` (the six spots — the area and column the tile's **centre** falls in, inset, never outside the band) and `DefaultSpot` (bottom-right, the corner the 16:9 default webcam uses), `FillsArea(band, width)` (the camera is wide enough to fill a whole area = "enlarged") and `SizeFor(band, requestedWidth)` (the Chat camera's TWO sizes - the small tile or one whole 607×540 area — whichever is nearer the requested width, so the resize handle has two detents) |
|
||||||
|
| `ZoomSceneElement.cs` | **Transient zoom box (TASK 52, creator-corrected 2026-10-08):** carries the box rect AND the anchored `CaptureX`/`CaptureY` (the fixed box/2 capture window set on `ActivateZoom`; moving the box never touches it). `IsZoomActive` flips `Kind` Static→Dynamic (leaves the baked base while active); never persisted (LayoutStore save skips non-Source/non-WebcamSceneConfig rows), never shown in the layers list or the element template (`IsZoomLayer` gates both). The compositor SKIPS the active element in every layer loop and draws its 2x content LAST (layer n+1) via `ZoomMagnifier`. |
|
||||||
| `Webcam.cs` | Singleton webcam identity: `Id`, `DeviceId`, `Name` (one row app-wide) |
|
| `Webcam.cs` | Singleton webcam identity: `Id`, `DeviceId`, `Name` (one row app-wide) |
|
||||||
| `WebcamSceneConfig.cs` | Per-scene webcam placement (subclass of `SceneElement`): geometry + `IsVisible` + border (`BorderColor`/`BorderOpacity`/`BorderWidth`/`BorderAnimation`) + `VideoImageSource`; `WebcamId` links to `Webcam` |
|
| `BackgroundEffect.cs` | **TASK 51:** per-webcam background effect enum `None` / `Remove` / `Blur`, carried by `WebcamSceneConfig` |
|
||||||
|
| `BorderColorPalette.cs` | **TASK 60:** the colours the webcam's border-colour drop-down offers — `NamedColor(Hex, Name)` + `BorderColorPalette.All` (the single source of truth; the drop-down is bound to it) and `NameOf(hex)` (case-insensitive; **empty** for a colour outside the palette — "no name" is the honest answer, TASK 62). The creator asked for a colour NAME next to each hex: `#e94560 Crimson`. **TASK 63:** `EntryFor(hex)` (the palette entry for a hex, case-insensitively; a nameless entry for a colour outside the palette) and `OptionsFor(hex)` (the palette + that entry) — the two the drop-down binds to; `NamedColor.ToString()` is `"Crimson (#e94560)"` |
|
||||||
|
| `WebcamSceneConfig.cs` | Per-scene webcam placement (subclass of `SceneElement`): geometry + `IsVisible` + border (`BorderColor`/`BorderOpacity`/`BorderWidth`/`BorderAnimation`) + `VideoImageSource`; `WebcamId` links to `Webcam`; **TASK 51:** `BackgroundEffect` + `BackgroundStrength` (0..1, default 0.5) + the radio-pill surface `RemoveBackground`/`BlurBackground` (one on turns the other off; both off = None) + `HasBackgroundEffect` (shows the strength slider); **TASK 57 (the "vv" feature):** the vertical (9:16) tier's OWN placement per scene — `VerticalX/Y/Width/Height/VerticalClipShape/VerticalRectWidth/VerticalRectHeight` (persisted, NULL = no vertical placement yet) + the transient `VerticalBand`/`VerticalLayoutLive`/`LandscapeX…LandscapeRectHeight` (the parked 16:9 layout) + `BeginVerticalLayout`/`EndVerticalLayout`/`CommitLiveLayoutToVertical` (the tier swap) and the `X`/`Y`/`Width`/`Height` overrides that clamp every write into the band; `VerticalShapeLocked` (the Chat scene's vertical layout is rect-only) **overrides** `ClipShape` + `ToggleClipShape()` so no writer can slip a circle in |
|
||||||
| `QualityOption.cs` | Resolution tier record `(Display, Fps, Bitrate, Width, Height)`; `Label` formats as `1080p60 (8Mbps)` — drives the bottom-bar dropdown and the output-rect math |
|
| `QualityOption.cs` | Resolution tier record `(Display, Fps, Bitrate, Width, Height)`; `Label` formats as `1080p60 (8Mbps)` — drives the bottom-bar dropdown and the output-rect math |
|
||||||
| `StreamConfig.cs` | `StreamConfig` (note: `TargetBitrate`/`Resolution` defaults are stale — not yet wired to the dropdown), `StreamHealth` (bitrate/FPS/dropped/duration), `StreamStatus` enum |
|
| `StreamConfig.cs` | `StreamConfig` (note: `TargetBitrate`/`Resolution` defaults are stale — not yet wired to the dropdown), `StreamHealth` (bitrate/FPS/dropped/duration), `StreamStatus` enum |
|
||||||
| `MicStatus.cs` | Footer mic indicator: `NotConnected` / `Connected` / `Problem` — the state behind the MIC button's status dot (red = no device/capture off, green = capturing, yellow = a requested mic failed: in use/unplugged) |
|
| `MicStatus.cs` | Footer mic indicator: `NotConnected` / `Connected` / `Problem` — the state behind the MIC button's status dot (red = no device/capture off, green = capturing, yellow = a requested mic failed: in use/unplugged) |
|
||||||
| `YouTube.cs` | `YouTubeChannel` and `ChatMessage` (chat feed) |
|
| `YouTube.cs` | `YouTubeChannel` and `ChatMessage` (chat feed) — since TASK 43 every message carries `Kind` (`ChatEventKind` None/SuperChat/SuperSticker/NewMember/MemberGift/GiftReceived/MemberMilestone) + event payload fields (`SuperChatDisplayString`, `SuperStickerDescription`, `GiftNewMembersCount`, `GifterName`, `MilestoneMonths`) |
|
||||||
| `Socials.cs` | **Social bar** (global layer, never a Source): `SocialService` enum (YouTube/Twitch/X/Instagram/TikTok/Facebook/Discord/Kick/Threads/Bluesky/GitHub/LinkedIn/Pinterest/Snapchat/Reddit/WhatsApp/Telegram/Link/Website/**Fediverse**), `SocialEntry` (Service/Handle/ProfileUrl/`FediverseSoftware`), `SocialsConfig` (Entries + `BarPosition` Top/Bottom + `BarEnabled` on/off — `BarJustify` dropped, column back-compat), `SocialServiceIcons` (canonical URL builder + `DetectService` (URL domain / fediverse `@user@domain` → **Fediverse** / bare→Website) + bundled SVG logo path data per service (`LogoDataFor`) + `LogoDataForFediverse(software)` mapping nodeinfo software names (mastodon/peertube/pixelfed/misskey/lemmy/pleroma/firefish) to logos with a generic fediverse glyph fallback (`FediverseIconData`) + `LockedIconData`/`DoNotIconData` — initials/colors gone) |
|
| `Socials.cs` | **Social bar** (global layer, never a Source): `SocialService` enum (YouTube/Twitch/X/Instagram/TikTok/Facebook/Discord/Kick/Threads/Bluesky/GitHub/LinkedIn/Pinterest/Snapchat/Reddit/WhatsApp/Telegram/Link/Website/**Fediverse**), `SocialEntry` (Service/Handle/ProfileUrl/`FediverseSoftware`), `SocialsConfig` (Entries + `BarPosition` Top/Bottom + `BarEnabled` on/off — `BarJustify` dropped, column back-compat), `SocialServiceIcons` (canonical URL builder + `DetectService` (URL domain / fediverse `@user@domain` → **Fediverse** / bare→Website) + bundled SVG logo path data per service (`LogoDataFor`) + `LogoDataForFediverse(software)` mapping nodeinfo software names (mastodon/peertube/pixelfed/misskey/lemmy/pleroma/firefish) to logos with a generic fediverse glyph fallback (`FediverseIconData`) + `LockedIconData`/`DoNotIconData` — initials/colors gone) |
|
||||||
|
|
||||||
Related: [`ViewModels/index.md`](../ViewModels/index.md) consume these;
|
Related: [`ViewModels/index.md`](../ViewModels/index.md) consume these;
|
||||||
|
|||||||
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 30 KiB |
@@ -0,0 +1,78 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
LlamaCasty — Microsoft Store MSIX manifest (TASK 48).
|
||||||
|
|
||||||
|
Full trust is the whole point of this file: the app records to the user's profile,
|
||||||
|
launches the bundled ffmpeg as a CHILD PROCESS, opens an ordinary Win32 folder picker,
|
||||||
|
and drives WebView2. None of that works in an AppContainer, so this is a
|
||||||
|
packagedClassicApp at mediumIL with the runFullTrust restricted capability.
|
||||||
|
|
||||||
|
⛔ Do NOT change this to appContainer: recording silently starts writing to a
|
||||||
|
per-package virtualised folder and the output "vanishes" (TASK 48 item 6).
|
||||||
|
|
||||||
|
⚠️ Before submission, replace Publisher with the exact Publisher value Partner Center
|
||||||
|
shows for the account, and PublisherDisplayName with its display name — a mismatch is
|
||||||
|
a certification rejection. The version is bumped per submission.
|
||||||
|
-->
|
||||||
|
<Package
|
||||||
|
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
|
||||||
|
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
|
||||||
|
xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
|
||||||
|
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
|
||||||
|
IgnorableNamespaces="uap uap10 rescap">
|
||||||
|
|
||||||
|
<Identity
|
||||||
|
Name="LlamaCasty"
|
||||||
|
Publisher="CN=LlamaCasty"
|
||||||
|
Version="1.0.0.0"
|
||||||
|
ProcessorArchitecture="x64" />
|
||||||
|
|
||||||
|
<Properties>
|
||||||
|
<DisplayName>LlamaCasty</DisplayName>
|
||||||
|
<PublisherDisplayName>LlamaCasty</PublisherDisplayName>
|
||||||
|
<Description>Live streaming to YouTube: scenes, sources, a webcam with background effects, alerts, chat and recording.</Description>
|
||||||
|
<Logo>Assets\StoreLogo.png</Logo>
|
||||||
|
</Properties>
|
||||||
|
|
||||||
|
<Dependencies>
|
||||||
|
<TargetDeviceFamily
|
||||||
|
Name="Windows.Desktop"
|
||||||
|
MinVersion="10.0.19041.0"
|
||||||
|
MaxVersionTested="10.0.26100.0" />
|
||||||
|
</Dependencies>
|
||||||
|
|
||||||
|
<!-- English only (Store policy 10.7): a second language here means the listing
|
||||||
|
description must be localised into it too. -->
|
||||||
|
<Resources>
|
||||||
|
<Resource Language="en-US" />
|
||||||
|
</Resources>
|
||||||
|
|
||||||
|
<Applications>
|
||||||
|
<Application
|
||||||
|
Id="LlamaCasty"
|
||||||
|
Executable="ytLive.exe"
|
||||||
|
EntryPoint="Windows.FullTrustApplication"
|
||||||
|
uap10:TrustLevel="mediumIL"
|
||||||
|
uap10:RuntimeBehavior="packagedClassicApp">
|
||||||
|
<uap:VisualElements
|
||||||
|
DisplayName="LlamaCasty"
|
||||||
|
Description="Live streaming to YouTube: scenes, sources, a webcam with background effects, alerts, chat and recording."
|
||||||
|
BackgroundColor="#171928"
|
||||||
|
Square150x150Logo="Assets\Square150x150Logo.png"
|
||||||
|
Square44x44Logo="Assets\Square44x44Logo.png">
|
||||||
|
<!-- The wide and 310 tiles live on DefaultTile, not on VisualElements — the
|
||||||
|
Windows 10 uap:VisualElements schema has no such attributes. -->
|
||||||
|
<uap:DefaultTile
|
||||||
|
Wide310x150Logo="Assets\Wide310x150Logo.png"
|
||||||
|
Square310x310Logo="Assets\Square310x310Logo.png" />
|
||||||
|
</uap:VisualElements>
|
||||||
|
</Application>
|
||||||
|
</Applications>
|
||||||
|
|
||||||
|
<Capabilities>
|
||||||
|
<rescap:Capability Name="runFullTrust" />
|
||||||
|
<DeviceCapability Name="webcam" />
|
||||||
|
<DeviceCapability Name="microphone" />
|
||||||
|
</Capabilities>
|
||||||
|
|
||||||
|
</Package>
|
||||||
@@ -1,63 +1,134 @@
|
|||||||
# ytLlive
|
# LlamaCasty
|
||||||
|
|
||||||
<p align="center">
|
<p align="center">
|
||||||
<img src="Assets/llamacasty-logo.jpg" alt="LlamaCasty — livestream smarter" height="120"/>
|
<img src="Assets/llamacasty-logo.jpg" alt="LlamaCasty — livestream smarter" height="120"/>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
A creator-proof live-streaming and recording app for YouTube — native Windows (C# / WPF / .NET 8).
|
A free, open-source Windows app for streaming live to YouTube and recording to your PC.
|
||||||
|
Native Windows (C# / WPF / .NET 8). Website: https://llamacasty.com
|
||||||
|
|
||||||
## Screenshot
|

|
||||||
|
|
||||||

|
## Why I built it
|
||||||
|
|
||||||
## Design Principle
|
I'm Gramps. I've been gaming since 1981, and these days I stream *The Division 2* on YouTube.
|
||||||
|
|
||||||
> This software is so intuitive that even the most right-brained person can easily intuit and use it.
|
When I started streaming, I did what everybody does: I installed the big, general-purpose
|
||||||
|
streaming tools. They're excellent software — powerful, flexible, and built to handle every
|
||||||
|
platform, every camera rig, and every plugin anyone has ever dreamed up. That breadth is exactly
|
||||||
|
what makes them great, and it's also what makes them a lot to learn. Before my first stream I was
|
||||||
|
reading setup guides, picking encoders, balancing audio by hand, and wiring up scenes from
|
||||||
|
scratch. The tools were ready for anything. I just wanted to go live.
|
||||||
|
|
||||||
Every feature is measured against this. One-click go-live, sane YouTube defaults, visual scene
|
Most streamers I talk to are in the same spot. They don't need a tool for every platform and every
|
||||||
building, and no dead ends — every action has a visible outcome.
|
setup — they need one that's ready for *theirs*. So I built LlamaCasty around three choices:
|
||||||
|
|
||||||
## Why ytLlive
|
- **One platform, done properly.** LlamaCasty streams to YouTube and only YouTube. That focus lets
|
||||||
|
it be built around how YouTube Live actually works — your channel, your chat, Super Chats and
|
||||||
|
memberships, Shorts-style vertical video, and the YouTube Partner Program — instead of treating
|
||||||
|
YouTube as one destination among many.
|
||||||
|
- **Ready the moment you open it.** Five scenes (Starting, Live, BRB, Chat, Ending) are set up,
|
||||||
|
your game and voice are balanced with auto-ducking and voice polish built in, and YouTube's
|
||||||
|
settings are filled in. You arrange things by dragging them, then press Go Live.
|
||||||
|
- **Calm while you're live.** A private Test Stream to practice, a layout that locks while you're
|
||||||
|
on air, and warnings only when YouTube reports a real problem.
|
||||||
|
|
||||||
OBS treats YouTube as an afterthought; SLOBS is Twitch-first with YouTube bolted on. ytLlive is
|
The general-purpose tools are the right choice when you need everything. LlamaCasty is for when you
|
||||||
designed and dedicated to YouTube livestreaming and recording, and to YouTube's specific quirks.
|
just want to get your show on air.
|
||||||
|
|
||||||
## Account Assumption
|
## Free, and staying that way
|
||||||
|
|
||||||
ytLlive assumes you already have a YouTube creator account — connecting uses "Sign in with Google"
|
LlamaCasty is free forever: no watermark, no branding on your stream, no subscription, no
|
||||||
to link that existing account. **ytLlive does not create accounts.** If you don't have a YouTube
|
LlamaCasty account. It's also open source (see [License](#license)) — enjoy it, explore it,
|
||||||
channel yet, set one up on YouTube first, then connect it here.
|
experiment with it. If it earns a spot in your setup and you'd like to say thanks, there's a
|
||||||
|
coffee jar and a merch store linked from https://llamacasty.com. Completely optional, never
|
||||||
|
expected, and the app will never ask.
|
||||||
|
|
||||||
## Run
|
## How it's built
|
||||||
|
|
||||||
```bash
|
LlamaCasty is built through AI-assisted pair programming, under the direction of a developer with
|
||||||
dotnet build # Windows only — WPF
|
decades of experience. Architecture, product direction, and quality gates are human-owned; AI
|
||||||
dotnet run
|
speeds up the implementation. The repo's memory map (below) is how that collaboration stays honest
|
||||||
```
|
from one session to the next.
|
||||||
|
|
||||||
## Version Roadmap
|
## Requirements
|
||||||
|
|
||||||
| Version | Scope |
|
- **64-bit Windows 10 or 11.** (The bundled FFmpeg and ONNX Runtime are 64-bit only.)
|
||||||
|---------|-------|
|
- **A YouTube channel, to stream.** LlamaCasty links an existing channel with "Sign in with
|
||||||
| v0.1 | Scene/source management, YouTube RTMP ingest, YouTube OAuth2, live chat, stream health |
|
Google" — it doesn't create accounts. Recording to an .mp4 works without signing in.
|
||||||
| v0.2 | Recording to local file |
|
- **Working sound in Windows.** Desktop and game audio come from your default output
|
||||||
| v0.3 | Stream scheduling |
|
automatically; you choose your mic in the app. LlamaCasty doesn't diagnose or repair Windows
|
||||||
| v0.4 | Multi-destination restreaming |
|
audio — if it doesn't sound right in Windows, fix it there first.
|
||||||
| 1.0 | General availability |
|
|
||||||
|
## Build from source
|
||||||
|
|
||||||
|
The internal project, assembly, and namespace names are still `ytLive` (the app was renamed to
|
||||||
|
LlamaCasty; the internals weren't). Building needs Windows and the .NET 8 SDK.
|
||||||
|
|
||||||
|
1. **Fetch the bundled FFmpeg** (not in git — ~135 MB, pinned and SHA-256-verified):
|
||||||
|
`scripts/fetch-ffmpeg.sh`
|
||||||
|
2. **Add your own Google OAuth client.** `Helpers/OAuthCredentials.cs` is gitignored. Create a
|
||||||
|
"Desktop app" OAuth client with the YouTube Data API v3 enabled in Google Cloud Console, then:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
namespace ytLive.Helpers;
|
||||||
|
|
||||||
|
public static class OAuthCredentials
|
||||||
|
{
|
||||||
|
public const string ClientId = "your-client-id.apps.googleusercontent.com";
|
||||||
|
public const string ClientSecret = "your-client-secret";
|
||||||
|
}
|
||||||
|
```
|
||||||
|
3. **Build and run:**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet build ytLive.csproj
|
||||||
|
dotnet run --project ytLive.csproj
|
||||||
|
```
|
||||||
|
|
||||||
|
## Version roadmap
|
||||||
|
|
||||||
|
**v1 is the finished product** (no v1.x releases are planned). Everything still in the queue lands
|
||||||
|
in v1; anything not on the feature list is on the **"Out of product — permanently"** list in
|
||||||
|
`TASKS.md` — read that before asking for a feature.
|
||||||
|
|
||||||
|
What v1 ships: the five-scene control surface, webcam + screen capture, media + web + text
|
||||||
|
sources, chat on stream, the social bar, mic/desktop audio with auto-ducking and TRAX background
|
||||||
|
music, local recording, quality tiers including vertical 9:16, one-click go-live + scheduling,
|
||||||
|
stream resilience, monetization awareness (YPP tracker), animated alerts, and webcam background
|
||||||
|
removal and blur — all free and ungated.
|
||||||
|
|
||||||
## Structure
|
## Structure
|
||||||
|
|
||||||
| Path | Role |
|
| Path | Role |
|
||||||
|------|------|
|
|------|------|
|
||||||
| `Models/` | Scene, Source, QualityOption, StreamConfig, StreamHealth, YouTube channel/chat, Socials (social bar) |
|
| `Models/` | Scene, Source, WebcamSceneConfig, SceneElement, SceneCatalog, QualityOption, StreamConfig/Health, chat, Socials, BroadcastMetadata, Music, MicStatus, BackgroundEffect |
|
||||||
| `ViewModels/` | MainViewModel — scenes, stream controls, chat; GoLiveViewModel, ReuseImageViewModel, SocialsDialogViewModel |
|
| `ViewModels/` | MainViewModel (partial classes per area) + dialogs: GoLive, CameraPicker, MicPicker, HotkeyConfig, Socials, LiveBroadcastForm |
|
||||||
| `Services/` | YouTubeAuthService (OAuth2), YouTubeStreamService (broadcast/health), YouTubeChatService (chat polling), LayoutStore (SQLite), SocialValidator (social link/fediverse validation + nodeinfo icon resolution) |
|
| `Services/` | YouTube (OAuth, streams/broadcasts, chat polling), LayoutStore (SQLite), capture (camera/screen-capture/media-file via FFmpeg), SceneCompositor + FramePump, FFmpeg encoder + RTMP, audio pipeline (WASAPI loopback + mic, mixer, filters, ducker, limiter, TRAX), background effects (ONNX person segmentation), SocialValidator, notifications, hotkeys, SceneGraph, ChatOverlayLayer |
|
||||||
| `Helpers/` | ViewModelBase, RelayCommand, ImageCache, AppLog, FocusPreservingListBox, OAuthCredentials |
|
| `Helpers/` | ViewModelBase, RelayCommand, ImageCache, AppLog, TokenStore (DPAPI), OAuthCredentials (gitignored), converters |
|
||||||
| `Themes/` | `Controls.xaml` — the dark-theme control styles, merged once in `App.xaml` |
|
| `Themes/` | `Controls.xaml` — the dark-theme control styles, merged once in `App.xaml` |
|
||||||
| `MainWindow.xaml` | Dark-theme main UI: scene/source panel, preview, chat, status bar |
|
| `MainWindow.xaml` | Dark-theme control surface: thumbnails + central preview, two-state left panel (layers/properties ↔ live chat), top bar, footer |
|
||||||
| `SocialsDialog.xaml` | Social Media Site Promotion dialog — 6-slot social bar editor with sign-in gate and validation |
|
| `tools/` | Offline helper tools (e.g. `selfie-seg/` — converts and verifies the background-effects model) |
|
||||||
|
|
||||||
## Docs (memory map)
|
## Docs (memory map)
|
||||||
|
|
||||||
`schema.md` defines the conventions; `ai.md` is the AI/session guide;
|
`schema.md` defines the conventions; `ai.md` is the AI/session guide; `TASKS.md` is the task
|
||||||
`TASKS.md` is the task queue. Each code directory carries an `index.md`.
|
queue; `HANDOFF.md` is the current state. Each code directory carries an `index.md`.
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
LlamaCasty is free software, released under the **GNU General Public License v3.0 or later**
|
||||||
|
([`LICENSE`](LICENSE)) with three additional terms permitted by GPL-3.0 section 7
|
||||||
|
([`ADDITIONAL-TERMS.md`](ADDITIONAL-TERMS.md)):
|
||||||
|
|
||||||
|
- **Keep the credit** — any copy, modified or not, shows "Based on LlamaCasty by Gramps —
|
||||||
|
https://llamacasty.com" in its About screen.
|
||||||
|
- **Rename your fork** — modified versions are marked as modified and use a different name.
|
||||||
|
- **No trademark rights** — the LlamaCasty name and llama logo aren't licensed. The icon and logo
|
||||||
|
files are all rights reserved and aren't covered by the GPL.
|
||||||
|
|
||||||
|
The scene backgrounds and default alert video are AI-generated placeholders, licensed with the
|
||||||
|
code — replace them with your own. Bundled third-party components keep their own licenses: see
|
||||||
|
[`THIRD-PARTY-NOTICES.txt`](THIRD-PARTY-NOTICES.txt).
|
||||||
|
|
||||||
|
Source code: https://llgit.llamachile.tube/gramps/LlamaCasty
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.RenameRecordingDialog"
|
<Window x:Class="ytLive.RenameRecordingDialog"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Rename Recording" Height="230" Width="460"
|
Title="Rename Recording" Height="304" Width="460"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/ytLive;component/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Grid Margin="24">
|
<Grid Margin="24">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
@@ -16,9 +16,9 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Rename Recording" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Rename Recording" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
<TextBlock Grid.Row="1" TextWrapping="Wrap" Foreground="#a0a0b0" FontSize="13"
|
<TextBlock Grid.Row="1" TextWrapping="Wrap" Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13"
|
||||||
Margin="0,0,0,16">
|
Margin="0,0,0,16">
|
||||||
The recording is saved with an auto-generated name. Give it a clearer name —
|
The recording is saved with an auto-generated name. Give it a clearer name —
|
||||||
leave it empty to keep the auto name.
|
leave it empty to keep the auto name.
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
Margin="0,20,0,0">
|
Margin="0,20,0,0">
|
||||||
<Button Content="Cancel" Click="Cancel_Click"
|
<Button Content="Cancel" Click="Cancel_Click"
|
||||||
Style="{StaticResource YtButtonSecondary}" Margin="0,0,8,0"/>
|
Style="{StaticResource YtButtonSecondary}" Margin="0,0,8,0"/>
|
||||||
<Button Content="Save" Click="Save_Click" Style="{StaticResource YtButton}" MinWidth="90"/>
|
<Button Content="Save" Click="Save_Click" Style="{StaticResource YtButton}" MinWidth="90" x:Name="SaveRecordingButton"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
|
|||||||
@@ -6,12 +6,16 @@ namespace ytLive;
|
|||||||
|
|
||||||
/// <summary>Modal that lets the creator rename an auto-named recording before it is
|
/// <summary>Modal that lets the creator rename an auto-named recording before it is
|
||||||
/// finalized. Returns the chosen file stem (no extension) via <see cref="ResultFileName"/>,
|
/// finalized. Returns the chosen file stem (no extension) via <see cref="ResultFileName"/>,
|
||||||
/// or <c>null</c> on Cancel / keep-auto-name.</summary>
|
/// or <c>null</c> when the creator cleared the box and hit Save (keep the auto name).
|
||||||
|
/// <para><c>DialogResult == false</c> means DISCARD — the caller deletes the footage
|
||||||
|
/// rather than saving it (CREATOR RULING 2026-09-26). Enter on the pre-filled default
|
||||||
|
/// is a Save.</para></summary>
|
||||||
public partial class RenameRecordingDialog : Window
|
public partial class RenameRecordingDialog : Window
|
||||||
{
|
{
|
||||||
private readonly string _autoStem;
|
private readonly string _autoStem;
|
||||||
|
|
||||||
/// <summary>Stem (no extension) the creator chose, or <c>null</c> to keep auto-name.</summary>
|
/// <summary>Stem (no extension) the creator chose, or <c>null</c> when the box was
|
||||||
|
/// cleared on an explicit Save. Never set on Cancel.</summary>
|
||||||
public string? ResultFileName { get; private set; }
|
public string? ResultFileName { get; private set; }
|
||||||
|
|
||||||
public RenameRecordingDialog(string autoStem)
|
public RenameRecordingDialog(string autoStem)
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<Window x:Class="ytLive.ReuseImageDialog"
|
<Window x:Class="ytLive.ReuseImageDialog"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
Title="Add Image" Height="380" Width="460"
|
Title="Add Image" Height="380" Width="460"
|
||||||
Icon="/Assets/llamacasty-icon.png"
|
Icon="/Assets/llamacasty-icon.png"
|
||||||
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
WindowStartupLocation="CenterOwner" ResizeMode="NoResize"
|
||||||
ShowInTaskbar="False" Background="#1a1a2e">
|
ShowInTaskbar="False" Background="{StaticResource Brush.Background}">
|
||||||
|
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
@@ -20,10 +20,10 @@
|
|||||||
</Border>
|
</Border>
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger Property="IsMouseOver" Value="True">
|
<Trigger Property="IsMouseOver" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#1c2a52"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger Property="IsSelected" Value="True">
|
<Trigger Property="IsSelected" Value="True">
|
||||||
<Setter TargetName="Bd" Property="Background" Value="#2a2450"/>
|
<Setter TargetName="Bd" Property="Background" Value="{StaticResource Brush.SurfaceContainerHigh}"/>
|
||||||
</Trigger>
|
</Trigger>
|
||||||
</ControlTemplate.Triggers>
|
</ControlTemplate.Triggers>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
@@ -42,10 +42,10 @@
|
|||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<TextBlock Grid.Row="0" Text="Add Image" FontSize="18" FontWeight="Bold"
|
<TextBlock Grid.Row="0" Text="Add Image" FontSize="18" FontWeight="Bold"
|
||||||
Foreground="#e0e0e0" Margin="0,0,0,14"/>
|
Foreground="{StaticResource Brush.OnSurface}" Margin="0,0,0,14"/>
|
||||||
|
|
||||||
<TextBlock Grid.Row="1" Text="Re-use an image that's already in your stream, or add a new one?"
|
<TextBlock Grid.Row="1" Text="Re-use an image that's already in your stream, or add a new one?"
|
||||||
Foreground="#a0a0b0" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
Foreground="{StaticResource Brush.OnSurfaceVariant}" FontSize="13" TextWrapping="Wrap" Margin="0,0,0,12"/>
|
||||||
|
|
||||||
<ListBox Grid.Row="2" Background="Transparent" BorderThickness="0"
|
<ListBox Grid.Row="2" Background="Transparent" BorderThickness="0"
|
||||||
ItemContainerStyle="{StaticResource CandidateItem}"
|
ItemContainerStyle="{StaticResource CandidateItem}"
|
||||||
@@ -59,11 +59,11 @@
|
|||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<Border Background="#0f3460" CornerRadius="3" Width="48" Height="27" ClipToBounds="True">
|
<Border Background="{StaticResource Brush.SurfaceContainerHigh}" CornerRadius="3" Width="48" Height="27" ClipToBounds="True">
|
||||||
<Image Source="{Binding Thumbnail}" Stretch="Uniform" Margin="1"/>
|
<Image Source="{Binding Thumbnail}" Stretch="Uniform" Margin="1"/>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<TextBlock Grid.Column="1" Text="{Binding Header}" Foreground="#e0e0e0" FontSize="13"
|
<TextBlock Grid.Column="1" Text="{Binding Header}" Foreground="{StaticResource Brush.OnSurface}" FontSize="13"
|
||||||
VerticalAlignment="Center" Margin="10,0,0,0"
|
VerticalAlignment="Center" Margin="10,0,0,0"
|
||||||
TextTrimming="CharacterEllipsis"/>
|
TextTrimming="CharacterEllipsis"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -0,0 +1,227 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using ytLive.Helpers;
|
||||||
|
using ytLive.Services.Audio;
|
||||||
|
using ytLive.Services.Encoder;
|
||||||
|
|
||||||
|
namespace ytLive.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TASK 47: one alert clip's playback — video frames + on-stream audio from the
|
||||||
|
/// same file, both paced to real time. The alert box owns a decoder per event
|
||||||
|
/// (start at play, dispose at drain) — unlike MediaSource's app-wide refcounted
|
||||||
|
/// session, an alert REPLAYS the same clip each event, so a fresh decode per
|
||||||
|
/// play is required. Video is rawvideo BGRA scaled to the box rect (the
|
||||||
|
/// <see cref="MediaVideoSource"/> shape); audio is ffmpeg <c>f32le</c> at the
|
||||||
|
/// mixer's native 48 kHz stereo (so the mixer ring needs no resampler). The
|
||||||
|
/// fade is applied by the alert layer, not here.
|
||||||
|
/// </summary>
|
||||||
|
public interface IAlertClipDecoder : IDisposable
|
||||||
|
{
|
||||||
|
/// <summary>Starts the decode loop (video + audio); raises the events off the
|
||||||
|
/// calling thread. Paced to real time so playback matches wall clock.</summary>
|
||||||
|
void Start();
|
||||||
|
|
||||||
|
/// <summary>Stops and kills any running decode subprocesses.</summary>
|
||||||
|
void Stop();
|
||||||
|
|
||||||
|
/// <summary>One decoded video frame (box-sized, straight-alpha BGRA).</summary>
|
||||||
|
event Action<VideoFrame>? FrameAvailable;
|
||||||
|
|
||||||
|
/// <summary>One chunk of on-stream audio (48 kHz stereo float).</summary>
|
||||||
|
event Action<AudioSample>? AudioReady;
|
||||||
|
|
||||||
|
/// <summary>Raised once when both streams have fully played out.</summary>
|
||||||
|
event Action? Completed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Default <see cref="IAlertClipDecoder"/>: two ffmpeg subprocesses on
|
||||||
|
/// the same file. Video via <see cref="RawVideoFrameReader"/> on a <c>rawvideo
|
||||||
|
/// bgra</c> pipe (-an), audio via an <c>f32le -ac 2 -ar 48000</c> pipe (-vn).
|
||||||
|
/// The seams (locator, process factory, frame-rate probe, delay) let tests drive
|
||||||
|
/// a fake decoder without a real codec or Windows.</summary>
|
||||||
|
public sealed class AlertClipDecoder : IAlertClipDecoder
|
||||||
|
{
|
||||||
|
public event Action<VideoFrame>? FrameAvailable;
|
||||||
|
public event Action<AudioSample>? AudioReady;
|
||||||
|
public event Action? Completed;
|
||||||
|
|
||||||
|
private const int AudioSampleRate = 48000;
|
||||||
|
private const int AudioChannels = 2;
|
||||||
|
private const int AudioChunkFloats = 4800; // 50ms of stereo
|
||||||
|
|
||||||
|
private readonly string _path;
|
||||||
|
private readonly int _width;
|
||||||
|
private readonly int _height;
|
||||||
|
private readonly IFfmpegLocator _locator;
|
||||||
|
private readonly Func<IDecodeProcess> _processFactory;
|
||||||
|
private readonly IFrameRateProbe? _probe;
|
||||||
|
private readonly Func<TimeSpan, CancellationToken, Task> _delay;
|
||||||
|
private readonly CancellationTokenSource _cts = new();
|
||||||
|
private Task? _run;
|
||||||
|
|
||||||
|
public AlertClipDecoder(
|
||||||
|
string path,
|
||||||
|
int width,
|
||||||
|
int height,
|
||||||
|
IFfmpegLocator locator,
|
||||||
|
Func<IDecodeProcess> processFactory,
|
||||||
|
IFrameRateProbe? frameRateProbe = null,
|
||||||
|
Func<TimeSpan, CancellationToken, Task>? delay = null)
|
||||||
|
{
|
||||||
|
_path = path;
|
||||||
|
_width = width;
|
||||||
|
_height = height;
|
||||||
|
_locator = locator;
|
||||||
|
_processFactory = processFactory;
|
||||||
|
_probe = frameRateProbe;
|
||||||
|
_delay = delay ?? ((t, ct) => Task.Delay(t, ct));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
if (_run != null) return;
|
||||||
|
_run = Task.Run(RunAsync, CancellationToken.None);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Stop() => _cts.Cancel();
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_cts.Cancel();
|
||||||
|
_cts.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task RunAsync()
|
||||||
|
{
|
||||||
|
var ct = _cts.Token;
|
||||||
|
var videoFrames = 0;
|
||||||
|
var audioChunks = 0;
|
||||||
|
var failed = false;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
double? frameRate = null;
|
||||||
|
if (_probe != null)
|
||||||
|
frameRate = await _probe.ProbeAsync(_path, ct).ConfigureAwait(false);
|
||||||
|
var frameDuration = frameRate is > 0 ? TimeSpan.FromSeconds(1.0 / frameRate.Value) : TimeSpan.Zero;
|
||||||
|
|
||||||
|
var ffmpegPath = await _locator.LocateAsync(ct).ConfigureAwait(false);
|
||||||
|
|
||||||
|
var videoTask = RunVideoAsync(ffmpegPath, frameDuration, ct);
|
||||||
|
var audioTask = RunAudioAsync(ffmpegPath, ct);
|
||||||
|
videoFrames = await videoTask.ConfigureAwait(false);
|
||||||
|
audioChunks = await audioTask.ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
failed = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// A failed decode is not fatal: the alert layer falls back to the six
|
||||||
|
// animations (or the frame it already holds) exactly as a missing file.
|
||||||
|
// Logged so a silent blank box traces back to a decode failure.
|
||||||
|
failed = true;
|
||||||
|
AppLog.Write(ex, $"Alert clip decode failed ({Path.GetFileName(_path)})");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!ct.IsCancellationRequested)
|
||||||
|
{
|
||||||
|
AppLog.Write($"Alert clip end: {Path.GetFileName(_path)} frames={videoFrames} audioChunks={audioChunks} failed={failed}");
|
||||||
|
Completed?.Invoke();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<int> RunVideoAsync(string ffmpegPath, TimeSpan frameDuration, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var args =
|
||||||
|
$"-hide_banner -loglevel error -i \"{_path}\" " +
|
||||||
|
$"-f rawvideo -pix_fmt bgra -vf scale={_width}:{_height} -an -";
|
||||||
|
using var process = _processFactory();
|
||||||
|
process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = ffmpegPath,
|
||||||
|
Arguments = args,
|
||||||
|
UseShellExecute = false,
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
CreateNoWindow = true,
|
||||||
|
});
|
||||||
|
|
||||||
|
var reader = new RawVideoFrameReader(_width, _height);
|
||||||
|
var buffer = new byte[65536];
|
||||||
|
var stream = process.StandardOutput;
|
||||||
|
var frames = 0;
|
||||||
|
while (!ct.IsCancellationRequested && !process.HasExited)
|
||||||
|
{
|
||||||
|
var read = await stream.ReadAsync(buffer, 0, buffer.Length, ct).ConfigureAwait(false);
|
||||||
|
if (read <= 0) break;
|
||||||
|
var chunk = new byte[read];
|
||||||
|
Buffer.BlockCopy(buffer, 0, chunk, 0, read);
|
||||||
|
foreach (var frame in reader.Feed(chunk))
|
||||||
|
{
|
||||||
|
frames++;
|
||||||
|
FrameAvailable?.Invoke(frame);
|
||||||
|
if (frameDuration > TimeSpan.Zero)
|
||||||
|
await _delay(frameDuration, ct).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return frames;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<int> RunAudioAsync(string ffmpegPath, CancellationToken ct)
|
||||||
|
{
|
||||||
|
var args =
|
||||||
|
$"-hide_banner -loglevel error -i \"{_path}\" " +
|
||||||
|
$"-f f32le -ac {AudioChannels} -ar {AudioSampleRate} -vn -";
|
||||||
|
using var process = _processFactory();
|
||||||
|
process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = ffmpegPath,
|
||||||
|
Arguments = args,
|
||||||
|
UseShellExecute = false,
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
CreateNoWindow = true,
|
||||||
|
});
|
||||||
|
|
||||||
|
var stream = process.StandardOutput;
|
||||||
|
var raw = new byte[65536];
|
||||||
|
var carry = new byte[0];
|
||||||
|
var floatScratch = new float[AudioChunkFloats];
|
||||||
|
var floatIndex = 0;
|
||||||
|
var chunks = 0;
|
||||||
|
// The pipe is byte-delimited only: a read may split a float, so leftover
|
||||||
|
// bytes are carried into the next read instead of dropped (a dropped
|
||||||
|
// half-float would desync the entire stream).
|
||||||
|
while (!ct.IsCancellationRequested && !process.HasExited)
|
||||||
|
{
|
||||||
|
var read = await stream.ReadAsync(raw, 0, raw.Length, ct).ConfigureAwait(false);
|
||||||
|
if (read <= 0) break;
|
||||||
|
var total = carry.Length + read;
|
||||||
|
var bytes = total <= raw.Length ? raw : new byte[total];
|
||||||
|
if (carry.Length > 0)
|
||||||
|
{
|
||||||
|
Buffer.BlockCopy(carry, 0, bytes, 0, carry.Length);
|
||||||
|
Buffer.BlockCopy(raw, 0, bytes, carry.Length, read);
|
||||||
|
}
|
||||||
|
var floatsTo = total - (total % 4);
|
||||||
|
for (var i = 0; i < floatsTo && floatIndex < floatScratch.Length; i += 4)
|
||||||
|
floatScratch[floatIndex++] = BitConverter.ToSingle(bytes, i);
|
||||||
|
carry = total > floatsTo ? bytes[floatsTo..total] : new byte[0];
|
||||||
|
|
||||||
|
while (floatIndex == floatScratch.Length)
|
||||||
|
{
|
||||||
|
chunks++;
|
||||||
|
AudioReady?.Invoke(new AudioSample(floatScratch, AudioSampleRate, AudioChannels));
|
||||||
|
// Pace the NEXT chunk so the whole clip's audio lands at real-time
|
||||||
|
// cadence (the fade in the alert layer tracks the same wall clock).
|
||||||
|
await _delay(TimeSpan.FromSeconds(AudioChunkFloats / (double)(AudioSampleRate * AudioChannels)), ct).ConfigureAwait(false);
|
||||||
|
floatScratch = new float[AudioChunkFloats];
|
||||||
|
floatIndex = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return chunks;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,541 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using System.Windows.Threading;
|
||||||
|
using ytLive.Helpers;
|
||||||
|
using ytLive.Models;
|
||||||
|
using ytLive.Services.Audio;
|
||||||
|
using ytLive.Services.Compositor;
|
||||||
|
|
||||||
|
namespace ytLive.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The native alert box (OBS-style celebration zone, no third party). Owns the
|
||||||
|
/// event queue and the animation clock: <see cref="ChatEventKind"/> events from
|
||||||
|
/// the chat feed are enqueued one-at-a-time and played through a celebration
|
||||||
|
/// animation (<see cref="AlertRenderer"/>) OR — when the alert-box video is
|
||||||
|
/// configured and resolves — through a decoded clip. Frames are served to the
|
||||||
|
/// stream compositor via <see cref="RenderFrame"/> and mirrored to the preview
|
||||||
|
/// via <see cref="UpdatePreview"/>. Idle = transparent (null frame); playback is
|
||||||
|
/// advanced by a 33ms dispatch ticker. The clock is exposed as
|
||||||
|
/// <see cref="Advance"/> so tests drive playback deterministically without the
|
||||||
|
/// timer. Ordinary chat rows (<see cref="ChatEventKind.None"/>) never enqueue —
|
||||||
|
/// a subscriber mention is a chat row, not an alert.
|
||||||
|
///
|
||||||
|
/// TASK 47 (Stream Alerts video): a video-backed alert replaces the animation
|
||||||
|
/// while a clip decodes (<see cref="IAlertClipDecoder"/>, one per play). The
|
||||||
|
/// clip plays at its own media pace; the layer applies a ~300ms fade-in/out
|
||||||
|
/// alpha envelope to the frames AND the audio samples (freeze-frame fade-out on
|
||||||
|
/// the tail), clips the alert to the clip length, and forwards the scaled audio
|
||||||
|
/// to the mixer's alert ring via <paramref name="audioSink"/> (no duck). The
|
||||||
|
/// per-source config (path/default/ticker/volume) is resolved through
|
||||||
|
/// <paramref name="clipPathResolver"/>; the ticker strip is served via
|
||||||
|
/// <see cref="AlertTickerFrame"/>.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class AlertOverlayLayer : IDisposable
|
||||||
|
{
|
||||||
|
/// <summary>The fade-in/out ramp length (video alpha AND audio gain). Measured
|
||||||
|
/// against a real clip in the AlertLayerVideoTests unit; keep the ramp short
|
||||||
|
/// enough to read as a "pop-in" on stream (see ai.md).</summary>
|
||||||
|
internal const double FadeDurationSeconds = 0.30;
|
||||||
|
|
||||||
|
/// <summary>How long an alert waits for the first decoded frame or audio slab
|
||||||
|
/// before treating the clip as unplayable and falling back to the animations
|
||||||
|
/// (a silent decoder must never blank the alert box).</summary>
|
||||||
|
internal const double NoFrameFallbackSeconds = 1.0;
|
||||||
|
|
||||||
|
private static readonly TimeSpan TickInterval = TimeSpan.FromMilliseconds(33);
|
||||||
|
|
||||||
|
private readonly AlertRenderer _renderer;
|
||||||
|
private readonly Func<string, int, int, IAlertClipDecoder>? _clipDecoderFactory;
|
||||||
|
private readonly Func<Source, string?>? _clipPathResolver;
|
||||||
|
private readonly Action<AudioSample>? _audioSink;
|
||||||
|
private readonly Action<VideoFrame?>? _tickerPreviewSink;
|
||||||
|
private readonly Queue<ChatMessage> _queue = new();
|
||||||
|
private readonly DispatcherTimer? _ticker;
|
||||||
|
|
||||||
|
private ChatMessage? _current;
|
||||||
|
private Source? _currentBox;
|
||||||
|
private IAlertClipDecoder? _clip;
|
||||||
|
private VideoFrame? _latestClipFrame;
|
||||||
|
private bool _clipEof;
|
||||||
|
private double _clipEofElapsed;
|
||||||
|
private int _clipWidth;
|
||||||
|
private int _clipHeight;
|
||||||
|
private bool _clipSawFrame;
|
||||||
|
private bool _clipAudioHeard;
|
||||||
|
private string? _tickerText;
|
||||||
|
private AlertDisplayMethod _tickerMethod = AlertDisplayMethod.TickerScroll;
|
||||||
|
private double _elapsed;
|
||||||
|
private IEnumerable<Scene>? _scenes;
|
||||||
|
|
||||||
|
private int _contentVersion;
|
||||||
|
private int _frameVersion = -1;
|
||||||
|
private string? _frameKey;
|
||||||
|
private VideoFrame? _cachedFrame;
|
||||||
|
private DateTime _lastPreviewLog = DateTime.MinValue;
|
||||||
|
|
||||||
|
public AlertOverlayLayer(
|
||||||
|
AlertRenderer renderer,
|
||||||
|
Func<string, int, int, IAlertClipDecoder>? clipDecoderFactory = null,
|
||||||
|
Func<Source, string?>? clipPathResolver = null,
|
||||||
|
Action<AudioSample>? audioSink = null,
|
||||||
|
Action<VideoFrame?>? tickerPreviewSink = null)
|
||||||
|
{
|
||||||
|
_renderer = renderer;
|
||||||
|
_clipDecoderFactory = clipDecoderFactory;
|
||||||
|
_clipPathResolver = clipPathResolver;
|
||||||
|
_audioSink = audioSink;
|
||||||
|
_tickerPreviewSink = tickerPreviewSink;
|
||||||
|
if (Application.Current != null)
|
||||||
|
{
|
||||||
|
_ticker = new DispatcherTimer { Interval = TickInterval };
|
||||||
|
_ticker.Tick += (_, _) =>
|
||||||
|
{
|
||||||
|
Advance(TickInterval.TotalSeconds);
|
||||||
|
RefreshAlertPreviews();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Production entry from the chat feed: enqueue one event. Messages
|
||||||
|
/// arrive on the chat poller thread, so this marshals to the UI thread (same
|
||||||
|
/// rule as <see cref="ChatOverlayLayer.OnMessageReceived"/>) — the preview
|
||||||
|
/// writes create WPF <see cref="WriteableBitmap"/> instances, and creating a
|
||||||
|
/// DependencySource off the UI thread crashes the WPF binding engine
|
||||||
|
/// (ArgumentException "Must create DependencySource on same Thread").</summary>
|
||||||
|
public void OnMessageReceived(ChatMessage message, IEnumerable<Scene> scenes)
|
||||||
|
{
|
||||||
|
var app = Application.Current;
|
||||||
|
if (app != null && !app.Dispatcher.CheckAccess())
|
||||||
|
{
|
||||||
|
app.Dispatcher.Invoke(() => Ingest(message, scenes));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Ingest(message, scenes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Ingest(ChatMessage message, IEnumerable<Scene> scenes)
|
||||||
|
{
|
||||||
|
_scenes = scenes;
|
||||||
|
Enqueue(message);
|
||||||
|
_ticker?.Start();
|
||||||
|
RefreshAlertPreviews();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Queue an event (pure — also the test seam). Chat rows carry
|
||||||
|
/// <see cref="ChatEventKind.None"/> and are ignored: no alert for a mention.</summary>
|
||||||
|
public void Enqueue(ChatMessage message)
|
||||||
|
{
|
||||||
|
if (message.Kind == ChatEventKind.None) return;
|
||||||
|
if (_queue.Count >= 10) return; // back-to-back floods drop the tail, never stall playback
|
||||||
|
_queue.Enqueue(message);
|
||||||
|
if (_current == null)
|
||||||
|
{
|
||||||
|
_current = _queue.Dequeue();
|
||||||
|
_elapsed = 0;
|
||||||
|
BeginClip();
|
||||||
|
}
|
||||||
|
_contentVersion++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Advance the playback clock (the ticker's beat — and the test seam;
|
||||||
|
/// tests call this directly and never start the timer). Draining the queue to
|
||||||
|
/// nothing stops the ticker and leaves the box transparent.</summary>
|
||||||
|
public void Advance(double deltaSeconds)
|
||||||
|
{
|
||||||
|
// Video-backed alert: duration is clip-driven. The clip plays at media
|
||||||
|
// pace; once it EOFs the last frame sweeps through the fade-out before
|
||||||
|
// the alert moves on (a hard cut at EOF would pop, not fade).
|
||||||
|
if (_clip != null)
|
||||||
|
{
|
||||||
|
_elapsed += deltaSeconds;
|
||||||
|
// A decoder that starts but produces not a single frame (or slab of
|
||||||
|
// audio) is dead weight — the box would sit transparent for the whole
|
||||||
|
// alert. Give it a short grace, then fall back to the animations so an
|
||||||
|
// alert ALWAYS renders (the live decode failure at 2026-09-26 11:44 was
|
||||||
|
// this exact void, invisible in the log).
|
||||||
|
if (!_clipSawFrame && !_clipAudioHeard && _elapsed >= NoFrameFallbackSeconds)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine("Alert clip yielded no frames in 1s — falling back to the animation");
|
||||||
|
StopClip();
|
||||||
|
_elapsed = 0;
|
||||||
|
_contentVersion++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (_clipEof && _elapsed - _clipEofElapsed >= FadeDurationSeconds)
|
||||||
|
{
|
||||||
|
_clipEof = false;
|
||||||
|
StopClip();
|
||||||
|
_current = null;
|
||||||
|
_elapsed = 0;
|
||||||
|
AdvanceToNext();
|
||||||
|
}
|
||||||
|
_contentVersion++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_current == null)
|
||||||
|
{
|
||||||
|
if (_queue.Count == 0) return;
|
||||||
|
_current = _queue.Dequeue();
|
||||||
|
_elapsed = 0;
|
||||||
|
BeginClip();
|
||||||
|
_contentVersion++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_elapsed += deltaSeconds;
|
||||||
|
if (_elapsed >= DurationOf(_current))
|
||||||
|
{
|
||||||
|
_current = null;
|
||||||
|
_elapsed = 0;
|
||||||
|
AdvanceToNext();
|
||||||
|
}
|
||||||
|
_contentVersion++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Whether an alert is currently playing or queued.</summary>
|
||||||
|
public bool IsPlaying => _current != null || _queue.Count > 0;
|
||||||
|
|
||||||
|
/// <summary>The live-output frame for one AlertBox element: the decoded clip
|
||||||
|
/// frame (faded) while a clip is active, else the animation frame, null
|
||||||
|
/// (transparent) when idle.</summary>
|
||||||
|
public VideoFrame? RenderFrame(Source alertBox)
|
||||||
|
{
|
||||||
|
if (_current == null)
|
||||||
|
{
|
||||||
|
_frameKey = null;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_clip != null)
|
||||||
|
return RenderClipFrame(alertBox);
|
||||||
|
|
||||||
|
var width = (int)Math.Max(1, alertBox.Width);
|
||||||
|
var height = (int)Math.Max(1, alertBox.Height);
|
||||||
|
var key = $"{width}x{height}|{_current.Id}|{Progress()}";
|
||||||
|
|
||||||
|
if (_frameKey == key && _frameVersion == _contentVersion)
|
||||||
|
return _cachedFrame;
|
||||||
|
|
||||||
|
var app = Application.Current;
|
||||||
|
if (app != null && !app.Dispatcher.CheckAccess())
|
||||||
|
{
|
||||||
|
var capturedKey = key;
|
||||||
|
var capturedVersion = _contentVersion;
|
||||||
|
return app.Dispatcher.Invoke(() =>
|
||||||
|
{
|
||||||
|
if (_frameKey == capturedKey && _frameVersion == capturedVersion)
|
||||||
|
return _cachedFrame;
|
||||||
|
return RenderCore(alertBox, width, height, capturedKey, capturedVersion);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return RenderCore(alertBox, width, height, key, _contentVersion);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>The ticker strip as the alert box shows it: a marquee, a pulse or a
|
||||||
|
/// static pill naming the event while an alert plays, else null. Pure byte-math
|
||||||
|
/// per call so the frame pump can read it on any thread (the text strip is
|
||||||
|
/// rasterized once on the UI thread and cached).
|
||||||
|
/// <para><b>Creator ruling 2026-09-26:</b> the strip is composited INSIDE the
|
||||||
|
/// Stream Alerts box, not as a full-width bar at the top edge of the frame — "the
|
||||||
|
/// ticker should appear over the stream alerts video, not over the entire preview
|
||||||
|
/// window". So the frame is rendered at the box's own size and carries the box's
|
||||||
|
/// origin on <see cref="VideoFrame.Placement"/>; every blit site reads
|
||||||
|
/// <see cref="VideoFrame.OriginX"/>/<see cref="VideoFrame.OriginY"/> instead of
|
||||||
|
/// a hardcoded 0. <b>No alert box in the scene means no ticker at all</b> — there
|
||||||
|
/// is no longer a global position for it to live in.</para></summary>
|
||||||
|
public VideoFrame? AlertTickerFrame
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (_current == null || string.IsNullOrWhiteSpace(_tickerText)) return null;
|
||||||
|
var box = _currentBox;
|
||||||
|
if (box == null) return null;
|
||||||
|
|
||||||
|
var w = (int)Math.Max(1, Math.Round(box.Width));
|
||||||
|
var h = (int)Math.Max(1, Math.Min(
|
||||||
|
Math.Round(box.Height), AlertTickerRenderer.Height));
|
||||||
|
var frame = AlertTickerRenderer.Render(
|
||||||
|
_tickerText!, _elapsed, _tickerMethod, AlertSeconds(),
|
||||||
|
TickerReadsPerAlert, w, h);
|
||||||
|
return frame == null
|
||||||
|
? null
|
||||||
|
: new VideoFrame(frame.Width, frame.Height, frame.BgraPixels)
|
||||||
|
{
|
||||||
|
Placement = ((int)Math.Round(box.X), (int)Math.Round(box.Y)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>How many times the marquee must cross the frame per alert, so the
|
||||||
|
/// announcement is actually readable inside a 10s clip (2026-09-26: the old
|
||||||
|
/// fixed 140px/s took ~17s per pass, so a 10s alert showed it barely once).</summary>
|
||||||
|
internal const int TickerReadsPerAlert = 3;
|
||||||
|
|
||||||
|
/// <summary>Assumed alert length for the marquee rhythm. The clip's real length
|
||||||
|
/// isn't known until it EOFs, and the shipped default clip is 10s — the number
|
||||||
|
/// the creator's "three reads" target is stated against.</summary>
|
||||||
|
internal const double AssumedAlertSeconds = 10.0;
|
||||||
|
|
||||||
|
private double AlertSeconds() => _clip != null ? AssumedAlertSeconds : DurationOf(_current!);
|
||||||
|
|
||||||
|
|
||||||
|
private VideoFrame? RenderClipFrame(Source alertBox)
|
||||||
|
{
|
||||||
|
var frame = _latestClipFrame;
|
||||||
|
if (frame == null) return null;
|
||||||
|
|
||||||
|
var w = (int)Math.Max(1, alertBox.Width);
|
||||||
|
var h = (int)Math.Max(1, alertBox.Height);
|
||||||
|
if (frame.Width != w || frame.Height != h)
|
||||||
|
frame = StretchMath.BilinearScale(frame, w, h);
|
||||||
|
|
||||||
|
var fade = FadeAt();
|
||||||
|
if (fade >= 1.0) return frame;
|
||||||
|
|
||||||
|
// Straight-alpha source-over on the compositor side: scale the source
|
||||||
|
// alpha by the envelope so the clip blends out (a 680x200 copy per fade
|
||||||
|
// tick is trivial; outside the ramps fade==1 returns the raw frame).
|
||||||
|
var copy = new byte[frame.BgraPixels.Length];
|
||||||
|
Buffer.BlockCopy(frame.BgraPixels, 0, copy, 0, copy.Length);
|
||||||
|
var a = (byte)(fade * 255 + 0.5);
|
||||||
|
for (var i = 3; i < copy.Length; i += 4)
|
||||||
|
copy[i] = (byte)((copy[i] * a) >> 8);
|
||||||
|
return new VideoFrame(frame.Width, frame.Height, copy);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double FadeAt()
|
||||||
|
{
|
||||||
|
if (_clip == null) return 1.0;
|
||||||
|
if (_clipEof)
|
||||||
|
return Math.Clamp(1.0 - (_elapsed - _clipEofElapsed) / FadeDurationSeconds, 0.0, 1.0);
|
||||||
|
return Math.Clamp(_elapsed / FadeDurationSeconds, 0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BeginClip()
|
||||||
|
{
|
||||||
|
StopClip();
|
||||||
|
_tickerText = null;
|
||||||
|
if (_current == null) return;
|
||||||
|
|
||||||
|
var box = _scenes?.SelectMany(s => s.Elements).OfType<Source>()
|
||||||
|
.FirstOrDefault(s => s.Type == SourceType.AlertBox);
|
||||||
|
_currentBox = box;
|
||||||
|
if (box != null && box.AlertShowTicker)
|
||||||
|
{
|
||||||
|
_tickerText = ComposeTicker(_current);
|
||||||
|
_tickerMethod = box.AlertDisplayMethod;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (box == null || _clipDecoderFactory == null) return;
|
||||||
|
var path = _clipPathResolver?.Invoke(box);
|
||||||
|
if (string.IsNullOrWhiteSpace(path)) return;
|
||||||
|
|
||||||
|
_clipWidth = (int)Math.Max(1, box.Width);
|
||||||
|
_clipHeight = (int)Math.Max(1, box.Height);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_clipSawFrame = false;
|
||||||
|
_clipAudioHeard = false;
|
||||||
|
_clip = _clipDecoderFactory(path, _clipWidth, _clipHeight);
|
||||||
|
_clip.FrameAvailable += OnClipFrame;
|
||||||
|
_clip.AudioReady += OnClipAudio;
|
||||||
|
_clip.Completed += OnClipCompleted;
|
||||||
|
_clip.Start();
|
||||||
|
AppLog.Write($"Alert clip start: box {box.Id} path '{path}' {_clipWidth}x{_clipHeight}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
AppLog.Write(ex, "Alert clip setup failed");
|
||||||
|
StopClip(); // decode setup failed (bad path) — fall back to animations
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StopClip()
|
||||||
|
{
|
||||||
|
var clip = _clip;
|
||||||
|
_clip = null;
|
||||||
|
_latestClipFrame = null;
|
||||||
|
_clipEof = false;
|
||||||
|
_clipSawFrame = false;
|
||||||
|
_clipAudioHeard = false;
|
||||||
|
if (clip == null) return;
|
||||||
|
clip.FrameAvailable -= OnClipFrame;
|
||||||
|
clip.AudioReady -= OnClipAudio;
|
||||||
|
clip.Completed -= OnClipCompleted;
|
||||||
|
try { clip.Stop(); } catch { /* already stopped */ }
|
||||||
|
clip.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClipFrame(VideoFrame frame)
|
||||||
|
{
|
||||||
|
_clipSawFrame = true;
|
||||||
|
_latestClipFrame = frame;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClipCompleted()
|
||||||
|
{
|
||||||
|
_clipEof = true;
|
||||||
|
_clipEofElapsed = _elapsed;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnClipAudio(AudioSample sample)
|
||||||
|
{
|
||||||
|
if (_audioSink == null) return;
|
||||||
|
_clipAudioHeard = true;
|
||||||
|
var volume = (float)Math.Clamp(_currentBox?.AlertVideoVolume ?? 1.0, 0.0, 1.0);
|
||||||
|
if (volume <= 0f) return;
|
||||||
|
var fade = FadeAt();
|
||||||
|
if (fade <= 0.0) return;
|
||||||
|
|
||||||
|
var data = sample.Samples;
|
||||||
|
if (fade < 1.0 || Math.Abs(volume - 1f) > 0.001f)
|
||||||
|
{
|
||||||
|
data = new float[data.Length];
|
||||||
|
var gain = volume * (float)fade;
|
||||||
|
for (var i = 0; i < sample.Samples.Length; i++)
|
||||||
|
data[i] = sample.Samples[i] * gain;
|
||||||
|
}
|
||||||
|
_audioSink(new AudioSample(data, sample.SampleRate, sample.Channels));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void AdvanceToNext()
|
||||||
|
{
|
||||||
|
if (_queue.Count > 0)
|
||||||
|
{
|
||||||
|
_current = _queue.Dequeue();
|
||||||
|
_elapsed = 0;
|
||||||
|
BeginClip();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_ticker?.Stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private VideoFrame? RenderCore(Source alertBox, int width, int height, string key, int version)
|
||||||
|
{
|
||||||
|
_frameKey = key;
|
||||||
|
_frameVersion = version;
|
||||||
|
if (_current == null) return _cachedFrame = null;
|
||||||
|
return _cachedFrame = _renderer.Render(_current, Progress(), width, height);
|
||||||
|
}
|
||||||
|
|
||||||
|
private double Progress()
|
||||||
|
{
|
||||||
|
if (_current == null) return 0;
|
||||||
|
return Math.Clamp(_elapsed / DurationOf(_current), 0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double DurationOf(ChatMessage m) => m.Kind switch
|
||||||
|
{
|
||||||
|
ChatEventKind.SuperChat => 4.6,
|
||||||
|
ChatEventKind.SuperSticker => 4.2,
|
||||||
|
ChatEventKind.NewMember => 4.0,
|
||||||
|
ChatEventKind.MemberGift => 5.0,
|
||||||
|
ChatEventKind.GiftReceived => 4.4,
|
||||||
|
ChatEventKind.MemberMilestone => 4.8,
|
||||||
|
_ => 4.0,
|
||||||
|
};
|
||||||
|
|
||||||
|
private static string ComposeTicker(ChatMessage m)
|
||||||
|
{
|
||||||
|
var label = m.Kind switch
|
||||||
|
{
|
||||||
|
ChatEventKind.SuperChat => "Super Chat",
|
||||||
|
ChatEventKind.SuperSticker => "Super Sticker",
|
||||||
|
ChatEventKind.NewMember => "New Member",
|
||||||
|
ChatEventKind.MemberGift => "Membership Gift",
|
||||||
|
ChatEventKind.GiftReceived => "Gifted Membership",
|
||||||
|
ChatEventKind.MemberMilestone => "Member Milestone",
|
||||||
|
_ => "Stream Alert",
|
||||||
|
};
|
||||||
|
var amount = m.Kind is ChatEventKind.SuperChat or ChatEventKind.SuperSticker
|
||||||
|
&& m.SuperChatDisplayString is { Length: > 0 } s
|
||||||
|
? $" · {s}"
|
||||||
|
: "";
|
||||||
|
return $"{m.AuthorName} — {label}{amount}";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Render the current state onto one AlertBox preview (mirrors chat):
|
||||||
|
/// the playing frame, or null when idle so the source shows nothing until an
|
||||||
|
/// event actually fires.</summary>
|
||||||
|
public void UpdatePreview(Source alertBox)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var frame = RenderFrame(alertBox);
|
||||||
|
// Preview eyes (TASK 47, 2026-09-26): a healthy decode painted nothing on
|
||||||
|
// the canvas. UpdatePreview swallows its failures to Debug, so say once a
|
||||||
|
// second whether the box is being handed a frame at all.
|
||||||
|
if (IsPlaying)
|
||||||
|
{
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
if (now - _lastPreviewLog >= TimeSpan.FromSeconds(1))
|
||||||
|
{
|
||||||
|
_lastPreviewLog = now;
|
||||||
|
AppLog.Write($"Alert preview: box {alertBox.Id} frame="
|
||||||
|
+ (frame == null ? "null" : $"{frame.Width}x{frame.Height} a{frame.BgraPixels[3]}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (frame == null)
|
||||||
|
{
|
||||||
|
alertBox.VideoImageSource = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var width = (int)Math.Max(1, alertBox.Width);
|
||||||
|
var height = (int)Math.Max(1, alertBox.Height);
|
||||||
|
var bitmap = new WriteableBitmap(width, height, 96, 96, PixelFormats.Bgra32, null);
|
||||||
|
bitmap.WritePixels(new Int32Rect(0, 0, width, height), frame.BgraPixels, frame.Stride, 0);
|
||||||
|
alertBox.VideoImageSource = bitmap;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Diagnostics.Debug.WriteLine($"Alert preview failed: {ex.Message}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Wire property-change subscriptions for all AlertBox sources across
|
||||||
|
/// every scene (geometry changes re-render), and clear/reset their previews.</summary>
|
||||||
|
public void UpdateConfiguredBoxes(IEnumerable<Scene> scenes)
|
||||||
|
{
|
||||||
|
_scenes = scenes;
|
||||||
|
foreach (var scene in scenes)
|
||||||
|
foreach (var alertBox in scene.Elements.OfType<Source>().Where(s => s.Type == SourceType.AlertBox))
|
||||||
|
{
|
||||||
|
alertBox.PropertyChanged += (_, e) =>
|
||||||
|
{
|
||||||
|
if (e.PropertyName is nameof(Source.Width) or nameof(Source.Height))
|
||||||
|
UpdatePreview(alertBox);
|
||||||
|
};
|
||||||
|
UpdatePreview(alertBox);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void RefreshAlertPreviews()
|
||||||
|
{
|
||||||
|
// The announcement strip is a GLOBAL 1920px overlay, not a per-box frame, so
|
||||||
|
// it gets its own sink: until this existed the strip went only to the frame
|
||||||
|
// pump and was therefore invisible in the preview pane the creator watches
|
||||||
|
// (2026-09-26 — "I do not see the scrolling text").
|
||||||
|
_tickerPreviewSink?.Invoke(AlertTickerFrame);
|
||||||
|
|
||||||
|
if (_scenes == null) return;
|
||||||
|
foreach (var alertBox in _scenes.SelectMany(s => s.Elements).OfType<Source>()
|
||||||
|
.Where(s => s.Type == SourceType.AlertBox))
|
||||||
|
UpdatePreview(alertBox);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
_ticker?.Stop();
|
||||||
|
_queue.Clear();
|
||||||
|
_current = null;
|
||||||
|
StopClip();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,390 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Media;
|
||||||
|
using System.Windows.Media.Imaging;
|
||||||
|
using ytLive.Models;
|
||||||
|
using ytLive.Services.Compositor;
|
||||||
|
|
||||||
|
namespace ytLive.Services;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Renders one event's celebration animation into a BGRA8 frame for the AlertBox.
|
||||||
|
/// Six event kinds, six UNIQUE animations — each a distinct gesture, palette and
|
||||||
|
/// layout (the creator's ruling: these are the monetization shout-outs and free
|
||||||
|
/// branded product placement; a one-template recoloring loses all interest in two
|
||||||
|
/// iterations). Each card carries the bottom-right brand line so every broadcast
|
||||||
|
/// of an event is an in-video ad placement.
|
||||||
|
///
|
||||||
|
/// <paramref name="t01"/> walks 0→1 over the whole animation; each kind splits it
|
||||||
|
/// into enter / hold / exit phases with its own easing.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class AlertRenderer
|
||||||
|
{
|
||||||
|
private const double EnterEnd = 0.16;
|
||||||
|
private const double ExitStart = 0.80;
|
||||||
|
private const string Brand = "made with LlamaCasty!";
|
||||||
|
|
||||||
|
private static readonly CultureInfo Invariant = CultureInfo.InvariantCulture;
|
||||||
|
private static readonly Color White = Colors.White;
|
||||||
|
private static readonly Color[] ConfettiPalette =
|
||||||
|
{
|
||||||
|
OutputPalette.Crimson, OutputPalette.Gold,
|
||||||
|
OutputPalette.Tertiary, OutputPalette.Violet,
|
||||||
|
OutputPalette.Positive,
|
||||||
|
};
|
||||||
|
|
||||||
|
public VideoFrame Render(ChatMessage e, double t01, int width, int height)
|
||||||
|
{
|
||||||
|
return e.Kind switch
|
||||||
|
{
|
||||||
|
ChatEventKind.SuperChat => SuperChat(e, t01, width, height),
|
||||||
|
ChatEventKind.SuperSticker => SuperSticker(e, t01, width, height),
|
||||||
|
ChatEventKind.NewMember => NewMember(e, t01, width, height),
|
||||||
|
ChatEventKind.MemberGift => MemberGift(e, t01, width, height),
|
||||||
|
ChatEventKind.GiftReceived => GiftReceived(e, t01, width, height),
|
||||||
|
ChatEventKind.MemberMilestone => Milestone(e, t01, width, height),
|
||||||
|
_ => SuperChat(e, t01, width, height),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame SuperChat(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.03;
|
||||||
|
var cardX = margin;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = cardX + cardW / 2;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / EnterEnd);
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var exitEase = EaseInCubic(exit);
|
||||||
|
var cardY = Lerp(h + cardH, margin, EaseOutCubic(enter));
|
||||||
|
cardY = Lerp(cardY, -cardH, exitEase);
|
||||||
|
|
||||||
|
DrawCard(ctx, cardX, cardY, cardW, cardH, "#0d3b2b", "#14532d", 14);
|
||||||
|
DrawBrand(ctx, cardX, cardY, cardW, cardH);
|
||||||
|
|
||||||
|
var shownAmount = e.SuperChatDisplayString
|
||||||
|
?? (e.SuperChatCurrency is { Length: > 0 } cur ? $"{cur}{e.SuperChatAmount:0.00}" : $"${e.SuperChatAmount:0.00}");
|
||||||
|
var fontSize = cardH * 0.24;
|
||||||
|
DrawCentered(ctx, shownAmount, cardCX, cardY + cardH * 0.24, fontSize, FontWeights.Bold, OutputPalette.Gold, cardW);
|
||||||
|
|
||||||
|
DrawCentered(ctx, e.AuthorName, cardCX, cardY + cardH * 0.56, cardH * 0.13, FontWeights.SemiBold, White, cardW);
|
||||||
|
DrawCentered(ctx, e.Message, cardCX, cardY + cardH * 0.74, cardH * 0.10, FontWeights.Normal, OutputPalette.MintText, cardW * 0.92);
|
||||||
|
|
||||||
|
if (t >= EnterEnd && t <= ExitStart)
|
||||||
|
{
|
||||||
|
var sweep = (t - EnterEnd) / (ExitStart - EnterEnd);
|
||||||
|
var shineX = cardX + (sweep * 2 - 0.5) * cardW;
|
||||||
|
ctx.DrawRectangle(
|
||||||
|
new LinearGradientBrush(
|
||||||
|
Colors.Transparent,
|
||||||
|
Color.FromArgb(0x30, 0xff, 0xff, 0xff),
|
||||||
|
new Point(0, 0),
|
||||||
|
new Point(1, 0)),
|
||||||
|
null,
|
||||||
|
new Rect(shineX - cardW * 0.25, cardY, cardW * 0.5, cardH));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame SuperSticker(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.04;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = w / 2.0;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / EnterEnd);
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var scale = EaseOutBack(enter) * (0.85 + 0.15 * (1 - exit));
|
||||||
|
if (t > EnterEnd && t <= ExitStart)
|
||||||
|
scale = 1.0 + 0.02 * Math.Sin(t * 26.0);
|
||||||
|
var alpha = 1.0 - exit;
|
||||||
|
|
||||||
|
ctx.PushOpacity(alpha);
|
||||||
|
|
||||||
|
var slick = new RotateTransform(-6, w / 2.0, h / 2.0);
|
||||||
|
ctx.PushTransform(slick);
|
||||||
|
ctx.PushTransform(new ScaleTransform(scale, scale, w / 2.0, h / 2.0));
|
||||||
|
|
||||||
|
DrawCard(ctx, margin, margin, cardW, cardH, "#4a044e", "#7e22ce", 20);
|
||||||
|
DrawBrand(ctx, margin, margin, cardW, cardH);
|
||||||
|
|
||||||
|
var desc = string.IsNullOrWhiteSpace(e.SuperStickerDescription) ? "SUPER STICKER" : e.SuperStickerDescription.ToUpperInvariant();
|
||||||
|
DrawCentered(ctx, desc, cardCX, h / 2.0 - cardH * 0.12, cardH * 0.17, FontWeights.Bold, White, cardW * 0.9);
|
||||||
|
|
||||||
|
DrawCentered(ctx, e.AuthorName, cardCX, h / 2.0 + cardH * 0.16, cardH * 0.12, FontWeights.SemiBold, OutputPalette.Pink, cardW * 0.9);
|
||||||
|
var tier = e.SuperChatDisplayString ?? (e.SuperChatCurrency is { Length: > 0 } cur ? $"{cur}{e.SuperChatAmount:0.00}" : null);
|
||||||
|
if (!string.IsNullOrWhiteSpace(tier))
|
||||||
|
DrawCentered(ctx, tier, cardCX, h / 2.0 + cardH * 0.32, cardH * 0.10, FontWeights.Bold, OutputPalette.Gold, cardW * 0.9);
|
||||||
|
|
||||||
|
ctx.Pop();
|
||||||
|
ctx.Pop();
|
||||||
|
ctx.Pop();
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame NewMember(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.035;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = w / 2.0;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / EnterEnd);
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var cardY = Lerp(-cardH, margin, EaseOutCubic(enter));
|
||||||
|
cardY = Lerp(cardY, h, EaseInCubic(exit));
|
||||||
|
|
||||||
|
DrawCard(ctx, margin, cardY, cardW, cardH, "#2e1065", "#5b21b6", 16);
|
||||||
|
DrawBrand(ctx, margin, cardY, cardW, cardH);
|
||||||
|
|
||||||
|
if (t <= ExitStart)
|
||||||
|
{
|
||||||
|
var bandP = EaseOutCubic(Clamp01(t / 0.22));
|
||||||
|
ctx.DrawRectangle(
|
||||||
|
new LinearGradientBrush(Color.FromArgb(0, 0xff, 0xff, 0xff), Colors.Transparent, new Point(0, 0), new Point(0, 1)),
|
||||||
|
null,
|
||||||
|
new Rect(margin, cardY + cardH * 0.30, cardW * bandP, cardH * 0.18));
|
||||||
|
}
|
||||||
|
|
||||||
|
DrawCentered(ctx, e.AuthorName, cardCX, cardY + cardH * 0.36, cardH * 0.22, FontWeights.Bold, White, cardW * 0.9);
|
||||||
|
DrawCentered(ctx, "JOINED THE MEMBERSHIP", cardCX, cardY + cardH * 0.62, cardH * 0.11, FontWeights.SemiBold, OutputPalette.Lilac, cardW * 0.9);
|
||||||
|
|
||||||
|
var level = string.IsNullOrWhiteSpace(e.MembershipLevel) ? "MEMBER" : e.MembershipLevel.ToUpperInvariant();
|
||||||
|
DrawCentered(ctx, level, cardCX, cardY + cardH * 0.80, cardH * 0.10, FontWeights.Bold, OutputPalette.Gold, cardW * 0.9);
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame MemberGift(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.035;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = w / 2.0;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / EnterEnd);
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var cardX = Lerp(-cardW, margin, EaseOutCubic(enter));
|
||||||
|
cardX = Lerp(cardX, -cardW, EaseInCubic(exit));
|
||||||
|
|
||||||
|
DrawCard(ctx, cardX, margin, cardW, cardH, "#422006", "#a16207", 16);
|
||||||
|
DrawBrand(ctx, cardX, margin, cardW, cardH);
|
||||||
|
|
||||||
|
var count = Math.Max(1, e.GiftNewMembersCount);
|
||||||
|
var spread = 1.0 - exit;
|
||||||
|
var hero = count > 1 ? $"×{count}" : "MEMBERSHIP";
|
||||||
|
DrawCentered(ctx, hero, cardCX, margin + cardH * 0.24, cardH * 0.26, FontWeights.Bold, OutputPalette.Gold, cardW * 0.8);
|
||||||
|
DrawCentered(ctx, $"{e.AuthorName} is gifting", cardCX, margin + cardH * 0.52, cardH * 0.11, FontWeights.SemiBold, White, cardW * 0.9);
|
||||||
|
|
||||||
|
var chipCount = Math.Min(count, 6);
|
||||||
|
for (var i = 0; i < chipCount; i++)
|
||||||
|
{
|
||||||
|
var slot = (chipCount - 1) * 0.5;
|
||||||
|
var gap = cardH * 0.13 * EaseOutCubic(Clamp01(t / 0.30)) * spread;
|
||||||
|
var chipX = cardCX + (i - slot) * gap;
|
||||||
|
var chipY = margin + cardH * 0.70 + Math.Sin((i + t * 6) * 2.4) * cardH * 0.015;
|
||||||
|
ctx.DrawRoundedRectangle(
|
||||||
|
new SolidColorBrush(OutputPalette.GoldPale),
|
||||||
|
null,
|
||||||
|
new Rect(chipX - cardH * 0.05, chipY, cardH * 0.10, cardH * 0.10),
|
||||||
|
cardH * 0.03, cardH * 0.03);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame GiftReceived(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.04;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = w / 2.0;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / (EnterEnd * 1.4));
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var scale = 0.5 + 0.5 * EaseOutBack(enter);
|
||||||
|
var alpha = Math.Min(1.0, enter * 1.6) * (1 - exit);
|
||||||
|
|
||||||
|
ctx.PushOpacity(alpha);
|
||||||
|
ctx.PushTransform(new ScaleTransform(scale, scale, w / 2.0, h / 2.0));
|
||||||
|
|
||||||
|
DrawCard(ctx, margin, margin, cardW, cardH, "#14532d", "#4c1d95", 18);
|
||||||
|
DrawBrand(ctx, margin, margin, cardW, cardH);
|
||||||
|
|
||||||
|
// Confetti falling inside the card during the hold (deterministic seed).
|
||||||
|
if (t >= EnterEnd && t <= ExitStart)
|
||||||
|
{
|
||||||
|
var hold = (t - EnterEnd) / (ExitStart - EnterEnd);
|
||||||
|
for (var i = 0; i < 14; i++)
|
||||||
|
{
|
||||||
|
var seed = i * 37 + 11;
|
||||||
|
var dotX = margin + cardW * (((seed * 53) % 97) / 97.0);
|
||||||
|
var dotY = margin + cardH * (((seed + hold * 0.85) % 1.0));
|
||||||
|
var size = cardH * 0.02 + (i % 3) * cardH * 0.006;
|
||||||
|
ctx.DrawRectangle(
|
||||||
|
new SolidColorBrush(ConfettiPalette[i % ConfettiPalette.Length]),
|
||||||
|
null,
|
||||||
|
new Rect(dotX, dotY, size, size));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
DrawCentered(ctx, "GIFTED MEMBERSHIP", cardCX, margin + cardH * 0.22, cardH * 0.12, FontWeights.Bold, OutputPalette.Gold, cardW * 0.9);
|
||||||
|
var giver = string.IsNullOrWhiteSpace(e.GifterName) ? e.AuthorName : e.GifterName;
|
||||||
|
DrawCentered(ctx, giver, cardCX, margin + cardH * 0.42, cardH * 0.20, FontWeights.Bold, White, cardW * 0.9);
|
||||||
|
DrawCentered(ctx, "gave you a membership — celebrate!", cardCX, margin + cardH * 0.68, cardH * 0.11, FontWeights.Normal, OutputPalette.MintText, cardW * 0.9);
|
||||||
|
|
||||||
|
ctx.Pop();
|
||||||
|
ctx.Pop();
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame Milestone(ChatMessage e, double t, int w, int h)
|
||||||
|
{
|
||||||
|
var dpi = 96.0;
|
||||||
|
var visual = new DrawingVisual();
|
||||||
|
using (var ctx = visual.RenderOpen())
|
||||||
|
{
|
||||||
|
var margin = Math.Max(w, h) * 0.04;
|
||||||
|
var cardW = w - margin * 2;
|
||||||
|
var cardH = h - margin * 2;
|
||||||
|
var cardCX = w / 2.0;
|
||||||
|
|
||||||
|
var enter = Clamp01(t / EnterEnd);
|
||||||
|
var exit = Clamp01((t - ExitStart) / (1 - ExitStart));
|
||||||
|
var cardY = Lerp(h + cardH, margin, EaseOutCubic(enter));
|
||||||
|
cardY = Lerp(cardY, -cardH, EaseInCubic(exit));
|
||||||
|
|
||||||
|
DrawCard(ctx, margin, cardY, cardW, cardH, "#431407", "#c2410c", 14);
|
||||||
|
DrawBrand(ctx, margin, cardY, cardW, cardH);
|
||||||
|
|
||||||
|
var hero = e.MilestoneMonths > 0 ? $"{e.MilestoneMonths}" : "MILESTONE";
|
||||||
|
DrawCentered(ctx, hero, cardCX, cardY + cardH * 0.26, cardH * 0.30, FontWeights.Bold, OutputPalette.GoldBright, cardW * 0.8);
|
||||||
|
|
||||||
|
var sub = e.MilestoneMonths > 0 ? "MONTHS STRONG" : "SUPPORTING THE STREAM";
|
||||||
|
DrawCentered(ctx, sub, cardCX, cardY + cardH * 0.52, cardH * 0.11, FontWeights.SemiBold, White, cardW * 0.9);
|
||||||
|
DrawCentered(ctx, "— " + e.AuthorName + " —", cardCX, cardY + cardH * 0.70, cardH * 0.10, FontWeights.Normal, OutputPalette.WarmCream, cardW * 0.9);
|
||||||
|
|
||||||
|
// Tenure bar: grows through the first half, retracts on exit.
|
||||||
|
var barP = Clamp01((t - 0.10) / 0.55) * (1 - exit);
|
||||||
|
var barW = cardW * 0.6 * barP;
|
||||||
|
ctx.DrawRoundedRectangle(
|
||||||
|
new SolidColorBrush(OutputPalette.Gold),
|
||||||
|
null,
|
||||||
|
new Rect(cardCX - barW / 2, cardY + cardH * 0.84, barW, cardH * 0.045),
|
||||||
|
4, 4);
|
||||||
|
}
|
||||||
|
return CreateFrame(visual, w, h, dpi);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Shared drawing ───
|
||||||
|
|
||||||
|
private static void DrawCard(DrawingContext ctx, double x, double y, double w, double h, string fromHex, string toHex, double radius)
|
||||||
|
{
|
||||||
|
var brush = new LinearGradientBrush(ParseColor(fromHex), ParseColor(toHex), new Point(0, 0), new Point(1, 1));
|
||||||
|
ctx.DrawRoundedRectangle(brush, new Pen(new SolidColorBrush(Color.FromArgb(0x66, 0xff, 0xff, 0xff)), Math.Max(1, radius * 0.06)), new Rect(x, y, w, h), radius, radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DrawBrand(DrawingContext ctx, double x, double y, double w, double h)
|
||||||
|
{
|
||||||
|
var formatted = new FormattedText(
|
||||||
|
Brand, Invariant, FlowDirection.LeftToRight,
|
||||||
|
new Typeface(OutputPalette.Sans, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
|
||||||
|
Math.Max(9, h * 0.055),
|
||||||
|
new SolidColorBrush(Color.FromArgb(0x88, 0xff, 0xff, 0xff)),
|
||||||
|
96.0);
|
||||||
|
ctx.DrawText(formatted, new Point(x + w - formatted.Width - h * 0.08, y + h - formatted.Height - h * 0.05));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DrawCentered(DrawingContext ctx, string text, double cx, double cy, double size, FontWeight weight, Color color, double maxWidth)
|
||||||
|
{
|
||||||
|
var formatted = new FormattedText(
|
||||||
|
text, Invariant, FlowDirection.LeftToRight,
|
||||||
|
new Typeface(OutputPalette.Sans, FontStyles.Normal, weight, FontStretches.Normal),
|
||||||
|
size,
|
||||||
|
new SolidColorBrush(color),
|
||||||
|
96.0);
|
||||||
|
formatted.MaxTextWidth = maxWidth;
|
||||||
|
formatted.MaxLineCount = 1;
|
||||||
|
formatted.Trimming = TextTrimming.CharacterEllipsis;
|
||||||
|
ctx.DrawText(formatted, new Point(cx - formatted.Width / 2, cy - formatted.Height / 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Color ParseColor(string hex)
|
||||||
|
{
|
||||||
|
hex = hex.Trim().TrimStart('#');
|
||||||
|
if (hex.Length == 6)
|
||||||
|
{
|
||||||
|
var r = byte.Parse(hex.AsSpan(0, 2), NumberStyles.HexNumber);
|
||||||
|
var g = byte.Parse(hex.AsSpan(2, 2), NumberStyles.HexNumber);
|
||||||
|
var b = byte.Parse(hex.AsSpan(4, 2), NumberStyles.HexNumber);
|
||||||
|
return Color.FromRgb(r, g, b);
|
||||||
|
}
|
||||||
|
if (hex.Length == 8)
|
||||||
|
{
|
||||||
|
var a = byte.Parse(hex.AsSpan(0, 2), NumberStyles.HexNumber);
|
||||||
|
var r = byte.Parse(hex.AsSpan(2, 2), NumberStyles.HexNumber);
|
||||||
|
var g = byte.Parse(hex.AsSpan(4, 2), NumberStyles.HexNumber);
|
||||||
|
var b = byte.Parse(hex.AsSpan(6, 2), NumberStyles.HexNumber);
|
||||||
|
return Color.FromArgb(a, r, g, b);
|
||||||
|
}
|
||||||
|
return Colors.White;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VideoFrame CreateFrame(DrawingVisual visual, int width, int height, double dpi)
|
||||||
|
{
|
||||||
|
var rtb = new RenderTargetBitmap(width, height, dpi, dpi, PixelFormats.Pbgra32);
|
||||||
|
rtb.Render(visual);
|
||||||
|
|
||||||
|
var stride = width * 4;
|
||||||
|
var pixels = new byte[stride * height];
|
||||||
|
rtb.CopyPixels(pixels, stride, 0);
|
||||||
|
|
||||||
|
for (var i = 0; i < pixels.Length; i += 4)
|
||||||
|
{
|
||||||
|
(pixels[i], pixels[i + 2]) = (pixels[i + 2], pixels[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new VideoFrame(width, height, pixels);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double Clamp01(double v) => Math.Clamp(v, 0.0, 1.0);
|
||||||
|
|
||||||
|
private static double Lerp(double a, double b, double p) => a + (b - a) * p;
|
||||||
|
|
||||||
|
private static double EaseInCubic(double p) => p * p * p;
|
||||||
|
|
||||||
|
private static double EaseOutCubic(double p) => 1 - Math.Pow(1 - p, 3);
|
||||||
|
|
||||||
|
private static double EaseOutBack(double p)
|
||||||
|
{
|
||||||
|
const double c1 = 1.70158;
|
||||||
|
const double c3 = c1 + 1;
|
||||||
|
return 1 + c3 * Math.Pow(p - 1, 3) + c1 * Math.Pow(p - 1, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -28,8 +28,12 @@ public sealed class AudioGainProvider
|
|||||||
/// <summary>Mic gain for the live mix (0 = muted).</summary>
|
/// <summary>Mic gain for the live mix (0 = muted).</summary>
|
||||||
public double MicGain() => _micMuted() ? 0 : _micVolume();
|
public double MicGain() => _micMuted() ? 0 : _micVolume();
|
||||||
|
|
||||||
/// <summary>Loopback (desktop/game) gain for the live mix (0 = muted, 1 = unity).
|
/// <summary>Loopback (desktop/game) gain for the live mix (0 = muted).
|
||||||
/// Unity because the slider now drives system volume via PushSystemVolume,
|
/// Honesty rule (2026-09-01): WASAPI loopback capture does NOT shrink with the
|
||||||
/// so the WASAPI loopback signal is already scaled by the user's volume choice.</summary>
|
/// endpoint volume — the creator dropped system volume to 20% and the captured
|
||||||
public double LoopbackGain() => _gameMuted() ? 0 : 1.0;
|
/// level stayed pegged — so the mixer must multiply by GameAudioVolume itself
|
||||||
|
/// for the stream to follow the knob (the old unity assumption left the stream
|
||||||
|
/// at full desktop volume while the headphones went quiet; ai.md always
|
||||||
|
/// specified loopbackGain = GameAudioVolume — the code had drifted).</summary>
|
||||||
|
public double LoopbackGain() => _gameMuted() ? 0 : _gameVolume();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,18 +16,20 @@ public sealed class AudioLevelMeter
|
|||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Maps a linear level (0..1) onto the meter's display scale: -60 dBFS..0 dBFS
|
/// Maps a linear level (0..1) onto the meter's display scale: -60 dBFS..0 dBFS
|
||||||
/// spread linearly across 0..1, with +10 dB of input amplification. Linear RMS
|
/// spread linearly across 0..1 — an HONEST dBFS scale. Linear RMS of real speech is
|
||||||
/// of real speech or game audio is ~0.01..0.1 (-40..-20 dBFS), which leaves a
|
/// ~0.01..0.1 (-40..-20 dBFS), which leaves a flat (linear) meter looking dead; the
|
||||||
/// flat (linear) meter looking dead; the log scale makes typical levels occupy
|
/// log scale makes typical levels occupy the bar. Inputs at or below -60 dBFS
|
||||||
/// the bar and the amplification pushes real speech peaks into the red zone
|
/// (0.001 linear) read as zero — the meter never idles on background noise.
|
||||||
/// (0.8+) at maxed volume instead of hovering at its edge. Inputs at or below
|
/// <para>2026-10-09: the +10 dB "input amplification" that used to sit here is gone.
|
||||||
/// -60 dBFS (0.001 linear) read as zero — the meter never idles on background noise.
|
/// It made a −30 dBFS voice look dialed in, and a creator's upload came out at
|
||||||
|
/// −28.5 LUFS. The speech leveler now puts voice at −20 dBFS, which lands at 2/3 of
|
||||||
|
/// the bar (the green/yellow edge); loud peaks reach the red.</para>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static float ToDisplay(float linear)
|
public static float ToDisplay(float linear)
|
||||||
{
|
{
|
||||||
if (linear <= 0.001f)
|
if (linear <= 0.001f)
|
||||||
return 0f;
|
return 0f;
|
||||||
var db = 20f * MathF.Log10(linear) + 10f;
|
var db = 20f * MathF.Log10(linear);
|
||||||
return Math.Clamp(1f + db / 60f, 0f, 1f);
|
return Math.Clamp(1f + db / 60f, 0f, 1f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using ytLive.Helpers;
|
||||||
using ytLive.Services;
|
using ytLive.Services;
|
||||||
|
|
||||||
namespace ytLive.Services.Audio;
|
namespace ytLive.Services.Audio;
|
||||||
@@ -13,7 +14,9 @@ namespace ytLive.Services.Audio;
|
|||||||
/// queues, applies the honest gains (mic = MicVolume, loopback = unity
|
/// queues, applies the honest gains (mic = MicVolume, loopback = unity
|
||||||
/// × auto-duck when the mic is hot — the slider drives system volume via mixes them to stereo float, runs the
|
/// × auto-duck when the mic is hot — the slider drives system volume via mixes them to stereo float, runs the
|
||||||
/// master limiter (a -1 dBFS ceiling so the sum never clips the encoder), and
|
/// master limiter (a -1 dBFS ceiling so the sum never clips the encoder), and
|
||||||
/// writes the chunk to the encoder's audio pipe.
|
/// writes the chunk to the encoder's audio pipe. Since TASK 47 the alert layer's
|
||||||
|
/// clip audio joins the same mix (pre-scaled, unity-added, never ducked) through
|
||||||
|
/// <see cref="EnqueueAlertAudio"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class AudioMixer : IDisposable
|
public sealed class AudioMixer : IDisposable
|
||||||
{
|
{
|
||||||
@@ -29,12 +32,16 @@ public sealed class AudioMixer : IDisposable
|
|||||||
private readonly Func<double>? _micGain;
|
private readonly Func<double>? _micGain;
|
||||||
private readonly Func<double>? _loopbackGain;
|
private readonly Func<double>? _loopbackGain;
|
||||||
private readonly TimeSpan _mixInterval;
|
private readonly TimeSpan _mixInterval;
|
||||||
|
private readonly Func<int>? _syncOffsetMs;
|
||||||
|
private readonly AudioSyncDelay _syncDelay;
|
||||||
|
private int _advanceSamplesRemaining;
|
||||||
private bool _started;
|
private bool _started;
|
||||||
|
|
||||||
// Live path (TASK 9): per-source resampling → voice chain on the mic →
|
// Live path (TASK 9): per-source resampling → voice chain on the mic →
|
||||||
// thread-safe queues → the ducker + gain/mix loop → the encoder's pipe.
|
// thread-safe queues → the ducker + gain/mix loop → the encoder's pipe.
|
||||||
private readonly AudioRingBuffer _micBuffer;
|
private readonly AudioRingBuffer _micBuffer;
|
||||||
private readonly AudioRingBuffer _loopbackBuffer;
|
private readonly AudioRingBuffer _loopbackBuffer;
|
||||||
|
private readonly AudioRingBuffer _alertBuffer;
|
||||||
private readonly VoiceFilterChain _voiceChain;
|
private readonly VoiceFilterChain _voiceChain;
|
||||||
private readonly AutoDucker _ducker;
|
private readonly AutoDucker _ducker;
|
||||||
private readonly MasterLimiter _masterLimiter = new();
|
private readonly MasterLimiter _masterLimiter = new();
|
||||||
@@ -44,7 +51,14 @@ public sealed class AudioMixer : IDisposable
|
|||||||
private NamedPipeAudioWriter _pipe = new();
|
private NamedPipeAudioWriter _pipe = new();
|
||||||
private float[]? _micChunk;
|
private float[]? _micChunk;
|
||||||
private float[]? _loopbackChunk;
|
private float[]? _loopbackChunk;
|
||||||
|
private float[]? _alertChunk;
|
||||||
private float[]? _mixBuffer;
|
private float[]? _mixBuffer;
|
||||||
|
private float[]? _delayedMix;
|
||||||
|
private DateTime _lastLoopErrorLogged = DateTime.MinValue;
|
||||||
|
private DateTime _nextStatsLog = DateTime.UtcNow + TimeSpan.FromSeconds(5);
|
||||||
|
private long _micDrainedTotal;
|
||||||
|
private long _loopDrainedTotal;
|
||||||
|
private float _peakMix;
|
||||||
|
|
||||||
public AudioMixer(
|
public AudioMixer(
|
||||||
IAudioSource mic,
|
IAudioSource mic,
|
||||||
@@ -52,6 +66,7 @@ public sealed class AudioMixer : IDisposable
|
|||||||
Action<string>? log = null,
|
Action<string>? log = null,
|
||||||
Func<double>? micGain = null,
|
Func<double>? micGain = null,
|
||||||
Func<double>? loopbackGain = null,
|
Func<double>? loopbackGain = null,
|
||||||
|
Func<int>? syncOffsetMs = null,
|
||||||
TimeSpan? mixInterval = null)
|
TimeSpan? mixInterval = null)
|
||||||
{
|
{
|
||||||
_mic = mic;
|
_mic = mic;
|
||||||
@@ -61,17 +76,22 @@ public sealed class AudioMixer : IDisposable
|
|||||||
_log = log;
|
_log = log;
|
||||||
_micGain = micGain;
|
_micGain = micGain;
|
||||||
_loopbackGain = loopbackGain;
|
_loopbackGain = loopbackGain;
|
||||||
|
_syncOffsetMs = syncOffsetMs;
|
||||||
|
_syncDelay = new AudioSyncDelay(OutputSampleRate);
|
||||||
_mixInterval = mixInterval ?? DefaultMixInterval;
|
_mixInterval = mixInterval ?? DefaultMixInterval;
|
||||||
|
|
||||||
var seconds = _mixInterval.TotalSeconds;
|
var seconds = _mixInterval.TotalSeconds;
|
||||||
var framesPerTick = Math.Max(1, (int)Math.Round(OutputSampleRate * seconds));
|
var framesPerTick = Math.Max(1, (int)Math.Round(OutputSampleRate * seconds));
|
||||||
_micBuffer = new AudioRingBuffer(OutputSampleRate * 2);
|
_micBuffer = new AudioRingBuffer(OutputSampleRate * 2);
|
||||||
_loopbackBuffer = new AudioRingBuffer(OutputSampleRate * 2 * 2);
|
_loopbackBuffer = new AudioRingBuffer(OutputSampleRate * 2 * 2);
|
||||||
|
_alertBuffer = new AudioRingBuffer(OutputSampleRate * 2 * 8);
|
||||||
_voiceChain = new VoiceFilterChain(OutputSampleRate);
|
_voiceChain = new VoiceFilterChain(OutputSampleRate);
|
||||||
_ducker = new AutoDucker();
|
_ducker = new AutoDucker();
|
||||||
_micChunk = new float[framesPerTick];
|
_micChunk = new float[framesPerTick];
|
||||||
_loopbackChunk = new float[framesPerTick * 2];
|
_loopbackChunk = new float[framesPerTick * 2];
|
||||||
|
_alertChunk = new float[framesPerTick * 2];
|
||||||
_mixBuffer = new float[framesPerTick * 2];
|
_mixBuffer = new float[framesPerTick * 2];
|
||||||
|
_delayedMix = new float[framesPerTick * 2];
|
||||||
|
|
||||||
_mic.Started += OnMicStarted;
|
_mic.Started += OnMicStarted;
|
||||||
_mic.SampleReady += OnMicSample;
|
_mic.SampleReady += OnMicSample;
|
||||||
@@ -146,19 +166,48 @@ public sealed class AudioMixer : IDisposable
|
|||||||
if (_liveCts != null)
|
if (_liveCts != null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Capture runs from app STARTUP for the meters, so both rings carry up
|
||||||
|
// to a full ring depth (~2s) of pre-live backlog by the time the user
|
||||||
|
// hits record; draining it made every recorded event land ~2s late in
|
||||||
|
// the audio track (2026-09-14, two confirmed takes). Discard it so the
|
||||||
|
// recording starts at go-live. The writers keep running concurrently;
|
||||||
|
// Clear under the ring's lock, so only the in-flight chunk is dropped.
|
||||||
|
_micBuffer.Clear();
|
||||||
|
_loopbackBuffer.Clear();
|
||||||
|
_alertBuffer.Clear();
|
||||||
|
|
||||||
|
// Negative sync offset (audio runs BEHIND video): OBS's fix is to "eat
|
||||||
|
// the head of the buffer" — discard the first |N| ms of the live stream
|
||||||
|
// so every subsequent audio event lands |N| ms EARLIER in the recording.
|
||||||
|
// Armed once at go-live (you can't eat the head mid-stream); positive
|
||||||
|
// offsets stay live-reactive through the delay line in FillAndMix.
|
||||||
|
var syncMs = _syncOffsetMs?.Invoke() ?? 0;
|
||||||
|
_advanceSamplesRemaining = syncMs < 0
|
||||||
|
? (int)Math.Round(OutputSampleRate / 1000.0 * -syncMs) * 2
|
||||||
|
: 0;
|
||||||
|
if (_advanceSamplesRemaining > 0)
|
||||||
|
_log?.Invoke($"Audio live: advance armed ({-syncMs} ms ahead)");
|
||||||
|
|
||||||
var cts = new CancellationTokenSource();
|
var cts = new CancellationTokenSource();
|
||||||
_liveCts = cts;
|
_liveCts = cts;
|
||||||
_pipe = new NamedPipeAudioWriter();
|
_pipe = new NamedPipeAudioWriter();
|
||||||
_pipe.Start(pipeName);
|
_pipe.Start(pipeName);
|
||||||
|
_log?.Invoke($"Audio live: started, pipe '{pipeName}'");
|
||||||
_ = Task.Run(() => LiveLoopAsync(_pipe, cts.Token));
|
_ = Task.Run(() => LiveLoopAsync(_pipe, cts.Token));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Ends the live mix loop and closes the audio pipe — ffmpeg sees
|
/// <summary>Ends the live mix loop and closes the audio pipe — ffmpeg sees
|
||||||
/// EOF on the audio input. Safe when not live.</summary>
|
/// EOF on the audio input. Safe when not live: the writer's Stop() is idempotent
|
||||||
|
/// (StopStream now calls this on every rollback path).</summary>
|
||||||
public void StopLive()
|
public void StopLive()
|
||||||
{
|
{
|
||||||
_liveCts?.Cancel();
|
var cts = _liveCts;
|
||||||
_liveCts = null;
|
_liveCts = null;
|
||||||
|
if (cts != null)
|
||||||
|
{
|
||||||
|
_log?.Invoke("Audio live: stopped");
|
||||||
|
cts.Cancel();
|
||||||
|
}
|
||||||
_pipe.Stop();
|
_pipe.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,6 +253,34 @@ public sealed class AudioMixer : IDisposable
|
|||||||
LoopbackLevelChanged?.Invoke(level);
|
LoopbackLevelChanged?.Invoke(level);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Drops the alert clip's audio into its own ring (TASK 47 — the
|
||||||
|
/// stream-alert video's soundtrack, pre-scaled by the alert layer to
|
||||||
|
/// volume × fade). Mixed at unity into the live output — NO auto-duck: an
|
||||||
|
/// alert must be heard over the mic, so the Creator's per-alert volume
|
||||||
|
/// slider is the honest gain and nothing else is stacked on top. Monno and
|
||||||
|
/// non-48k sources are normalized (the decoder already emits 48k stereo).</summary>
|
||||||
|
public void EnqueueAlertAudio(AudioSample sample)
|
||||||
|
{
|
||||||
|
var data = sample.Samples;
|
||||||
|
if (data.Length == 0) return;
|
||||||
|
if (sample.SampleRate != OutputSampleRate)
|
||||||
|
data = ResampleLoopback(data, sample.SampleRate);
|
||||||
|
if (sample.Channels == 1)
|
||||||
|
data = UpmixToStereo(data);
|
||||||
|
_alertBuffer.Write(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static float[] UpmixToStereo(float[] mono)
|
||||||
|
{
|
||||||
|
var stereo = new float[mono.Length * 2];
|
||||||
|
for (var i = 0; i < mono.Length; i++)
|
||||||
|
{
|
||||||
|
stereo[i * 2] = mono[i];
|
||||||
|
stereo[i * 2 + 1] = mono[i];
|
||||||
|
}
|
||||||
|
return stereo;
|
||||||
|
}
|
||||||
|
|
||||||
private void OnMicFailed(Exception ex)
|
private void OnMicFailed(Exception ex)
|
||||||
{
|
{
|
||||||
_log?.Invoke($"Mic capture failed: {ex.Message}");
|
_log?.Invoke($"Mic capture failed: {ex.Message}");
|
||||||
@@ -263,8 +340,42 @@ public sealed class AudioMixer : IDisposable
|
|||||||
var nextTick = DateTime.UtcNow + _mixInterval;
|
var nextTick = DateTime.UtcNow + _mixInterval;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
FillAndMix(micChunk, loopbackChunk, mixBuffer);
|
var (_, micDrained, loopDrained) = FillAndMix(micChunk, loopbackChunk, mixBuffer);
|
||||||
await pipe.WriteAsync(mixBuffer, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
// Negative offset: skip the armed |N| ms of stream head. The pipe
|
||||||
|
// writer tolerates a partial chunk (any float length is valid);
|
||||||
|
// dropping the head re-anchors the audio stream against the video
|
||||||
|
// stream, making each event land earlier — OBS's eat-the-head fix.
|
||||||
|
var writeFrom = 0;
|
||||||
|
if (_advanceSamplesRemaining > 0)
|
||||||
|
{
|
||||||
|
var drop = Math.Min(_advanceSamplesRemaining, mixBuffer.Length);
|
||||||
|
_advanceSamplesRemaining -= drop;
|
||||||
|
writeFrom = drop;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (writeFrom < mixBuffer.Length)
|
||||||
|
await pipe.WriteAsync(mixBuffer.AsMemory(writeFrom), cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
_micDrainedTotal += micDrained;
|
||||||
|
_loopDrainedTotal += loopDrained;
|
||||||
|
for (var i = writeFrom; i < mixBuffer.Length; i++)
|
||||||
|
{
|
||||||
|
var abs = Math.Abs(mixBuffer[i]);
|
||||||
|
if (abs > _peakMix) _peakMix = abs;
|
||||||
|
}
|
||||||
|
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
if (now >= _nextStatsLog && _log != null)
|
||||||
|
{
|
||||||
|
_nextStatsLog = now + TimeSpan.FromSeconds(5);
|
||||||
|
_log($"Audio live: pipe connected={pipe.IsConnected} dropped writes={pipe.DroppedWrites} " +
|
||||||
|
$"micLevel={_meter.Level:F3} loopLevel={_loopbackMeter.Level:F3} " +
|
||||||
|
$"drained {_micDrainedTotal:N0}/{_loopDrainedTotal:N0} samples peakMix {_peakMix:F3} (per 5s)");
|
||||||
|
_micDrainedTotal = 0;
|
||||||
|
_loopDrainedTotal = 0;
|
||||||
|
_peakMix = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (OperationCanceledException)
|
catch (OperationCanceledException)
|
||||||
{
|
{
|
||||||
@@ -272,8 +383,19 @@ public sealed class AudioMixer : IDisposable
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
// Throttled + never on a dead session: the 2026-09-01 first-launch flood
|
||||||
|
// was one logged NRE every 10ms tick (see _delayedMix fix). Log at most
|
||||||
|
// once per 5s, and stop looping if the pipe writer is gone for good.
|
||||||
|
if (cancellationToken.IsCancellationRequested)
|
||||||
|
break;
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
if (now - _lastLoopErrorLogged >= TimeSpan.FromSeconds(5))
|
||||||
|
{
|
||||||
|
_lastLoopErrorLogged = now;
|
||||||
|
AppLog.Write(ex, "Audio live loop error");
|
||||||
_log?.Invoke($"Audio live loop error: {ex.Message}");
|
_log?.Invoke($"Audio live loop error: {ex.Message}");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var delay = nextTick - DateTime.UtcNow;
|
var delay = nextTick - DateTime.UtcNow;
|
||||||
if (delay > TimeSpan.Zero)
|
if (delay > TimeSpan.Zero)
|
||||||
@@ -291,11 +413,16 @@ public sealed class AudioMixer : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Drains one tick's worth of mic + loopback, silence-fills any
|
/// <summary>Drains one tick's worth of mic + loopback, silence-fills any
|
||||||
/// underrun, applies the ducker and the honest gains, and mixes to stereo.</summary>
|
/// underrun, applies the ducker and the honest gains, and mixes to stereo.
|
||||||
private float FillAndMix(float[] micChunk, float[] loopbackChunk, float[] mix)
|
/// Returns the pre-duck mic RMS and how many samples each buffer contributed
|
||||||
|
/// (the 5s live-loop telemetry reads those to name whether capture or the
|
||||||
|
/// pipe starved a silent recording).</summary>
|
||||||
|
private (float MicRms, int MicDrained, int LoopDrained) FillAndMix(float[] micChunk, float[] loopbackChunk, float[] mix)
|
||||||
{
|
{
|
||||||
var micCount = _micBuffer.Read(micChunk, micChunk.Length);
|
var micCount = _micBuffer.Read(micChunk, micChunk.Length);
|
||||||
var loopCount = _loopbackBuffer.Read(loopbackChunk, loopbackChunk.Length);
|
var loopCount = _loopbackBuffer.Read(loopbackChunk, loopbackChunk.Length);
|
||||||
|
var alertChunk = _alertChunk!;
|
||||||
|
var alertCount = _alertBuffer.Read(alertChunk, alertChunk.Length);
|
||||||
|
|
||||||
float micRms = 0;
|
float micRms = 0;
|
||||||
if (micCount == 0)
|
if (micCount == 0)
|
||||||
@@ -321,6 +448,15 @@ public sealed class AudioMixer : IDisposable
|
|||||||
Array.Clear(loopbackChunk, loopCount, loopbackChunk.Length - loopCount);
|
Array.Clear(loopbackChunk, loopCount, loopbackChunk.Length - loopCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (alertCount == 0)
|
||||||
|
{
|
||||||
|
Array.Clear(alertChunk, 0, alertChunk.Length);
|
||||||
|
}
|
||||||
|
else if (alertCount < alertChunk.Length)
|
||||||
|
{
|
||||||
|
Array.Clear(alertChunk, alertCount, alertChunk.Length - alertCount);
|
||||||
|
}
|
||||||
|
|
||||||
var duck = _ducker.Update(micRms);
|
var duck = _ducker.Update(micRms);
|
||||||
var micGain = (float)(_micGain?.Invoke() ?? 1.0);
|
var micGain = (float)(_micGain?.Invoke() ?? 1.0);
|
||||||
var loopGain = (float)(_loopbackGain?.Invoke() ?? 1.0) * duck;
|
var loopGain = (float)(_loopbackGain?.Invoke() ?? 1.0) * duck;
|
||||||
@@ -329,10 +465,17 @@ public sealed class AudioMixer : IDisposable
|
|||||||
for (var i = 0; i < frames; i++)
|
for (var i = 0; i < frames; i++)
|
||||||
{
|
{
|
||||||
var m = micChunk[i] * micGain;
|
var m = micChunk[i] * micGain;
|
||||||
mix[i * 2] = m + loopbackChunk[i * 2] * loopGain;
|
mix[i * 2] = m + loopbackChunk[i * 2] * loopGain + alertChunk[i * 2];
|
||||||
mix[i * 2 + 1] = m + loopbackChunk[i * 2 + 1] * loopGain;
|
mix[i * 2 + 1] = m + loopbackChunk[i * 2 + 1] * loopGain + alertChunk[i * 2 + 1];
|
||||||
}
|
}
|
||||||
_masterLimiter.Process(mix);
|
_masterLimiter.Process(mix);
|
||||||
return micRms;
|
|
||||||
|
_syncDelay.Configure(_syncOffsetMs?.Invoke() ?? 0);
|
||||||
|
var delayed = _delayedMix;
|
||||||
|
if (delayed is null || delayed.Length < mix.Length)
|
||||||
|
delayed = _delayedMix = new float[mix.Length];
|
||||||
|
_syncDelay.Process(mix, delayed);
|
||||||
|
Array.Copy(delayed, mix, mix.Length);
|
||||||
|
return (micRms, micCount, loopCount);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,94 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace ytLive.Services.Audio;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// TASK 22: a fixed end-to-end audio delay applied to the interleaved stereo
|
||||||
|
/// mix in <see cref="AudioMixer"/>. This is OBS's documented fix for the
|
||||||
|
/// "audio is ahead of video" lip-sync case: delay the audio by a few
|
||||||
|
/// milliseconds so it lands on the video. It is a pure delay line — input in,
|
||||||
|
/// the same audio N ms later out — so it is trivially testable and carries no
|
||||||
|
/// state outside its own ring.
|
||||||
|
///
|
||||||
|
/// Positive offsets only (0..500 ms). Advancing audio (the audio runs BEHIND
|
||||||
|
/// the video) is handled upstream in <see cref="AudioMixer"/>, not here: the
|
||||||
|
/// mixer eats the first |N| ms of the live stream head (OBS's negative sync —
|
||||||
|
/// see <see cref="AudioMixer.StartLive"/>), keeping this line a pure delay.
|
||||||
|
/// Changing the delay flushes the line, so a live slider change clicks rather
|
||||||
|
/// than smearing. Safe to call from any thread — the mixer owns it.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class AudioSyncDelay
|
||||||
|
{
|
||||||
|
private readonly int _sampleRate;
|
||||||
|
|
||||||
|
private float[] _buffer = Array.Empty<float>();
|
||||||
|
private int _delaySamples;
|
||||||
|
private int _writePos;
|
||||||
|
|
||||||
|
public AudioSyncDelay(int sampleRate)
|
||||||
|
{
|
||||||
|
_sampleRate = Math.Max(1, sampleRate);
|
||||||
|
Configure(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Sets the delay in whole milliseconds (clamped to 0..500). A no-op
|
||||||
|
/// when the delay hasn't actually changed — <see cref="AudioMixer.FillAndMix"/>
|
||||||
|
/// calls this every ~10ms tick (it re-reads the live UI setting each mix), and
|
||||||
|
/// unconditionally reallocating+zeroing the line every tick (the 2026-09-12
|
||||||
|
/// total-silence bug: any non-zero saved offset wiped the ring before its own
|
||||||
|
/// delayed samples could ever be read back — mic/loop meters, sampled BEFORE
|
||||||
|
/// this stage, kept showing real levels while the pipe stayed pure silence)
|
||||||
|
/// discarded the entire buffered history every 10ms. Changing the delay still
|
||||||
|
/// flushes the line (a live slider change clicks rather than smearing).</summary>
|
||||||
|
public void Configure(int delayMs)
|
||||||
|
{
|
||||||
|
var delaySamples = Frames(delayMs);
|
||||||
|
if (delaySamples == _delaySamples && _buffer.Length > 0) return;
|
||||||
|
_delaySamples = delaySamples;
|
||||||
|
_buffer = new float[(_delaySamples + _sampleRate) * 2 + 1024];
|
||||||
|
_writePos = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Delays an interleaved stereo chunk by the configured offset.
|
||||||
|
/// The returned length equals <paramref name="input"/>'s; the head is
|
||||||
|
/// silence until the line fills.</summary>
|
||||||
|
public void Process(ReadOnlySpan<float> input, Span<float> output)
|
||||||
|
{
|
||||||
|
if (output.Length < input.Length)
|
||||||
|
throw new ArgumentException("output must be at least as long as input", nameof(output));
|
||||||
|
|
||||||
|
var len = input.Length;
|
||||||
|
if (_delaySamples == 0)
|
||||||
|
{
|
||||||
|
input.CopyTo(output);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var line = _buffer;
|
||||||
|
var lineLen = line.Length;
|
||||||
|
for (var i = 0; i < len; i++)
|
||||||
|
{
|
||||||
|
line[_writePos] = input[i];
|
||||||
|
_writePos++;
|
||||||
|
if (_writePos == lineLen)
|
||||||
|
_writePos = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
var readStart = (_writePos - _delaySamples - len + lineLen * 2) % lineLen;
|
||||||
|
for (var i = 0; i < len; i++)
|
||||||
|
{
|
||||||
|
var idx = readStart + i;
|
||||||
|
if (idx >= lineLen)
|
||||||
|
idx -= lineLen;
|
||||||
|
output[i] = line[idx];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private int Frames(int delayMs)
|
||||||
|
{
|
||||||
|
var clamped = Math.Clamp(delayMs, 0, 500);
|
||||||
|
// Interleaved stereo: each frame is two samples (L, R), so the delay
|
||||||
|
// in buffer positions is twice the frame count.
|
||||||
|
return (int)Math.Round(_sampleRate / 1000.0 * clamped) * 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
namespace ytLive.Services.Audio;
|
||||||
|
|
||||||
|
/// <summary>Seam over the TRAX background-music player (<see cref="MusicPlayer"/>) so the
|
||||||
|
/// toggle/status-light logic is testable without a real audio device.</summary>
|
||||||
|
public interface ITraxPlayer : IDisposable
|
||||||
|
{
|
||||||
|
event Action<Exception?>? PlaybackEnded;
|
||||||
|
string? TrackName { get; }
|
||||||
|
bool IsPlaying { get; }
|
||||||
|
float LocalGain { get; set; }
|
||||||
|
void Load(string path);
|
||||||
|
void Play();
|
||||||
|
void Pause();
|
||||||
|
}
|
||||||
@@ -11,12 +11,17 @@ namespace ytLive.Services.Audio;
|
|||||||
/// The desktop/game bar's gain and mute scale <see cref="LocalGain"/>, so the
|
/// The desktop/game bar's gain and mute scale <see cref="LocalGain"/>, so the
|
||||||
/// creator hears the game-audio controls work on the music too.
|
/// creator hears the game-audio controls work on the music too.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class MusicPlayer : IDisposable
|
public sealed class MusicPlayer : ITraxPlayer
|
||||||
{
|
{
|
||||||
/// <summary>The one and only music bed — quiet, no slider (the creator's
|
/// <summary>The one and only music bed — no slider (the creator's voice must stay on
|
||||||
/// voice must stay on top; game/music loudness is the ducker's job). The
|
/// top; that's the ducker's job, −12 dB while they talk). The desktop audio bar scales
|
||||||
/// desktop audio bar scales this via <see cref="LocalGain"/>.</summary>
|
/// this via <see cref="LocalGain"/>.
|
||||||
public const float MusicVolume = 0.20f;
|
/// <para>2026-10-09: was 0.20 (−14 dB) — "even at max volume I can barely discern it".
|
||||||
|
/// The creator's track masters at −11.3 LUFS (typical: −9..−14), so 0.20 put the bed at
|
||||||
|
/// ~−25 LUFS, and ducked under speech ~−37 LUFS: inaudible on stream too, because the
|
||||||
|
/// loopback carries exactly what plays locally. 0.5 (−6 dB) lands a typical master at
|
||||||
|
/// ~−15..−20 LUFS — beside the leveled voice (≈ −17 LUFS), and well under it when ducked.</para></summary>
|
||||||
|
public const float MusicVolume = 0.5f;
|
||||||
|
|
||||||
private MediaFoundationReader? _reader;
|
private MediaFoundationReader? _reader;
|
||||||
private VolumeWaveProvider16? _volume;
|
private VolumeWaveProvider16? _volume;
|
||||||
|
|||||||
@@ -17,6 +17,12 @@ public interface IAudioPipeWriter : IDisposable
|
|||||||
/// <summary>True once ffmpeg has connected and the pipe is writable.</summary>
|
/// <summary>True once ffmpeg has connected and the pipe is writable.</summary>
|
||||||
bool IsConnected { get; }
|
bool IsConnected { get; }
|
||||||
|
|
||||||
|
/// <summary>Count of <see cref="WriteAsync"/> calls that wrote nothing because
|
||||||
|
/// the pipe wasn't connected yet or was already closed. Part of the silent-
|
||||||
|
/// recording diagnosis: nonzero means audio was dropped before ffmpeg ever
|
||||||
|
/// connected to the pipe.</summary>
|
||||||
|
long DroppedWrites { get; }
|
||||||
|
|
||||||
/// <summary>Writes interleaved float samples; dropped until the client connects.</summary>
|
/// <summary>Writes interleaved float samples; dropped until the client connects.</summary>
|
||||||
Task WriteAsync(ReadOnlyMemory<float> samples, CancellationToken cancellationToken = default);
|
Task WriteAsync(ReadOnlyMemory<float> samples, CancellationToken cancellationToken = default);
|
||||||
|
|
||||||
@@ -29,6 +35,9 @@ public sealed class NamedPipeAudioWriter : IAudioPipeWriter
|
|||||||
private readonly object _sync = new();
|
private readonly object _sync = new();
|
||||||
private NamedPipeServerStream? _pipe;
|
private NamedPipeServerStream? _pipe;
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public long DroppedWrites { get; private set; }
|
||||||
|
|
||||||
public void Start(string pipeName)
|
public void Start(string pipeName)
|
||||||
{
|
{
|
||||||
lock (_sync)
|
lock (_sync)
|
||||||
@@ -64,7 +73,11 @@ public sealed class NamedPipeAudioWriter : IAudioPipeWriter
|
|||||||
pipe = _pipe;
|
pipe = _pipe;
|
||||||
}
|
}
|
||||||
if (pipe == null || !pipe.IsConnected || samples.IsEmpty)
|
if (pipe == null || !pipe.IsConnected || samples.IsEmpty)
|
||||||
|
{
|
||||||
|
if (pipe?.IsConnected == false || pipe == null)
|
||||||
|
DroppedWrites++;
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var bytes = MemoryMarshal.AsBytes(samples.Span).ToArray();
|
var bytes = MemoryMarshal.AsBytes(samples.Span).ToArray();
|
||||||
await pipe.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
|
await pipe.WriteAsync(bytes, cancellationToken).ConfigureAwait(false);
|
||||||
|
|||||||
@@ -3,15 +3,21 @@ namespace ytLive.Services.Audio;
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The always-on voice processing chain for the mic (TASK 9 audio milestone).
|
/// The always-on voice processing chain for the mic (TASK 9 audio milestone).
|
||||||
/// Pure, per-sample, unit-tested: bass boost → treble lift → noise gate →
|
/// Pure, per-sample, unit-tested: bass boost → treble lift → noise gate →
|
||||||
/// compressor. Applied BEFORE the meter and the stream mix so what the creator
|
/// <b>speech leveler</b> → compressor. Applied BEFORE the meter and the stream mix so
|
||||||
/// hears on the meter is what viewers hear — and so background hum is gated
|
/// what the creator sees on the meter is what viewers hear — and so background hum
|
||||||
/// out before it reaches the encoder.
|
/// is gated out before it reaches the encoder.
|
||||||
|
/// <para>The leveler (2026-10-09) is the gain stage the chain was missing: a creator's
|
||||||
|
/// upload measured −28.5 LUFS against YouTube's −14 reference because nothing ever
|
||||||
|
/// brought quiet speech UP — the compressor only folds peaks above −6 dBFS and the
|
||||||
|
/// master limiter only caps at −1 dBFS. Compressor → gain → limiter is the standard
|
||||||
|
/// streaming voice chain.</para>
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class VoiceFilterChain
|
public sealed class VoiceFilterChain
|
||||||
{
|
{
|
||||||
private readonly LowShelfFilter _bass;
|
private readonly LowShelfFilter _bass;
|
||||||
private readonly HighShelfFilter _treble;
|
private readonly HighShelfFilter _treble;
|
||||||
private readonly NoiseGate _gate;
|
private readonly NoiseGate _gate;
|
||||||
|
private readonly SpeechLeveler _leveler;
|
||||||
private readonly Compressor _compressor;
|
private readonly Compressor _compressor;
|
||||||
|
|
||||||
/// <param name="sampleRate">The (post-resample) mic rate — the RBJ shelf
|
/// <param name="sampleRate">The (post-resample) mic rate — the RBJ shelf
|
||||||
@@ -21,15 +27,20 @@ public sealed class VoiceFilterChain
|
|||||||
_bass = new LowShelfFilter(sampleRate, 120f, 4f);
|
_bass = new LowShelfFilter(sampleRate, 120f, 4f);
|
||||||
_treble = new HighShelfFilter(sampleRate, 8000f, 3f);
|
_treble = new HighShelfFilter(sampleRate, 8000f, 3f);
|
||||||
_gate = new NoiseGate();
|
_gate = new NoiseGate();
|
||||||
|
_leveler = new SpeechLeveler(sampleRate);
|
||||||
_compressor = new Compressor();
|
_compressor = new Compressor();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>The leveler's current gain (linear) — for diagnostics and tests.</summary>
|
||||||
|
public float LevelerGain => _leveler.Gain;
|
||||||
|
|
||||||
public float Process(float sample)
|
public float Process(float sample)
|
||||||
{
|
{
|
||||||
var bass = _bass.Process(sample);
|
var bass = _bass.Process(sample);
|
||||||
var treble = _treble.Process(bass);
|
var treble = _treble.Process(bass);
|
||||||
var gated = _gate.Process(treble);
|
var gated = _gate.Process(treble);
|
||||||
return _compressor.Process(gated);
|
var leveled = _leveler.Process(gated, _gate.IsOpen);
|
||||||
|
return _compressor.Process(leveled);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Reset()
|
public void Reset()
|
||||||
@@ -37,10 +48,87 @@ public sealed class VoiceFilterChain
|
|||||||
_bass.Reset();
|
_bass.Reset();
|
||||||
_treble.Reset();
|
_treble.Reset();
|
||||||
_gate.Reset();
|
_gate.Reset();
|
||||||
|
_leveler.Reset();
|
||||||
_compressor.Reset();
|
_compressor.Reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Automatic gain for speech: tracks the voice's RMS over ~0.3 s and slowly steers a
|
||||||
|
/// gain so speech sits at <see cref="TargetRms"/> (−20 dBFS mono ≈ −17 LUFS once the mic
|
||||||
|
/// is mixed to stereo — close to YouTube's −14 reference while leaving the limiter room).
|
||||||
|
/// Different mics differ by 20 dB+ in sensitivity; this is what makes "it just sounds
|
||||||
|
/// right" true for all of them.
|
||||||
|
/// <list type="bullet">
|
||||||
|
/// <item>Only learns while the noise gate is open and the voice is above a silence floor —
|
||||||
|
/// pauses and background hum never get pumped up.</item>
|
||||||
|
/// <item>Gain rises at most <see cref="RiseDbPerSecond"/> and falls at most
|
||||||
|
/// <see cref="FallDbPerSecond"/> (faster down than up, so a sudden shout is tamed quickly
|
||||||
|
/// and a quiet stretch isn't chased), within <see cref="MinGain"/>..<see cref="MaxGain"/>.</item>
|
||||||
|
/// <item>Peaks it pushes up are caught by the <see cref="Compressor"/> after it and the
|
||||||
|
/// master limiter at the end of the mix.</item>
|
||||||
|
/// </list>
|
||||||
|
/// </summary>
|
||||||
|
public sealed class SpeechLeveler
|
||||||
|
{
|
||||||
|
public const float TargetRms = 0.1f; // −20 dBFS
|
||||||
|
public const float MaxGain = 10f; // +20 dB
|
||||||
|
public const float MinGain = 0.5f; // −6 dB
|
||||||
|
public const float SilenceFloorRms = 0.002f; // −54 dBFS: below this, hold the gain
|
||||||
|
public const float RiseDbPerSecond = 10f;
|
||||||
|
public const float FallDbPerSecond = 30f;
|
||||||
|
private const float WindowSeconds = 0.3f;
|
||||||
|
private const float UpdateSeconds = 0.01f;
|
||||||
|
|
||||||
|
private readonly float _meanAlpha;
|
||||||
|
private readonly int _updateEvery;
|
||||||
|
private readonly float _maxRiseDb;
|
||||||
|
private readonly float _maxFallDb;
|
||||||
|
private float _meanSquare;
|
||||||
|
private float _gainDb;
|
||||||
|
private float _gain = 1f;
|
||||||
|
private int _sinceUpdate;
|
||||||
|
|
||||||
|
public SpeechLeveler(int sampleRate)
|
||||||
|
{
|
||||||
|
_meanAlpha = 1f / (WindowSeconds * sampleRate);
|
||||||
|
_updateEvery = Math.Max(1, (int)(UpdateSeconds * sampleRate));
|
||||||
|
_maxRiseDb = RiseDbPerSecond * UpdateSeconds;
|
||||||
|
_maxFallDb = FallDbPerSecond * UpdateSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
public float Gain => _gain;
|
||||||
|
|
||||||
|
public float Process(float sample, bool voiceActive)
|
||||||
|
{
|
||||||
|
if (voiceActive)
|
||||||
|
_meanSquare += (sample * sample - _meanSquare) * _meanAlpha;
|
||||||
|
|
||||||
|
if (++_sinceUpdate >= _updateEvery)
|
||||||
|
{
|
||||||
|
_sinceUpdate = 0;
|
||||||
|
var rms = MathF.Sqrt(_meanSquare);
|
||||||
|
if (voiceActive && rms > SilenceFloorRms)
|
||||||
|
{
|
||||||
|
var desiredDb = 20f * MathF.Log10(Math.Clamp(TargetRms / rms, MinGain, MaxGain));
|
||||||
|
var step = Math.Clamp(desiredDb - _gainDb, -_maxFallDb, _maxRiseDb);
|
||||||
|
_gainDb += step;
|
||||||
|
_gain = MathF.Pow(10f, _gainDb / 20f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sample * _gain;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Reset()
|
||||||
|
{
|
||||||
|
_meanSquare = 0;
|
||||||
|
_gainDb = 0;
|
||||||
|
_gain = 1f;
|
||||||
|
_sinceUpdate = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// RBJ audio EQ cookbook low-shelf biquad (bass boost). Transposed direct
|
/// RBJ audio EQ cookbook low-shelf biquad (bass boost). Transposed direct
|
||||||
/// form II — stable, cheap, standard.
|
/// form II — stable, cheap, standard.
|
||||||
|
|||||||
@@ -0,0 +1,356 @@
|
|||||||
|
using ytLive.Helpers;
|
||||||
|
using ytLive.Models;
|
||||||
|
|
||||||
|
namespace ytLive.Services.BackgroundEffects;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Applies a webcam's <see cref="BackgroundEffect"/> to one captured frame (TASK 51).
|
||||||
|
/// Pure pixel work over the <see cref="VideoFrame"/> seam — WPF-free and thread-agnostic,
|
||||||
|
/// so the camera's processing worker can call it before the frame reaches the preview bitmap
|
||||||
|
/// and the compositor.
|
||||||
|
///
|
||||||
|
/// <list type="bullet">
|
||||||
|
/// <item><see cref="BackgroundEffect.None"/> returns the SAME frame instance — a true
|
||||||
|
/// passthrough, no copy.</item>
|
||||||
|
/// <item><see cref="BackgroundEffect.Remove"/> returns a copy whose alpha is the person mask,
|
||||||
|
/// RGB untouched, <c>IsOpaque = false</c> — the compositor's straight-alpha blend then shows
|
||||||
|
/// the layers below the webcam. Strength = edge softness (0 = crisp cut-out, 1 = the model's
|
||||||
|
/// raw soft mask).</item>
|
||||||
|
/// <item><see cref="BackgroundEffect.Blur"/> returns a copy where the background is replaced
|
||||||
|
/// by a blurred version of itself and the person stays sharp. Strength = blur amount.</item>
|
||||||
|
/// </list>
|
||||||
|
///
|
||||||
|
/// The mask is computed ONCE per camera frame (<see cref="TrySegment"/>) and then rendered for
|
||||||
|
/// every effect variant in use (<see cref="Render"/>). A segmenter that returns no mask (or
|
||||||
|
/// throws) never drops the layer: the frame passes through and the failure is logged once.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class BackgroundEffectProcessor
|
||||||
|
{
|
||||||
|
public const double DefaultStrength = 0.5;
|
||||||
|
|
||||||
|
/// <summary>The background is blurred at 1/<see cref="BlurDownscale"/> resolution and
|
||||||
|
/// upsampled while blending — a strong blur at a fraction of the cost.</summary>
|
||||||
|
internal const int BlurDownscale = 4;
|
||||||
|
|
||||||
|
/// <summary>Box-blur radius (in downscaled pixels) at strength 0 and 1. The maximum was halved
|
||||||
|
/// from 12 (2026-10-09): the creator found full range too heavy — the old max spread ≈48 full
|
||||||
|
/// px. The established tools blur far less: StreamFX defaults its Box blur size to 5 and its
|
||||||
|
/// author stops downscale-based blurs around 8 px.</summary>
|
||||||
|
internal const int MinBlurRadius = 1;
|
||||||
|
internal const int MaxBlurRadius = 6;
|
||||||
|
|
||||||
|
private readonly IPersonSegmenter _segmenter;
|
||||||
|
private bool _loggedFailure;
|
||||||
|
|
||||||
|
public BackgroundEffectProcessor(IPersonSegmenter segmenter)
|
||||||
|
{
|
||||||
|
_segmenter = segmenter;
|
||||||
|
}
|
||||||
|
|
||||||
|
public VideoFrame Apply(VideoFrame frame, BackgroundEffect effect, double strength = DefaultStrength)
|
||||||
|
{
|
||||||
|
if (effect == BackgroundEffect.None) return frame;
|
||||||
|
var mask = TrySegment(frame);
|
||||||
|
return mask == null ? frame : Render(frame, mask, effect, strength);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Runs the segmenter once; null (logged once) when it can't produce a usable mask.</summary>
|
||||||
|
public SegmentationMask? TrySegment(VideoFrame frame)
|
||||||
|
{
|
||||||
|
SegmentationMask? mask;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
mask = _segmenter.Segment(frame);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
LogFailureOnce($"{ex.GetType().Name}: {ex.Message}");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mask == null || mask.Width < 1 || mask.Height < 1 || mask.Values.Length < mask.Width * mask.Height)
|
||||||
|
{
|
||||||
|
LogFailureOnce("segmenter returned no usable mask");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static VideoFrame Render(VideoFrame frame, SegmentationMask mask, BackgroundEffect effect, double strength)
|
||||||
|
{
|
||||||
|
var s = Math.Clamp(strength, 0, 1);
|
||||||
|
return effect switch
|
||||||
|
{
|
||||||
|
BackgroundEffect.Remove => ApplyRemove(frame, mask, s),
|
||||||
|
BackgroundEffect.Blur => ApplyBlur(frame, mask, s),
|
||||||
|
_ => frame,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static VideoFrame ApplyRemove(VideoFrame frame, SegmentationMask mask, double strength)
|
||||||
|
{
|
||||||
|
var src = frame.BgraPixels;
|
||||||
|
var dst = new byte[src.Length];
|
||||||
|
Buffer.BlockCopy(src, 0, dst, 0, src.Length);
|
||||||
|
|
||||||
|
// Edge feather: map the mask's [0.5 - w, 0.5 + w] band to alpha 0..1, as a 256-entry LUT
|
||||||
|
// over the quantized mask value (so the per-pixel work is a lookup + one multiply).
|
||||||
|
var w = 0.05 + 0.45 * strength;
|
||||||
|
var lo = 0.5 - w;
|
||||||
|
var span = 2 * w;
|
||||||
|
var alphaLut = new int[256];
|
||||||
|
for (var i = 0; i < 256; i++)
|
||||||
|
alphaLut[i] = (int)Math.Round(Math.Clamp((i / 255.0 - lo) / span, 0, 1) * 256);
|
||||||
|
|
||||||
|
var width = frame.Width;
|
||||||
|
var height = frame.Height;
|
||||||
|
var stride = frame.Stride;
|
||||||
|
var maskRows = UpsampleMaskRows(mask, width);
|
||||||
|
var (r0, r1, fy) = AxisLut(mask.Height, height);
|
||||||
|
|
||||||
|
Parallel.For(0, height, RowParallelism, y =>
|
||||||
|
{
|
||||||
|
var a0 = maskRows[r0[y]];
|
||||||
|
var a1 = maskRows[r1[y]];
|
||||||
|
var t = fy[y];
|
||||||
|
var row = y * stride + 3;
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
var m = a0[x] + (a1[x] - a0[x]) * t;
|
||||||
|
var q = (int)(m * 255f + 0.5f);
|
||||||
|
q = q < 0 ? 0 : q > 255 ? 255 : q;
|
||||||
|
var p = row + x * 4;
|
||||||
|
dst[p] = (byte)((src[p] * alphaLut[q] + 128) >> 8);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return new VideoFrame(width, height, dst) { Epoch = frame.Epoch, IsOpaque = false };
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static VideoFrame ApplyBlur(VideoFrame frame, SegmentationMask mask, double strength)
|
||||||
|
{
|
||||||
|
var width = frame.Width;
|
||||||
|
var height = frame.Height;
|
||||||
|
var src = frame.BgraPixels;
|
||||||
|
var stride = frame.Stride;
|
||||||
|
|
||||||
|
// 1. Downscale by box-averaging BlurDownscale×BlurDownscale blocks (3 float channels).
|
||||||
|
var f = BlurDownscale;
|
||||||
|
var sw = (width + f - 1) / f;
|
||||||
|
var sh = (height + f - 1) / f;
|
||||||
|
var small = new float[sw * sh * 3];
|
||||||
|
Parallel.For(0, sh, RowParallelism, sy =>
|
||||||
|
{
|
||||||
|
var y0 = sy * f;
|
||||||
|
var y1 = Math.Min(height, y0 + f);
|
||||||
|
for (var sx = 0; sx < sw; sx++)
|
||||||
|
{
|
||||||
|
var x0 = sx * f;
|
||||||
|
var x1 = Math.Min(width, x0 + f);
|
||||||
|
float b = 0, g = 0, r = 0;
|
||||||
|
var n = 0;
|
||||||
|
for (var y = y0; y < y1; y++)
|
||||||
|
{
|
||||||
|
var p = y * stride + x0 * 4;
|
||||||
|
for (var x = x0; x < x1; x++, p += 4)
|
||||||
|
{
|
||||||
|
b += src[p]; g += src[p + 1]; r += src[p + 2];
|
||||||
|
n++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var o = (sy * sw + sx) * 3;
|
||||||
|
small[o] = b / n; small[o + 1] = g / n; small[o + 2] = r / n;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 2. Three separable box-blur passes ≈ a gaussian.
|
||||||
|
var radius = BlurRadius(strength);
|
||||||
|
var scratch = new float[small.Length];
|
||||||
|
for (var pass = 0; pass < 3; pass++)
|
||||||
|
{
|
||||||
|
BoxBlurHorizontal(small, scratch, sw, sh, radius);
|
||||||
|
BoxBlurVertical(scratch, small, sw, sh, radius);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Upsample: horizontal interpolation precomputed once per small row (and per mask row),
|
||||||
|
// then each output row lerps two precomputed rows — no per-pixel 2-D bilinear.
|
||||||
|
var blurRows = UpsampleColorRows(small, sw, sh, width);
|
||||||
|
var (b0, b1, bfy) = AxisLut(sh, height);
|
||||||
|
var maskRows = UpsampleMaskRows(mask, width);
|
||||||
|
var (m0, m1, mfy) = AxisLut(mask.Height, height);
|
||||||
|
|
||||||
|
// 4. Blend: person (mask) keeps the source pixel, background takes the blur.
|
||||||
|
var dst = new byte[src.Length];
|
||||||
|
Parallel.For(0, height, RowParallelism, y =>
|
||||||
|
{
|
||||||
|
var ma = maskRows[m0[y]];
|
||||||
|
var mb = maskRows[m1[y]];
|
||||||
|
var mt = mfy[y];
|
||||||
|
var ba = blurRows[b0[y]];
|
||||||
|
var bb = blurRows[b1[y]];
|
||||||
|
var bt = bfy[y];
|
||||||
|
var row = y * stride;
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
var p = row + x * 4;
|
||||||
|
var m = ma[x] + (mb[x] - ma[x]) * mt;
|
||||||
|
if (m >= 0.999f)
|
||||||
|
{
|
||||||
|
dst[p] = src[p]; dst[p + 1] = src[p + 1]; dst[p + 2] = src[p + 2]; dst[p + 3] = src[p + 3];
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (m < 0f) m = 0f;
|
||||||
|
var k = 1f - m;
|
||||||
|
var c = x * 3;
|
||||||
|
var vb = ba[c] + (bb[c] - ba[c]) * bt;
|
||||||
|
var vg = ba[c + 1] + (bb[c + 1] - ba[c + 1]) * bt;
|
||||||
|
var vr = ba[c + 2] + (bb[c + 2] - ba[c + 2]) * bt;
|
||||||
|
dst[p] = ClampByte(src[p] * m + vb * k);
|
||||||
|
dst[p + 1] = ClampByte(src[p + 1] * m + vg * k);
|
||||||
|
dst[p + 2] = ClampByte(src[p + 2] * m + vr * k);
|
||||||
|
dst[p + 3] = src[p + 3];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return new VideoFrame(width, height, dst) { Epoch = frame.Epoch, IsOpaque = frame.IsOpaque };
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Blur radius in downscaled pixels for a strength. Quadratic (s²), not linear, so the
|
||||||
|
/// default 0.5 stays gentle (2 small px ≈ ~8–10 full px of perceived spread, ~3× lighter than
|
||||||
|
/// the old linear 6) while only the top of the slider approaches the full range.</summary>
|
||||||
|
internal static int BlurRadius(double strength)
|
||||||
|
{
|
||||||
|
var s = Math.Clamp(strength, 0, 1);
|
||||||
|
return (int)Math.Round(MinBlurRadius + (MaxBlurRadius - MinBlurRadius) * s * s);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Row-parallel pixel loops, capped so the effect worker can't starve the compositor
|
||||||
|
/// and encoder threads.</summary>
|
||||||
|
private static readonly ParallelOptions RowParallelism = new()
|
||||||
|
{
|
||||||
|
MaxDegreeOfParallelism = Math.Clamp(Environment.ProcessorCount / 2, 1, 4),
|
||||||
|
};
|
||||||
|
|
||||||
|
private static byte ClampByte(float v)
|
||||||
|
{
|
||||||
|
var i = (int)(v + 0.5f);
|
||||||
|
return (byte)(i < 0 ? 0 : i > 255 ? 255 : i);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>For each destination index along one axis: the two source indices and the
|
||||||
|
/// fractional weight — pixel-center aligned, edge-clamped (the same mapping a bilinear
|
||||||
|
/// sample uses).</summary>
|
||||||
|
private static (int[] I0, int[] I1, float[] F) AxisLut(int srcSize, int dstSize)
|
||||||
|
{
|
||||||
|
var i0 = new int[dstSize];
|
||||||
|
var i1 = new int[dstSize];
|
||||||
|
var fr = new float[dstSize];
|
||||||
|
for (var d = 0; d < dstSize; d++)
|
||||||
|
{
|
||||||
|
var s = (d + 0.5f) * srcSize / dstSize - 0.5f;
|
||||||
|
var a = (int)MathF.Floor(s);
|
||||||
|
var t = s - a;
|
||||||
|
i0[d] = Math.Clamp(a, 0, srcSize - 1);
|
||||||
|
i1[d] = Math.Clamp(a + 1, 0, srcSize - 1);
|
||||||
|
fr[d] = a < 0 ? 0f : a + 1 > srcSize - 1 ? 0f : t;
|
||||||
|
}
|
||||||
|
return (i0, i1, fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Each mask row, horizontally interpolated (and clamped to 0..1) to the frame width.</summary>
|
||||||
|
private static float[][] UpsampleMaskRows(SegmentationMask mask, int width)
|
||||||
|
{
|
||||||
|
var (x0, x1, fx) = AxisLut(mask.Width, width);
|
||||||
|
var rows = new float[mask.Height][];
|
||||||
|
var v = mask.Values;
|
||||||
|
for (var r = 0; r < mask.Height; r++)
|
||||||
|
{
|
||||||
|
var row = new float[width];
|
||||||
|
var o = r * mask.Width;
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
var a = v[o + x0[x]];
|
||||||
|
var m = a + (v[o + x1[x]] - a) * fx[x];
|
||||||
|
row[x] = m < 0f ? 0f : m > 1f ? 1f : m;
|
||||||
|
}
|
||||||
|
rows[r] = row;
|
||||||
|
}
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Each row of a 3-channel float image, horizontally interpolated to <paramref name="width"/>.</summary>
|
||||||
|
private static float[][] UpsampleColorRows(float[] img, int w, int h, int width)
|
||||||
|
{
|
||||||
|
var (x0, x1, fx) = AxisLut(w, width);
|
||||||
|
var rows = new float[h][];
|
||||||
|
Parallel.For(0, h, RowParallelism, r =>
|
||||||
|
{
|
||||||
|
var row = new float[width * 3];
|
||||||
|
var o = r * w;
|
||||||
|
for (var x = 0; x < width; x++)
|
||||||
|
{
|
||||||
|
var a = (o + x0[x]) * 3;
|
||||||
|
var b = (o + x1[x]) * 3;
|
||||||
|
var t = fx[x];
|
||||||
|
row[x * 3] = img[a] + (img[b] - img[a]) * t;
|
||||||
|
row[x * 3 + 1] = img[a + 1] + (img[b + 1] - img[a + 1]) * t;
|
||||||
|
row[x * 3 + 2] = img[a + 2] + (img[b + 2] - img[a + 2]) * t;
|
||||||
|
}
|
||||||
|
rows[r] = row;
|
||||||
|
});
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void BoxBlurHorizontal(float[] input, float[] output, int w, int h, int r)
|
||||||
|
{
|
||||||
|
var norm = 1f / (2 * r + 1);
|
||||||
|
for (var y = 0; y < h; y++)
|
||||||
|
{
|
||||||
|
var row = y * w;
|
||||||
|
for (var c = 0; c < 3; c++)
|
||||||
|
{
|
||||||
|
float sum = 0;
|
||||||
|
for (var i = -r; i <= r; i++)
|
||||||
|
sum += input[(row + Math.Clamp(i, 0, w - 1)) * 3 + c];
|
||||||
|
for (var x = 0; x < w; x++)
|
||||||
|
{
|
||||||
|
output[(row + x) * 3 + c] = sum * norm;
|
||||||
|
var add = Math.Min(w - 1, x + r + 1);
|
||||||
|
var sub = Math.Max(0, x - r);
|
||||||
|
sum += input[(row + add) * 3 + c] - input[(row + sub) * 3 + c];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void BoxBlurVertical(float[] input, float[] output, int w, int h, int r)
|
||||||
|
{
|
||||||
|
var norm = 1f / (2 * r + 1);
|
||||||
|
for (var x = 0; x < w; x++)
|
||||||
|
{
|
||||||
|
for (var c = 0; c < 3; c++)
|
||||||
|
{
|
||||||
|
float sum = 0;
|
||||||
|
for (var i = -r; i <= r; i++)
|
||||||
|
sum += input[(Math.Clamp(i, 0, h - 1) * w + x) * 3 + c];
|
||||||
|
for (var y = 0; y < h; y++)
|
||||||
|
{
|
||||||
|
output[(y * w + x) * 3 + c] = sum * norm;
|
||||||
|
var add = Math.Min(h - 1, y + r + 1);
|
||||||
|
var sub = Math.Max(0, y - r);
|
||||||
|
sum += input[(add * w + x) * 3 + c] - input[(sub * w + x) * 3 + c];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private void LogFailureOnce(string reason)
|
||||||
|
{
|
||||||
|
if (_loggedFailure) return;
|
||||||
|
_loggedFailure = true;
|
||||||
|
AppLog.Write($"BackgroundEffectProcessor: passing webcam through — {reason}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
namespace ytLive.Services.BackgroundEffects;
|
||||||
|
|
||||||
|
/// <summary>A person-probability mask at the segmenter's own resolution: row-major,
|
||||||
|
/// one value per pixel, 0 = background, 1 = person.</summary>
|
||||||
|
public sealed record SegmentationMask(int Width, int Height, float[] Values);
|
||||||
|
|
||||||
|
/// <summary>Seam over the person-segmentation model (TASK 51) so tests inject a fake and
|
||||||
|
/// never run real inference. Returns null when no mask can be produced; callers then pass
|
||||||
|
/// the frame through untouched.</summary>
|
||||||
|
public interface IPersonSegmenter
|
||||||
|
{
|
||||||
|
SegmentationMask? Segment(VideoFrame frame);
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
namespace ytLive.Services.BackgroundEffects;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Temporal smoothing for the person mask (TASK 51): each raw frame's segmentation is blended
|
||||||
|
/// with the previous smoothed mask so the cut-out edge doesn't flutter from frame to frame when
|
||||||
|
/// the model's per-frame verdict wavers.
|
||||||
|
///
|
||||||
|
/// Blend = <see cref="CurrentWeight"/> × new + (1 − <see cref="CurrentWeight"/>) × previous.
|
||||||
|
/// Weights come from the established tools rather than a guess: OBS's obs-backgroundremoval
|
||||||
|
/// smoke-tests `temporal_smooth_factor` at its 0.85 default, and Jitsi's webcam background
|
||||||
|
/// filter (jitsi/jitsi-meet#17080) found 0.7/0.3 transformed best — a midpoint that still
|
||||||
|
/// reacts to real movement. 0.5/0.5 is worse: on motion it leaves a smearing edge ghost.
|
||||||
|
///
|
||||||
|
/// State lives per camera session (the <see cref="CameraManager"/>'s one-per-frame worker), NOT
|
||||||
|
/// in the segmenter — the segmenter is shared app-wide and its contract test pins the raw
|
||||||
|
/// per-frame mask.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class MaskSmoother
|
||||||
|
{
|
||||||
|
/// <summary>Weight of the newest raw mask; the rest is the previous smoothed mask.</summary>
|
||||||
|
internal const double CurrentWeight = 0.75;
|
||||||
|
|
||||||
|
private float[]? _current;
|
||||||
|
private float[]? _scratch;
|
||||||
|
private int _width;
|
||||||
|
private int _height;
|
||||||
|
private bool _hasHistory;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the temporally-smoothed mask. A null input (segmenter hiccup) resets history so
|
||||||
|
/// the next real mask starts moving again; the first frame and any size change pass through
|
||||||
|
/// un-blended, and the returned mask never aliases the caller's array (the first frame copies
|
||||||
|
/// its history). The two buffers ping-pong so no per-frame allocation is needed — a 256×144
|
||||||
|
/// mask is 147 KB, past the 85 KB LOH threshold.
|
||||||
|
/// </summary>
|
||||||
|
public SegmentationMask? Smooth(SegmentationMask? raw)
|
||||||
|
{
|
||||||
|
if (raw == null)
|
||||||
|
{
|
||||||
|
_hasHistory = false;
|
||||||
|
_width = 0;
|
||||||
|
_height = 0;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_hasHistory || _width != raw.Width || _height != raw.Height
|
||||||
|
|| _current == null || _scratch == null)
|
||||||
|
{
|
||||||
|
_width = raw.Width;
|
||||||
|
_height = raw.Height;
|
||||||
|
_current = new float[raw.Values.Length];
|
||||||
|
_scratch = new float[raw.Values.Length];
|
||||||
|
Array.Copy(raw.Values, _current, raw.Values.Length);
|
||||||
|
_hasHistory = true;
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
var v = raw.Values;
|
||||||
|
var next = _scratch;
|
||||||
|
var keep = 1f - (float)CurrentWeight;
|
||||||
|
for (var i = 0; i < v.Length; i++)
|
||||||
|
next[i] = keep * _current[i] + (float)CurrentWeight * v[i];
|
||||||
|
|
||||||
|
_scratch = _current;
|
||||||
|
_current = next;
|
||||||
|
return new SegmentationMask(_width, _height, next);
|
||||||
|
}
|
||||||
|
}
|
||||||